- " + line
+ listlevel++
+ while(listlevel > count_w)
+ line = "
$1
") + t = replacetext(t, regex("^##(?!#) ?(.+)$", "gm"), "$1
") + t = replacetext(t, regex("^###(?!#) ?(.+)$", "gm"), "$1
") + t = replacetext(t, regex("^#### ?(.+)$", "gm"), "$1
") + + // Parse most rules + + t = replacetext(t, regex("\\*(\[^\\*\]*)\\*", "g"), "$1") + t = replacetext(t, regex("_(\[^_\]*)_", "g"), "$1") + t = replacetext(t, "", "!") + t = replacetext(t, "", "!") + t = replacetext(t, regex("\\!(\[^\\!\]+)\\!", "g"), "$1") + t = replacetext(t, regex("\\^(\[^\\^\]+)\\^", "g"), "$1") + t = replacetext(t, regex("\\|(\[^\\|\]+)\\|", "g"), "") + + t = replacetext(t, " ", " ") + + // Done return t @@ -469,7 +594,7 @@ GLOBAL_LIST_INIT(binary, list("0","1")) //in the json file and have it be reflected in the in game item/mob it came from. //(That's what things like savefiles are for) Note that this list is not shuffled. /proc/twitterize(list/proposed, filename, cullshort = 1, storemax = 1000) - if(!islist(proposed) || !filename || !config.log_twitter) + if(!islist(proposed) || !filename || !CONFIG_GET(flag/log_twitter)) return //Regular expressions are, as usual, absolute magic diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 6f31a68681e..e3ce12397ed 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -50,3 +50,99 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) return 5 else return 1 + +//Takes a value of time in deciseconds. +//Returns a text value of that number in hours, minutes, or seconds. +/proc/DisplayTimeText(time_value) + var/second = time_value*0.1 + var/second_adjusted = null + var/second_rounded = FALSE + var/minute = null + var/hour = null + var/day = null + + if(!second) + return "0 seconds" + if(second >= 60) + minute = round_down(second/60) + second = round(second - (minute*60), 0.1) + second_rounded = TRUE + if(second) //check if we still have seconds remaining to format, or if everything went into minute. + second_adjusted = round(second) //used to prevent '1 seconds' being shown + if(day || hour || minute) + if(second_adjusted == 1 && second >= 1) + second = " and 1 second" + else if(second > 1) + second = " and [second_adjusted] seconds" + else //shows a fraction if seconds is < 1 + if(second_rounded) //no sense rounding again if it's already done + second = " and [second] seconds" + else + second = " and [round(second, 0.1)] seconds" + else + if(second_adjusted == 1 && second >= 1) + second = "1 second" + else if(second > 1) + second = "[second_adjusted] seconds" + else + if(second_rounded) + second = "[second] seconds" + else + second = "[round(second, 0.1)] seconds" + else + second = null + + if(!minute) + return "[second]" + if(minute >= 60) + hour = round_down(minute/60,1) + minute = (minute - (hour*60)) + if(minute) //alot simpler from here since you don't have to worry about fractions + if(minute != 1) + if((day || hour) && second) + minute = ", [minute] minutes" + else if((day || hour) && !second) + minute = " and [minute] minutes" + else + minute = "[minute] minutes" + else + if((day || hour) && second) + minute = ", 1 minute" + else if((day || hour) && !second) + minute = " and 1 minute" + else + minute = "1 minute" + else + minute = null + + if(!hour) + return "[minute][second]" + if(hour >= 24) + day = round_down(hour/24,1) + hour = (hour - (day*24)) + if(hour) + if(hour != 1) + if(day && (minute || second)) + hour = ", [hour] hours" + else if(day && (!minute || !second)) + hour = " and [hour] hours" + else + hour = "[hour] hours" + else + if(day && (minute || second)) + hour = ", 1 hour" + else if(day && (!minute || !second)) + hour = " and 1 hour" + else + hour = "1 hour" + else + hour = null + + if(!day) + return "[hour][minute][second]" + if(day > 1) + day = "[day] days" + else + day = "1 day" + + return "[day][hour][minute][second]" diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index a534eba9662..26c1a609614 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -554,3 +554,24 @@ else return /datum return text2path(copytext(string_type, 1, last_slash)) + +//returns a string the last bit of a type, without the preceeding '/' +/proc/type2top(the_type) + //handle the builtins manually + if(!ispath(the_type)) + return + switch(the_type) + if(/datum) + return "datum" + if(/atom) + return "atom" + if(/obj) + return "obj" + if(/mob) + return "mob" + if(/area) + return "area" + if(/turf) + return "turf" + else //regex everything else (works for /proc too) + return lowertext(replacetext("[the_type]", "[type2parent(the_type)]/", "")) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 5f01d61ed06..93741f43b2c 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -503,28 +503,12 @@ Turf and target are separate in case you want to teleport some distance from a t var/y=arcsin(x/sqrt(1+x*x)) return y -/atom/proc/GetAllContents(list/ignore_typecache) - var/list/processing_list = list(src) - var/list/assembled = list() - if(ignore_typecache) //If there's a typecache, use it. - while(processing_list.len) - var/atom/A = processing_list[1] - processing_list -= A - if(ignore_typecache[A.type]) - continue - processing_list |= (A.contents - assembled) - assembled |= A - - else //If there's none, only make this check once for performance. - while(processing_list.len) - var/atom/A = processing_list[1] - processing_list -= A - - processing_list |= (A.contents - assembled) - - assembled |= A - - return assembled +/atom/proc/GetAllContents(list/output=list()) + . = output + output += src + for(var/i in 1 to contents.len) + var/atom/thing = contents[i] + thing.GetAllContents(output) //Step-towards method of determining whether one atom can see another. Similar to viewers() /proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. @@ -1283,7 +1267,7 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types()) #define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); } #define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/______qdel_list_wrapper, L), time, TIMER_STOPPABLE) #define QDEL_LIST_ASSOC(L) if(L) { for(var/I in L) { qdel(L[I]); qdel(I); } L.Cut(); } -#define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qel(L[I]); L.Cut(); } +#define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qdel(L[I]); L.Cut(); } /proc/______qdel_list_wrapper(list/L) //the underscores are to encourage people not to use this directly. QDEL_LIST(L) @@ -1381,63 +1365,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) return FALSE return TRUE -//WHATEVER YOU USE THIS FOR MUST BE SANITIZED TO SHIT, IT USES SHELL -//It also sleeps - -//Set this to TRUE before calling -//This prevents RCEs from badmins -//kevinz000 if you touch this I will hunt you down -GLOBAL_VAR_INIT(valid_HTTPSGet, FALSE) -GLOBAL_PROTECT(valid_HTTPSGet) -/proc/HTTPSGet(url) //tgs2 support - if(findtext(url, "\"")) - GLOB.valid_HTTPSGet = FALSE - - if(!GLOB.valid_HTTPSGet) - if(usr) - CRASH("[usr.ckey]([usr]) just attempted an invalid HTTPSGet on: [url]!") - else - CRASH("Invalid HTTPSGet call on: [url]") - GLOB.valid_HTTPSGet = FALSE - - //"This has got to be the ugliest hack I have ever done" - //warning, here be dragons - /* - | @___oo - /\ /\ / (__,,,,| - ) /^\) ^\/ _) - ) /^\/ _) - ) _ / / _) - /\ )/\/ || | )_) - < > |(,,) )__) - || / \)___)\ - | \____( )___) )___ - \______(_______;;; __;;; - */ - var/temp_file = "data/HTTPSGetOutput.txt" - var/command - if(world.system_type == MS_WINDOWS) - command = "powershell -Command \"wget [url] -OutFile [temp_file]\"" - else if(world.system_type == UNIX) - command = "wget -O [temp_file] [url]" - else - CRASH("Invalid world.system_type ([world.system_type])? Yell at Lummox.") - - log_world("HTTPSGet: [url]") - var/result = shell(command) - if(result != 0) - log_world("Download failed: shell exited with code: [result]") - return - - var/f = file(temp_file) - if(!f) - log_world("Download failed: Temp file not found") - return - - . = file2text(f) - f = null - fdel(temp_file) - #define UNTIL(X) while(!(X)) stoplag() /proc/pass() diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index 83bf3cfb5ad..391744e34c6 100644 --- a/code/_globalvars/configuration.dm +++ b/code/_globalvars/configuration.dm @@ -1,4 +1,4 @@ -GLOBAL_REAL(config, /datum/configuration) +GLOBAL_REAL(config, /datum/controller/configuration) GLOBAL_DATUM_INIT(revdata, /datum/getrev, new) @@ -11,9 +11,7 @@ GLOBAL_VAR_INIT(hub_visibility, FALSE) GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently GLOBAL_VAR_INIT(dooc_allowed, TRUE) -GLOBAL_VAR_INIT(abandon_allowed, TRUE) GLOBAL_VAR_INIT(enter_allowed, TRUE) -GLOBAL_VAR_INIT(guests_allowed, TRUE) GLOBAL_VAR_INIT(shuttle_frozen, FALSE) GLOBAL_VAR_INIT(shuttle_left, FALSE) GLOBAL_VAR_INIT(tinted_weldhelh, TRUE) @@ -25,10 +23,16 @@ GLOBAL_VAR_INIT(Debug, FALSE) // global debug switch GLOBAL_VAR_INIT(Debug2, FALSE) //This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage +//Protecting these because the proper way to edit them is with the config/secrets GLOBAL_VAR_INIT(MAX_EX_DEVESTATION_RANGE, 3) +GLOBAL_PROTECT(MAX_EX_DEVESTATION_RANGE) GLOBAL_VAR_INIT(MAX_EX_HEAVY_RANGE, 7) +GLOBAL_PROTECT(MAX_EX_HEAVY_RANGE) GLOBAL_VAR_INIT(MAX_EX_LIGHT_RANGE, 14) +GLOBAL_PROTECT(MAX_EX_LIGHT_RANGE) GLOBAL_VAR_INIT(MAX_EX_FLASH_RANGE, 14) +GLOBAL_PROTECT(MAX_EX_FLASH_RANGE) GLOBAL_VAR_INIT(MAX_EX_FLAME_RANGE, 14) +GLOBAL_PROTECT(MAX_EX_FLAME_RANGE) GLOBAL_VAR_INIT(DYN_EX_SCALE, 0.5) diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm index a2d30b15289..03824c4c834 100644 --- a/code/_globalvars/lists/mapping.dm +++ b/code/_globalvars/lists/mapping.dm @@ -33,6 +33,8 @@ GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security GLOBAL_LIST_EMPTY(generic_event_spawns) //list of all spawns for events GLOBAL_LIST_EMPTY(wizardstart) +GLOBAL_LIST_EMPTY(nukeop_start) +GLOBAL_LIST_EMPTY(nukeop_leader_start) GLOBAL_LIST_EMPTY(newplayer_start) GLOBAL_LIST_EMPTY(prisonwarp) //prisoners go to these GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here @@ -46,6 +48,8 @@ GLOBAL_LIST_EMPTY(blobstart) GLOBAL_LIST_EMPTY(secequipment) GLOBAL_LIST_EMPTY(deathsquadspawn) GLOBAL_LIST_EMPTY(emergencyresponseteamspawn) +GLOBAL_LIST_EMPTY(servant_spawns) //Servants of Ratvar spawn here +GLOBAL_LIST_EMPTY(city_of_cogs_spawns) //Anyone entering the City of Cogs spawns here GLOBAL_LIST_EMPTY(ruin_landmarks) //away missions diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 13a67e66940..a890cb269c0 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -20,6 +20,7 @@ GLOBAL_LIST_EMPTY(ai_list) GLOBAL_LIST_EMPTY(pai_list) GLOBAL_LIST_EMPTY(available_ai_shells) GLOBAL_LIST_EMPTY(simple_animals) +GLOBAL_LIST_EMPTY(spidermobs) //all sentient spider mobs GLOBAL_LIST_EMPTY(language_datum_instances) GLOBAL_LIST_EMPTY(all_languages) diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 522ff84ff0a..d855c7f141e 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -15,6 +15,7 @@ GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt")) GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt")) GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt")) GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt")) +GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt")) GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt")) diff --git a/code/_globalvars/sensitive.dm b/code/_globalvars/sensitive.dm deleted file mode 100644 index e1a02621acb..00000000000 --- a/code/_globalvars/sensitive.dm +++ /dev/null @@ -1,16 +0,0 @@ -//Server API key -GLOBAL_REAL_VAR(comms_key) = "default_pwd" -GLOBAL_REAL_VAR(comms_allowed) = FALSE //By default, the server does not allow messages to be sent to it, unless the key is strong enough (this is to prevent misconfigured servers from becoming vulnerable) - -GLOBAL_REAL_VAR(medal_hub) -GLOBAL_REAL_VAR(medal_pass) = " " -GLOBAL_REAL_VAR(medals_enabled) = TRUE //will be auto set to false if the game fails contacting the medal hub to prevent unneeded calls. - -// MySQL configuration - -GLOBAL_REAL_VAR(sqladdress) = "localhost" -GLOBAL_REAL_VAR(sqlport) = "3306" -GLOBAL_REAL_VAR(sqlfdbkdb) = "test" -GLOBAL_REAL_VAR(sqlfdbklogin) = "root" -GLOBAL_REAL_VAR(sqlfdbkpass) = "" -GLOBAL_REAL_VAR(sqlfdbktableprefix) = "" diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 0eeca2eaf72..99d12568bce 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -32,6 +32,7 @@ */ /atom/Click(location,control,params) if(initialized) + SendSignal(COMSIG_CLICK, location, control, params) usr.ClickOn(src, params) /atom/DblClick(location,control,params) @@ -95,7 +96,7 @@ if(!modifiers["catcher"] && A.IsObscured()) return - if(istype(loc, /obj/mecha)) + if(ismecha(loc)) var/obj/mecha/M = loc return M.click_action(A,src,params) @@ -305,6 +306,7 @@ A.ShiftClick(src) return /atom/proc/ShiftClick(mob/user) + SendSignal(COMSIG_CLICK_SHIFT, user) if(user.client && user.client.eye == user || user.client.eye == user.loc) user.examinate(src) return @@ -319,12 +321,13 @@ return /atom/proc/CtrlClick(mob/user) + SendSignal(COMSIG_CLICK_CTRL, user) var/mob/living/ML = user if(istype(ML)) ML.pulled(src) /mob/living/carbon/human/CtrlClick(mob/user) - if(ishuman(user) && Adjacent(user)) + if(ishuman(user) && Adjacent(user) && !user.incapacitated()) if(world.time < user.next_move) return FALSE var/mob/living/carbon/human/H = user @@ -348,6 +351,7 @@ ..() /atom/proc/AltClick(mob/user) + SendSignal(COMSIG_CLICK_ALT, user) var/turf/T = get_turf(src) if(T && user.TurfAdjacent(T)) if(user.listed_turf == T) @@ -355,7 +359,6 @@ else user.listed_turf = T user.client.statpanel = T.name - user.Stat() //responsive ui pls /mob/proc/TurfAdjacent(turf/T) return T.Adjacent(src) @@ -373,6 +376,7 @@ return /atom/proc/CtrlShiftClick(mob/user) + SendSignal(COMSIG_CLICK_CTRL_SHIFT) return /* diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 85ecd036de6..d4d2c2d8a53 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -78,7 +78,7 @@ /obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud) - var settings = owner_hud.get_action_buttons_icons() + var/settings = owner_hud.get_action_buttons_icons() icon = settings["bg_icon"] icon_state = settings["bg_state"] hide_icon = settings["toggle_icon"] diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index b5e72b79148..7162137741b 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -242,9 +242,12 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." icon_state = "fire" /obj/screen/alert/fire/Click() - if(isliving(usr)) - var/mob/living/L = usr - return L.resist() + var/mob/living/L = usr + if(!L.can_resist()) + return + L.changeNext_move(CLICK_CD_RESIST) + if(L.canmove) + return L.resist_fire() //I just want to start a flame in your hearrrrrrtttttt. //ALIENS @@ -375,90 +378,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /obj/screen/alert/clockwork alerttooltipstyle = "clockcult" -/obj/screen/alert/clockwork/scripture_reqs - name = "Next Tier Requirements" - desc = "You shouldn't be seeing this description unless you're very fast. If you're very fast, good job!" - icon_state = "no-servants-caches" - -/obj/screen/alert/clockwork/scripture_reqs/Initialize() - . = ..() - START_PROCESSING(SSprocessing, src) - process() - -/obj/screen/alert/clockwork/scripture_reqs/Destroy() - STOP_PROCESSING(SSprocessing, src) - return ..() - -/obj/screen/alert/clockwork/scripture_reqs/process() - if(GLOB.clockwork_gateway_activated) - mob_viewer.clear_alert("scripturereq") - return - var/current_state - for(var/i in SSticker.scripture_states) - if(!SSticker.scripture_states[i]) - current_state = i - break - icon_state = "no" - if(!current_state) - name = "Current Objective" - for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in GLOB.all_clockwork_objects) - var/area/gate_area = get_area(G) - desc = "Protect the Ark at [gate_area.map_name]!" - return - desc = "All tiers of Scripture are unlocked.
\ - Acquire components and summon the Ark." - else - name = "Next Tier Requirements" - var/validservants = 0 - var/unconverted_ais_exist = get_unconverted_ais() - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L) && (ishuman(L) || issilicon(L))) - validservants++ - var/req_servants = 0 - var/req_caches = 0 - var/req_cv = 0 - var/req_ai = FALSE - var/list/textlist = list("Requirements for [current_state] Scripture:") - switch(current_state) //get our requirements based on the tier - if(SCRIPTURE_SCRIPT) - req_servants = SCRIPT_SERVANT_REQ - req_caches = SCRIPT_CACHE_REQ - if(SCRIPTURE_APPLICATION) - req_servants = APPLICATION_SERVANT_REQ - req_caches = APPLICATION_CACHE_REQ - req_cv = APPLICATION_CV_REQ - if(SCRIPTURE_JUDGEMENT) - req_servants = JUDGEMENT_SERVANT_REQ - req_caches = JUDGEMENT_CACHE_REQ - req_cv = JUDGEMENT_CV_REQ - req_ai = TRUE - textlist += "
[validservants]/[req_servants] Servants" - if(validservants < req_servants) - icon_state += "-servants" //in this manner, generate an icon key based on what we're missing - else - textlist += ": \[CHECK\]" - textlist += "
[GLOB.clockwork_caches]/[req_caches] Tinkerer's Caches" - if(GLOB.clockwork_caches < req_caches) - icon_state += "-caches" - else - textlist += ": \[CHECK\]" - if(req_cv) //cv only shows up if the tier requires it - textlist += "
[GLOB.clockwork_construction_value]/[req_cv] Construction Value" - if(GLOB.clockwork_construction_value < req_cv) - icon_state += "-cv" - else - textlist += ": \[CHECK\]" - if(req_ai) //same for ai - if(unconverted_ais_exist) - if(unconverted_ais_exist > 1) - textlist += "
[unconverted_ais_exist] unconverted AIs exist!
" - else - textlist += "
An unconverted AI exists!" - icon_state += "-ai" - else - textlist += "
No unconverted AIs exist: \[CHECK\]" - desc = textlist.Join() - /obj/screen/alert/clockwork/infodump name = "Global Records" desc = "You shouldn't be seeing this description, because it should be dynamically generated." @@ -470,7 +389,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." else var/servants = 0 var/validservants = 0 - var/unconverted_ais_exist = get_unconverted_ais() var/list/textlist for(var/mob/living/L in GLOB.living_mob_list) if(is_servant_of_ratvar(L)) @@ -484,29 +402,25 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." textlist = list("[servants] Servants, [validservants ? "[validservants] of which counts":"none of which count"] towards scripture.
") else textlist = list("[servants] Servant, who [validservants ? "counts":"does not count"] towards scripture.
") - textlist += "[GLOB.clockwork_caches ? "[GLOB.clockwork_caches] Tinkerer's Caches.":"No Tinkerer's Caches, construct one!"]
\ - [GLOB.clockwork_construction_value] Construction Value.
" - textlist += "[Floor(servants * 0.2)] Tinkerer's Daemons can be active at once. [LAZYLEN(GLOB.active_daemons)] are active.
" - for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in GLOB.all_clockwork_objects) - var/area/gate_area = get_area(G) - textlist += "Ark Location: [uppertext(gate_area.map_name)]
" - if(G.still_needs_components()) - textlist += "Ark Components required:
" - for(var/i in G.required_components) - if(G.required_components[i]) - textlist += "[get_component_icon(i)] [G.required_components[i]] " - textlist += "
" - else - textlist += "Seconds until Ratvar's arrival: [G.get_arrival_text(TRUE)]
" - break - if(unconverted_ais_exist) - if(unconverted_ais_exist > 1) - textlist += "[unconverted_ais_exist] unconverted AIs exist!
" - else - textlist += "An unconverted AI exists!
" - for(var/i in SSticker.scripture_states) - if(i != SCRIPTURE_DRIVER) //ignore the always-unlocked stuff - textlist += "[i] Scripture: [SSticker.scripture_states[i] ? "UNLOCKED":"LOCKED"]
" + for(var/i in SSticker.scripture_states) + if(i != SCRIPTURE_DRIVER) //ignore the always-unlocked stuff + textlist += "[i] Scripture: [SSticker.scripture_states[i] ? "UNLOCKED":"LOCKED"]
" + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar + if(G) + var/time_info + var/time_name + if(G.seconds_until_activation) + time_info = G.seconds_until_activation + time_name = "until the Ark activates" + else if(G.grace_period) + time_info = G.grace_period + time_name = "of grace period remaining" + else if(G.progress_in_seconds) + time_info = GATEWAY_RATVAR_ARRIVAL - G.progress_in_seconds + time_name = "until the Ark finishes summoning" + if(time_info) + textlist += "[time_info / 60] minutes [time_name].
" + textlist += "[DisplayPower(get_clockwork_power())] power available for use." desc = textlist.Join() ..() @@ -630,7 +544,7 @@ so as to remain in compliance with the most up-to-date laws." if(NOTIFY_JUMP) var/turf/T = get_turf(target) if(T && isturf(T)) - G.loc = T + G.forceMove(T) if(NOTIFY_ORBIT) G.ManualFollow(target) @@ -650,9 +564,20 @@ so as to remain in compliance with the most up-to-date laws." desc = "You're legcuffed, which slows you down considerably. Click the alert to free yourself." /obj/screen/alert/restrained/Click() - if(isliving(usr)) - var/mob/living/L = usr - return L.resist() + var/mob/living/L = usr + if(!L.can_resist()) + return + L.changeNext_move(CLICK_CD_RESIST) + if((L.canmove) && (L.last_special <= world.time)) + return L.resist_restraints() + +/obj/screen/alert/restrained/buckled/Click() + var/mob/living/L = usr + if(!L.can_resist()) + return + L.changeNext_move(CLICK_CD_RESIST) + if(L.last_special <= world.time) + return L.resist_buckle() // PRIVATE = only edit, use, or override these if you're editing the system as a whole diff --git a/code/_onclick/hud/clockwork_marauder.dm b/code/_onclick/hud/clockwork_marauder.dm deleted file mode 100644 index 7429d1deeb6..00000000000 --- a/code/_onclick/hud/clockwork_marauder.dm +++ /dev/null @@ -1,45 +0,0 @@ -/datum/hud/marauder - var/obj/screen/hosthealth - var/obj/screen/blockchance - var/obj/screen/counterchance - -/datum/hud/marauder/New(mob/living/simple_animal/hostile/guardian/owner) - ..() - var/obj/screen/using - - healths = new /obj/screen/healths/clock() - infodisplay += healths - - hosthealth = new /obj/screen/healths/clock() - hosthealth.screen_loc = ui_internal - infodisplay += hosthealth - - using = new /obj/screen/marauder/emerge() - using.screen_loc = ui_zonesel - static_inventory += using - -/datum/hud/marauder/Destroy() - blockchance = null - counterchance = null - hosthealth = null - return ..() - -/mob/living/simple_animal/hostile/clockwork/marauder/create_mob_hud() - if(client && !hud_used) - hud_used = new /datum/hud/marauder(src, ui_style2icon(client.prefs.UI_style)) - -/obj/screen/marauder - icon = 'icons/mob/clockwork_mobs.dmi' - -/obj/screen/marauder/emerge - icon_state = "marauder_emerge" - name = "Emerge/Return" - desc = "Emerge or Return." - -/obj/screen/marauder/emerge/Click() - if(istype(usr, /mob/living/simple_animal/hostile/clockwork/marauder)) - var/mob/living/simple_animal/hostile/clockwork/marauder/M = usr - if(M.is_in_host()) - M.try_emerge() - else - M.return_to_host() diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm index 82173be0006..8f20f218ac2 100644 --- a/code/_onclick/hud/credits.dm +++ b/code/_onclick/hud/credits.dm @@ -2,20 +2,27 @@ #define CREDIT_SPAWN_SPEED 10 #define CREDIT_ANIMATE_HEIGHT (14 * world.icon_size) #define CREDIT_EASE_DURATION 22 +#define CREDITS_PATH "[GLOB.config_dir]contributors.dmi" /client/proc/RollCredits() set waitfor = FALSE + if(!fexists(CREDITS_PATH)) + return + var/icon/credits_icon = new(CREDITS_PATH) LAZYINITLIST(credits) var/list/_credits = credits verbs += /client/proc/ClearCredits - var/static/list/credit_order_for_this_round = list("Thanks for playing!") + (shuffle(icon_states('icons/credits.dmi')) - "Thanks for playing!") + var/static/list/credit_order_for_this_round + if(isnull(credit_order_for_this_round)) + credit_order_for_this_round = list("Thanks for playing!") + (shuffle(icon_states(credits_icon)) - "Thanks for playing!") for(var/I in credit_order_for_this_round) if(!credits) return - _credits += new /obj/screen/credit(null, I, src) + _credits += new /obj/screen/credit(null, I, src, credits_icon) sleep(CREDIT_SPAWN_SPEED) sleep(CREDIT_ROLL_SPEED - CREDIT_SPAWN_SPEED) verbs -= /client/proc/ClearCredits + qdel(credits_icon) /client/proc/ClearCredits() set name = "Hide Credits" @@ -25,7 +32,6 @@ credits = null /obj/screen/credit - icon = 'icons/credits.dmi' mouse_opacity = MOUSE_OPACITY_TRANSPARENT alpha = 0 screen_loc = "12,1" @@ -33,8 +39,9 @@ var/client/parent var/matrix/target -/obj/screen/credit/Initialize(mapload, credited, client/P) +/obj/screen/credit/Initialize(mapload, credited, client/P, icon/I) . = ..() + icon = I parent = P icon_state = credited maptext = credited @@ -53,6 +60,7 @@ /obj/screen/credit/Destroy() var/client/P = parent P.screen -= src + icon = null LAZYREMOVE(P.credits, src) parent = null return ..() diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 2922a4e0366..e7e11600965 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -28,7 +28,7 @@ icon_state = "act_equip" /obj/screen/human/equip/Click() - if(istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech + if(ismecha(usr.loc)) // stops inventory actions in a mech return 1 var/mob/living/carbon/human/H = usr H.quick_equip() @@ -308,11 +308,15 @@ inv.hud = src inv_slots[inv.slot_id] = inv inv.update_icon() + + update_locked_slots() /datum/hud/human/update_locked_slots() if(!mymob) return var/mob/living/carbon/human/H = mymob + if(!istype(H) || !H.dna.species) + return var/datum/species/S = H.dna.species for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b2b516a3b89..1127b2f7214 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -110,7 +110,7 @@ if(usr.incapacitated()) return 1 - if(istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech + if(ismecha(usr.loc)) // stops inventory actions in a mech return 1 if(hud && hud.mymob && slot_id) @@ -167,7 +167,7 @@ return 1 if(usr.incapacitated() || isobserver(usr)) return 1 - if (istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech + if (ismecha(usr.loc)) // stops inventory actions in a mech return 1 if(hud.mymob.active_hand_index == held_index) @@ -351,7 +351,7 @@ return 1 if(usr.stat || usr.IsUnconscious() || usr.IsKnockdown() || usr.IsStun()) return 1 - if (istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech + if (ismecha(usr.loc)) // stops inventory actions in a mech return 1 if(master) var/obj/item/I = usr.get_active_held_item() diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 3b00567e9d2..55f3e83b61b 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -89,16 +89,3 @@ /obj/machinery/teleport/hub/attack_ghost(mob/user) if(power_station && power_station.engaged && power_station.teleporter_console && power_station.teleporter_console.target) user.forceMove(get_turf(power_station.teleporter_console.target)) - -// ------------------------------------------- -// This was supposed to be used by adminghosts -// I think it is a *terrible* idea -// but I'm leaving it here anyway -// commented out, of course. -/* -/atom/proc/attack_admin(mob/user as mob) - if(!user || !user.client || !user.client.holder) - return - attack_hand(user) - -*/ diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index b0ab260d63c..903f3c0790d 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -92,7 +92,7 @@ /obj/item/tk_grab/dropped(mob/user) if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item if(focus.Adjacent(loc)) - focus.loc = loc + focus.forceMove(loc) . = ..() //stops TK grabs being equipped anywhere but into hands diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm deleted file mode 100644 index c3889b94053..00000000000 --- a/code/controllers/configuration.dm +++ /dev/null @@ -1,1017 +0,0 @@ -//Configuraton defines //TODO: Move all yes/no switches into bitflags - -//Used by jobs_have_maint_access -#define ASSISTANTS_HAVE_MAINT_ACCESS 1 -#define SECURITY_HAS_MAINT_ACCESS 2 -#define EVERYONE_HAS_MAINT_ACCESS 4 - -GLOBAL_VAR_INIT(config_dir, "config/") -GLOBAL_PROTECT(config_dir) - -/datum/configuration/can_vv_get(var_name) - var/static/list/banned_gets = list("autoadmin", "autoadmin_rank") - if (var_name in banned_gets) - return FALSE - return ..() - -/datum/configuration/vv_edit_var(var_name, var_value) - var/static/list/banned_edits = list("cross_address", "cross_allowed", "autoadmin", "autoadmin_rank", "invoke_youtubedl") - if(var_name in banned_edits) - return FALSE - return ..() - -/datum/configuration - var/name = "Configuration" // datum name - - var/autoadmin = 0 - var/autoadmin_rank = "Game Admin" - - var/server_name = null // server name (the name of the game window) - var/server_sql_name = null // short form server name used for the DB - var/station_name = null // station name (the name of the station in-game) - var/lobby_countdown = 120 // In between round countdown. - var/round_end_countdown = 25 // Post round murder death kill countdown - var/hub = 0 - - var/log_ooc = 0 // log OOC channel - var/log_access = 0 // log login/logout - var/log_say = 0 // log client say - var/log_admin = 0 // log admin actions - var/log_game = 0 // log game events - var/log_vote = 0 // log voting - var/log_whisper = 0 // log client whisper - var/log_prayer = 0 // log prayers - var/log_law = 0 // log lawchanges - var/log_emote = 0 // log emotes - var/log_attack = 0 // log attack messages - var/log_adminchat = 0 // log admin chat messages - var/log_pda = 0 // log pda messages - var/log_twitter = 0 // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. - var/log_world_topic = 0 // log all world.Topic() calls - var/sql_enabled = 0 // for sql switching - var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour - var/allow_vote_restart = 0 // allow votes to restart - var/allow_vote_mode = 0 // allow votes to change mode - var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default) - var/vote_period = 600 // length of voting period (deciseconds, default 1 minute) - var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi) - var/vote_no_dead = 0 // dead people can't vote (tbi) - var/del_new_on_log = 1 // del's new players if they log before they spawn in - 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/fps = 20 - var/allow_holidays = 0 //toggles whether holiday-specific content should be used - var/tick_limit_mc_init = TICK_LIMIT_MC_INIT_DEFAULT //SSinitialization throttling - - var/hostedby = null - var/respawn = 1 - var/guest_jobban = 1 - var/usewhitelist = 0 - var/inactivity_period = 3000 //time in ds until a player is considered inactive - var/afk_period = 6000 //time in ds until a player is considered afk and kickable - var/kick_inactive = FALSE //force disconnect for inactive players - var/load_jobs_from_txt = 0 - var/automute_on = 0 //enables automuting/spam prevention - var/minimal_access_threshold = 0 //If the number of players is larger than this threshold, minimal access will be turned on. - var/jobs_have_minimal_access = 0 //determines whether jobs use minimal access or expanded access. - var/jobs_have_maint_access = 0 //Who gets maint access? See defines above. - var/sec_start_brig = 0 //makes sec start in brig or dept sec posts - - var/server - var/banappeals - var/wikiurl = "http://www.tgstation13.org/wiki" // Default wiki link. - var/forumurl = "http://tgstation13.org/phpBB/index.php" //default forums - var/rulesurl = "http://www.tgstation13.org/wiki/Rules" // default rules - var/githuburl = "https://www.github.com/tgstation/-tg-station" //default github - var/githubrepoid - - var/forbid_singulo_possession = 0 - var/useircbot = 0 - - var/check_randomizer = 0 - - var/panic_server_name - var/panic_address //Reconnect a player this linked server if this server isn't accepting new players - - var/invoke_youtubedl - - //IP Intel vars - var/ipintel_email - var/ipintel_rating_bad = 1 - var/ipintel_save_good = 12 - var/ipintel_save_bad = 1 - var/ipintel_domain = "check.getipintel.net" - - var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt - var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt - var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database - var/use_account_age_for_jobs = 0 //Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected. - var/see_own_notes = 0 //Can players see their own admin notes (read-only)? Config option in config.txt - var/note_fresh_days - var/note_stale_days - - var/use_exp_tracking = FALSE - var/use_exp_restrictions_heads = FALSE - var/use_exp_restrictions_heads_hours = 0 - var/use_exp_restrictions_heads_department = FALSE - var/use_exp_restrictions_other = FALSE - var/use_exp_restrictions_admin_bypass = FALSE - - //Population cap vars - var/soft_popcap = 0 - var/hard_popcap = 0 - var/extreme_popcap = 0 - var/soft_popcap_message = "Be warned that the server is currently serving a high number of users, consider using alternative game servers." - var/hard_popcap_message = "The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers." - var/extreme_popcap_message = "The server is currently serving a high number of users, find alternative servers." - - //game_options.txt configs - var/force_random_names = 0 - var/list/mode_names = list() - var/list/mode_reports = list() - var/list/mode_false_report_weight = list() - var/list/modes = list() // allowed modes - var/list/votable_modes = list() // votable modes - var/list/probabilities = list() // relative probability of each mode - var/list/min_pop = list() // overrides for acceptible player counts in a mode - var/list/max_pop = list() - var/list/repeated_mode_adjust = list() // weight adjustments for recent modes - - var/humans_need_surnames = 0 - var/allow_ai = 0 // allow ai job - var/forbid_secborg = 0 // disallow secborg module to be chosen. - var/forbid_peaceborg = 0 - var/panic_bunker = 0 // prevents new people it hasn't seen before from connecting - var/notify_new_player_age = 0 // how long do we notify admins of a new player - var/notify_new_player_account_age = 0 // how long do we notify admins of a new byond account - var/irc_first_connection_alert = 0 // do we notify the irc channel when somebody is connecting for the first time? - - var/traitor_scaling_coeff = 6 //how much does the amount of players get divided by to determine traitors - var/brother_scaling_coeff = 25 //how many players per brother team - var/changeling_scaling_coeff = 6 //how much does the amount of players get divided by to determine changelings - var/security_scaling_coeff = 8 //how much does the amount of players get divided by to determine open security officer positions - var/abductor_scaling_coeff = 15 //how many players per abductor team - - var/traitor_objectives_amount = 2 - var/brother_objectives_amount = 2 - var/protect_roles_from_antagonist = 0 //If security and such can be traitor/cult/other - var/protect_assistant_from_antagonist = 0 //If assistants can be traitor/cult/other - var/enforce_human_authority = 0 //If non-human species are barred from joining as a head of staff - var/allow_latejoin_antagonists = 0 // If late-joining players can be traitor/changeling - var/list/continuous = list() // which roundtypes continue if all antagonists die - var/list/midround_antag = list() // which roundtypes use the midround antagonist system - var/midround_antag_time_check = 60 // How late (in minutes) you want the midround antag system to stay on, setting this to 0 will disable the system - var/midround_antag_life_check = 0.7 // A ratio of how many people need to be alive in order for the round not to immediately end in midround antagonist - var/shuttle_refuel_delay = 12000 - var/show_game_type_odds = 0 //if set this allows players to see the odds of each roundtype on the get revision screen - var/mutant_races = 0 //players can choose their mutant race before joining the game - var/list/roundstart_races = list() //races you can play as from the get go. If left undefined the game's roundstart var for species is used - var/mutant_humans = 0 //players can pick mutant bodyparts for humans before joining the game - - var/no_summon_guns //No - var/no_summon_magic //Fun - var/no_summon_events //Allowed - - var/intercept = 1 //Whether or not to send a communications intercept report roundstart. This may be overriden by gamemodes. - var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." - var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." - var/alert_desc_blue_downto = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed." - var/alert_desc_red_upto = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised." - var/alert_desc_red_downto = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." - var/alert_desc_delta = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." - - var/revival_pod_plants = FALSE - var/revival_cloning = FALSE - var/revival_brain_life = -1 - - var/rename_cyborg = 0 - var/ooc_during_round = 0 - var/emojis = 0 - var/no_credits_round_end = FALSE - - //Used for modifying movement speed for mobs. - //Unversal modifiers - var/run_speed = 0 - var/walk_speed = 0 - - //Mob specific modifiers. NOTE: These will affect different mob types in different ways - var/human_delay = 0 - var/robot_delay = 0 - var/monkey_delay = 0 - var/alien_delay = 0 - var/slime_delay = 0 - var/animal_delay = 0 - - var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour. - var/ghost_interaction = 0 - - var/silent_ai = 0 - var/silent_borg = 0 - - var/damage_multiplier = 1 //Modifier for damage to all mobs. Impacts healing as well. - - var/allowwebclient = 0 - var/webclientmembersonly = 0 - - var/sandbox_autoclose = FALSE // close the sandbox panel after spawning an item, potentially reducing griff - - var/default_laws = 0 //Controls what laws the AI spawns with. - var/silicon_max_law_amount = 12 - var/list/lawids = list() - - var/list/law_weights = list() - - var/assistant_cap = -1 - - var/starlight = 0 - var/generate_minimaps = 0 - var/grey_assistants = 0 - - var/id_console_jobslot_delay = 30 - - var/lavaland_budget = 60 - var/space_budget = 16 - - var/aggressive_changelog = 0 - - var/reactionary_explosions = 0 //If we use reactionary explosions, explosions that react to walls and doors - - var/autoconvert_notes = 0 //if all connecting player's notes should attempt to be converted to the database - - var/announce_admin_logout = 0 - var/announce_admin_login = 0 - - var/list/datum/map_config/maplist = list() - var/datum/map_config/defaultmap = null - var/maprotation = 1 - var/maprotatechancedelta = 0.75 - var/allow_map_voting = TRUE - - // Enables random events mid-round when set to 1 - var/allow_random_events = 0 - - // Multipliers for random events minimal starting time and minimal players amounts - var/events_min_time_mul = 1 - var/events_min_players_mul = 1 - - // The object used for the clickable stat() button. - var/obj/effect/statclick/statclick - - var/client_warn_version = 0 - var/client_warn_message = "Your version of byond may have issues or be blocked from accessing this server in the future." - var/client_error_version = 0 - var/client_error_message = "Your version of byond is too old, may have issues, and is blocked from accessing this server." - - var/cross_name = "Other server" - var/cross_address = "byond://" - var/cross_allowed = FALSE - var/showircname = 0 - - var/list/gamemode_cache = null - - var/minutetopiclimit - var/secondtopiclimit - - var/error_cooldown = 600 // The "cooldown" time for each occurrence of a unique error - var/error_limit = 50 // How many occurrences before the next will silence them - var/error_silence_time = 6000 // How long a unique error will be silenced for - var/error_msg_delay = 50 // How long to wait between messaging admins about occurrences of a unique error - - var/arrivals_shuttle_dock_window = 55 //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station - var/arrivals_shuttle_require_safe_latejoin = FALSE //Require the arrivals shuttle to be operational in order for latejoiners to join - - var/mice_roundstart = 10 // how many wire chewing rodents spawn at roundstart. - - var/irc_announce_new_game = FALSE - - var/list/policies = list() - - var/debug_admin_hrefs = FALSE //turns off admin href token protection for debugging purposes - -/datum/configuration/New() - gamemode_cache = typecacheof(/datum/game_mode,TRUE) - for(var/T in gamemode_cache) - // I wish I didn't have to instance the game modes in order to look up - // their information, but it is the only way (at least that I know of). - var/datum/game_mode/M = new T() - - if(M.config_tag) - if(!(M.config_tag in modes)) // ensure each mode is added only once - WRITE_FILE(GLOB.config_error_log, "Adding game mode [M.name] ([M.config_tag]) to configuration.") - modes += M.config_tag - mode_names[M.config_tag] = M.name - probabilities[M.config_tag] = M.probability - mode_reports[M.config_tag] = M.generate_report() - mode_false_report_weight[M.config_tag] = M.false_report_weight - if(M.votable) - votable_modes += M.config_tag - qdel(M) - votable_modes += "secret" - - Reload() - -/datum/configuration/proc/Reload() - load("config.txt") - load("comms.txt", "comms") - load("game_options.txt","game_options") - load("policies.txt", "policies") - loadsql("dbconfig.txt") - if (maprotation) - loadmaplist("maps.txt") - - // apply some settings from config.. - GLOB.abandon_allowed = respawn - -/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist - filename = "[GLOB.config_dir][filename]" - var/list/Lines = world.file2list(filename) - for(var/t in Lines) - if(!t) - continue - - t = trim(t) - if(length(t) == 0) - continue - else if(copytext(t, 1, 2) == "#") - continue - - var/pos = findtext(t, " ") - var/name = null - var/value = null - - if(pos) - name = lowertext(copytext(t, 1, pos)) - value = copytext(t, pos + 1) - else - name = lowertext(t) - - if(!name) - continue - - if(type == "config") - switch(name) - if("hub") - hub = 1 - if("admin_legacy_system") - admin_legacy_system = 1 - if("ban_legacy_system") - ban_legacy_system = 1 - if("use_age_restriction_for_jobs") - use_age_restriction_for_jobs = 1 - if("use_account_age_for_jobs") - use_account_age_for_jobs = 1 - if("use_exp_tracking") - use_exp_tracking = TRUE - if("use_exp_restrictions_heads") - use_exp_restrictions_heads = TRUE - if("use_exp_restrictions_heads_hours") - use_exp_restrictions_heads_hours = text2num(value) - if("use_exp_restrictions_heads_department") - use_exp_restrictions_heads_department = TRUE - if("use_exp_restrictions_other") - use_exp_restrictions_other = TRUE - if("use_exp_restrictions_admin_bypass") - use_exp_restrictions_admin_bypass = TRUE - if("lobby_countdown") - lobby_countdown = text2num(value) - if("round_end_countdown") - round_end_countdown = text2num(value) - if("log_ooc") - log_ooc = 1 - if("log_access") - log_access = 1 - if("log_say") - log_say = 1 - if("log_admin") - log_admin = 1 - if("log_prayer") - log_prayer = 1 - if("log_law") - log_law = 1 - if("log_game") - log_game = 1 - if("log_vote") - log_vote = 1 - if("log_whisper") - log_whisper = 1 - if("log_attack") - log_attack = 1 - if("log_emote") - log_emote = 1 - if("log_adminchat") - log_adminchat = 1 - if("log_pda") - log_pda = 1 - if("log_twitter") - log_twitter = 1 - if("log_world_topic") - log_world_topic = 1 - if("allow_admin_ooccolor") - allow_admin_ooccolor = 1 - if("allow_vote_restart") - allow_vote_restart = 1 - if("allow_vote_mode") - allow_vote_mode = 1 - if("no_dead_vote") - vote_no_dead = 1 - if("default_no_vote") - vote_no_default = 1 - if("vote_delay") - vote_delay = text2num(value) - if("vote_period") - vote_period = text2num(value) - if("norespawn") - respawn = 0 - if("servername") - server_name = value - if("serversqlname") - server_sql_name = value - if("stationname") - station_name = value - if("hostedby") - hostedby = value - if("server") - server = value - if("banappeals") - banappeals = value - if("wikiurl") - wikiurl = value - if("forumurl") - forumurl = value - if("rulesurl") - rulesurl = value - if("githuburl") - githuburl = value - if("githubrepoid") - githubrepoid = value - if("guest_jobban") - guest_jobban = 1 - if("guest_ban") - GLOB.guests_allowed = 0 - if("usewhitelist") - usewhitelist = TRUE - if("allow_metadata") - allow_Metadata = 1 - if("id_console_jobslot_delay") - id_console_jobslot_delay = text2num(value) - if("inactivity_period") - inactivity_period = text2num(value) * 10 //documented as seconds in config.txt - if("afk_period") - afk_period = text2num(value) * 10 // ^^^ - if("kick_inactive") - kick_inactive = TRUE - if("load_jobs_from_txt") - load_jobs_from_txt = 1 - if("forbid_singulo_possession") - forbid_singulo_possession = 1 - if("popup_admin_pm") - popup_admin_pm = 1 - if("allow_holidays") - allow_holidays = 1 - if("useircbot") //tgs2 support - useircbot = 1 - if("ticklag") - var/ticklag = text2num(value) - if(ticklag > 0) - fps = 10 / ticklag - if("tick_limit_mc_init") - tick_limit_mc_init = text2num(value) - if("fps") - fps = text2num(value) - if("automute_on") - automute_on = 1 - if("panic_server_name") - if (value != "\[Put the name here\]") - panic_server_name = value - if("panic_server_address") - if(value != "byond://address:port") - panic_address = value - if("invoke_youtubedl") - invoke_youtubedl = value - if("show_irc_name") - showircname = 1 - if("see_own_notes") - see_own_notes = 1 - if("note_fresh_days") - note_fresh_days = text2num(value) - if("note_stale_days") - note_stale_days = text2num(value) - if("soft_popcap") - soft_popcap = text2num(value) - if("hard_popcap") - hard_popcap = text2num(value) - if("extreme_popcap") - extreme_popcap = text2num(value) - if("soft_popcap_message") - soft_popcap_message = value - if("hard_popcap_message") - hard_popcap_message = value - if("extreme_popcap_message") - extreme_popcap_message = value - if("panic_bunker") - panic_bunker = 1 - if("notify_new_player_age") - notify_new_player_age = text2num(value) - if("notify_new_player_account_age") - notify_new_player_account_age = text2num(value) - if("irc_first_connection_alert") - irc_first_connection_alert = 1 - if("check_randomizer") - check_randomizer = 1 - if("ipintel_email") - if (value != "ch@nge.me") - ipintel_email = value - if("ipintel_rating_bad") - ipintel_rating_bad = text2num(value) - if("ipintel_domain") - ipintel_domain = value - if("ipintel_save_good") - ipintel_save_good = text2num(value) - if("ipintel_save_bad") - ipintel_save_bad = text2num(value) - if("aggressive_changelog") - aggressive_changelog = 1 - if("autoconvert_notes") - autoconvert_notes = 1 - if("allow_webclient") - allowwebclient = 1 - if("webclient_only_byond_members") - webclientmembersonly = 1 - if("announce_admin_logout") - announce_admin_logout = 1 - if("announce_admin_login") - announce_admin_login = 1 - if("maprotation") - maprotation = 1 - if("allow_map_voting") - allow_map_voting = text2num(value) - if("maprotationchancedelta") - maprotatechancedelta = text2num(value) - if("autoadmin") - autoadmin = 1 - if(value) - autoadmin_rank = ckeyEx(value) - if("generate_minimaps") - generate_minimaps = 1 - if("client_warn_version") - client_warn_version = text2num(value) - if("client_warn_message") - client_warn_message = value - if("client_error_version") - client_error_version = text2num(value) - if("client_error_message") - client_error_message = value - if("minute_topic_limit") - minutetopiclimit = text2num(value) - if("second_topic_limit") - secondtopiclimit = text2num(value) - if("error_cooldown") - error_cooldown = text2num(value) - if("error_limit") - error_limit = text2num(value) - if("error_silence_time") - error_silence_time = text2num(value) - if("error_msg_delay") - error_msg_delay = text2num(value) - if("irc_announce_new_game") - irc_announce_new_game = TRUE - if("debug_admin_hrefs") - debug_admin_hrefs = TRUE - else -#if DM_VERSION > 511 -#error Replace the line below with WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'") -#endif - HandleCommsConfig(name, value) //TODO: Deprecate this eventually - else if(type == "comms") - HandleCommsConfig(name, value) - else if(type == "game_options") - switch(name) - if("damage_multiplier") - damage_multiplier = text2num(value) - if("revival_pod_plants") - revival_pod_plants = TRUE - if("revival_cloning") - revival_cloning = TRUE - if("revival_brain_life") - revival_brain_life = text2num(value) - if("rename_cyborg") - rename_cyborg = 1 - if("ooc_during_round") - ooc_during_round = 1 - if("emojis") - emojis = 1 - if("no_credits_round_end") - no_credits_round_end = TRUE - if("run_delay") - run_speed = text2num(value) - if("walk_delay") - walk_speed = text2num(value) - if("human_delay") - human_delay = text2num(value) - if("robot_delay") - robot_delay = text2num(value) - if("monkey_delay") - monkey_delay = text2num(value) - if("alien_delay") - alien_delay = text2num(value) - if("slime_delay") - slime_delay = text2num(value) - if("animal_delay") - animal_delay = text2num(value) - if("alert_red_upto") - alert_desc_red_upto = value - if("alert_red_downto") - alert_desc_red_downto = value - if("alert_blue_downto") - alert_desc_blue_downto = value - if("alert_blue_upto") - alert_desc_blue_upto = value - if("alert_green") - alert_desc_green = value - if("alert_delta") - alert_desc_delta = value - if("no_intercept_report") - intercept = 0 - if("assistants_have_maint_access") - jobs_have_maint_access |= ASSISTANTS_HAVE_MAINT_ACCESS - if("security_has_maint_access") - jobs_have_maint_access |= SECURITY_HAS_MAINT_ACCESS - if("everyone_has_maint_access") - jobs_have_maint_access |= EVERYONE_HAS_MAINT_ACCESS - if("sec_start_brig") - sec_start_brig = 1 - if("gateway_delay") - gateway_delay = text2num(value) - if("continuous") - var/mode_name = lowertext(value) - if(mode_name in modes) - continuous[mode_name] = 1 - else - WRITE_FILE(GLOB.config_error_log, "Unknown continuous configuration definition: [mode_name].") - if("midround_antag") - var/mode_name = lowertext(value) - if(mode_name in modes) - midround_antag[mode_name] = 1 - else - WRITE_FILE(GLOB.config_error_log, "Unknown midround antagonist configuration definition: [mode_name].") - if("midround_antag_time_check") - midround_antag_time_check = text2num(value) - if("midround_antag_life_check") - midround_antag_life_check = text2num(value) - if("min_pop") - var/pop_pos = findtext(value, " ") - var/mode_name = null - var/mode_value = null - - if(pop_pos) - mode_name = lowertext(copytext(value, 1, pop_pos)) - mode_value = copytext(value, pop_pos + 1) - if(mode_name in modes) - min_pop[mode_name] = text2num(mode_value) - else - WRITE_FILE(GLOB.config_error_log, "Unknown minimum population configuration definition: [mode_name].") - else - WRITE_FILE(GLOB.config_error_log, "Incorrect minimum population configuration definition: [mode_name] [mode_value].") - if("max_pop") - var/pop_pos = findtext(value, " ") - var/mode_name = null - var/mode_value = null - - if(pop_pos) - mode_name = lowertext(copytext(value, 1, pop_pos)) - mode_value = copytext(value, pop_pos + 1) - if(mode_name in modes) - max_pop[mode_name] = text2num(mode_value) - else - WRITE_FILE(GLOB.config_error_log, "Unknown maximum population configuration definition: [mode_name].") - else - WRITE_FILE(GLOB.config_error_log, "Incorrect maximum population configuration definition: [mode_name] [mode_value].") - if("shuttle_refuel_delay") - shuttle_refuel_delay = text2num(value) - if("show_game_type_odds") - show_game_type_odds = 1 - if("ghost_interaction") - ghost_interaction = 1 - if("traitor_scaling_coeff") - traitor_scaling_coeff = text2num(value) - if("brother_scaling_coeff") - brother_scaling_coeff = text2num(value) - if("changeling_scaling_coeff") - changeling_scaling_coeff = text2num(value) - if("security_scaling_coeff") - security_scaling_coeff = text2num(value) - if("abductor_scaling_coeff") - abductor_scaling_coeff = text2num(value) - if("traitor_objectives_amount") - traitor_objectives_amount = text2num(value) - if("brother_objectives_amount") - brother_objectives_amount = text2num(value) - if("probability") - var/prob_pos = findtext(value, " ") - var/prob_name = null - var/prob_value = null - - if(prob_pos) - prob_name = lowertext(copytext(value, 1, prob_pos)) - prob_value = copytext(value, prob_pos + 1) - if(prob_name in modes) - probabilities[prob_name] = text2num(prob_value) - else - WRITE_FILE(GLOB.config_error_log, "Unknown game mode probability configuration definition: [prob_name].") - else - WRITE_FILE(GLOB.config_error_log, "Incorrect probability configuration definition: [prob_name] [prob_value].") - if("repeated_mode_adjust") - if(value) - repeated_mode_adjust.Cut() - var/values = splittext(value," ") - for(var/v in values) - repeated_mode_adjust += text2num(v) - else - WRITE_FILE(GLOB.config_error_log, "Incorrect round weight adjustment configuration definition for [value].") - if("protect_roles_from_antagonist") - protect_roles_from_antagonist = 1 - if("protect_assistant_from_antagonist") - protect_assistant_from_antagonist = 1 - if("enforce_human_authority") - enforce_human_authority = 1 - if("allow_latejoin_antagonists") - allow_latejoin_antagonists = 1 - if("allow_random_events") - allow_random_events = 1 - - if("events_min_time_mul") - events_min_time_mul = text2num(value) - if("events_min_players_mul") - events_min_players_mul = text2num(value) - - if("minimal_access_threshold") - minimal_access_threshold = text2num(value) - if("jobs_have_minimal_access") - jobs_have_minimal_access = 1 - if("humans_need_surnames") - humans_need_surnames = 1 - if("force_random_names") - force_random_names = 1 - if("allow_ai") - allow_ai = 1 - if("disable_secborg") - forbid_secborg = 1 - if("disable_peaceborg") - forbid_peaceborg = 1 - if("silent_ai") - silent_ai = 1 - if("silent_borg") - silent_borg = 1 - if("sandbox_autoclose") - sandbox_autoclose = 1 - if("default_laws") - default_laws = text2num(value) - if("random_laws") - var/law_id = lowertext(value) - lawids += law_id - if("law_weight") - // Value is in the form "LAWID,NUMBER" - var/list/L = splittext(value, ",") - if(L.len != 2) - WRITE_FILE(GLOB.config_error_log, "Invalid LAW_WEIGHT: " + t) - continue - var/lawid = L[1] - var/weight = text2num(L[2]) - law_weights[lawid] = weight - - if("silicon_max_law_amount") - silicon_max_law_amount = text2num(value) - if("join_with_mutant_race") - mutant_races = 1 - if("roundstart_races") - var/race_id = lowertext(value) - for(var/species_id in GLOB.species_list) - if(species_id == race_id) - roundstart_races += GLOB.species_list[species_id] - GLOB.roundstart_species[species_id] = GLOB.species_list[species_id] - if("join_with_mutant_humans") - mutant_humans = 1 - if("assistant_cap") - assistant_cap = text2num(value) - if("starlight") - starlight = 1 - if("grey_assistants") - grey_assistants = 1 - if("lavaland_budget") - lavaland_budget = text2num(value) - if("space_budget") - space_budget = text2num(value) - if("no_summon_guns") - no_summon_guns = 1 - if("no_summon_magic") - no_summon_magic = 1 - if("no_summon_events") - no_summon_events = 1 - if("reactionary_explosions") - reactionary_explosions = 1 - if("bombcap") - var/BombCap = text2num(value) - if (!BombCap) - continue - if (BombCap < 4) - BombCap = 4 - - GLOB.MAX_EX_DEVESTATION_RANGE = round(BombCap/4) - GLOB.MAX_EX_HEAVY_RANGE = round(BombCap/2) - GLOB.MAX_EX_LIGHT_RANGE = BombCap - GLOB.MAX_EX_FLASH_RANGE = BombCap - GLOB.MAX_EX_FLAME_RANGE = BombCap - if("arrivals_shuttle_dock_window") - arrivals_shuttle_dock_window = max(PARALLAX_LOOP_TIME, text2num(value)) - if("arrivals_shuttle_require_safe_latejoin") - arrivals_shuttle_require_safe_latejoin = TRUE - if("mice_roundstart") - mice_roundstart = text2num(value) - else - WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'") - else if(type == "policies") - policies[name] = value - - fps = round(fps) - if(fps <= 0) - fps = initial(fps) - -/datum/configuration/proc/HandleCommsConfig(name, value) - switch(name) - if("comms_key") - global.comms_key = value - if(value != "default_pwd" && length(value) > 6) //It's the default value or less than 6 characters long, warn badmins - global.comms_allowed = TRUE - if("cross_server_address") - cross_address = value - if(value != "byond:\\address:port") - cross_allowed = TRUE - if("cross_comms_name") - cross_name = value - if("medal_hub_address") - global.medal_hub = value - if("medal_hub_password") - global.medal_pass = value - else - WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'") - -/datum/configuration/proc/loadmaplist(filename) - filename = "[GLOB.config_dir][filename]" - var/list/Lines = world.file2list(filename) - - var/datum/map_config/currentmap = null - for(var/t in Lines) - if(!t) - continue - - t = trim(t) - if(length(t) == 0) - continue - else if(copytext(t, 1, 2) == "#") - continue - - var/pos = findtext(t, " ") - var/command = null - var/data = null - - if(pos) - command = lowertext(copytext(t, 1, pos)) - data = copytext(t, pos + 1) - else - command = lowertext(t) - - if(!command) - continue - - if (!currentmap && command != "map") - continue - - switch (command) - if ("map") - currentmap = new ("_maps/[data].json") - if(currentmap.defaulted) - log_world("Failed to load map config for [data]!") - if ("minplayers","minplayer") - currentmap.config_min_users = text2num(data) - if ("maxplayers","maxplayer") - currentmap.config_max_users = text2num(data) - if ("weight","voteweight") - currentmap.voteweight = text2num(data) - if ("default","defaultmap") - defaultmap = currentmap - if ("endmap") - maplist[currentmap.map_name] = currentmap - currentmap = null - if ("disabled") - currentmap = null - else - WRITE_FILE(GLOB.config_error_log, "Unknown command in map vote config: '[command]'") - - -/datum/configuration/proc/loadsql(filename) - filename = "[GLOB.config_dir][filename]" - var/list/Lines = world.file2list(filename) - for(var/t in Lines) - if(!t) - continue - - t = trim(t) - if(length(t) == 0) - continue - else if(copytext(t, 1, 2) == "#") - continue - - var/pos = findtext(t, " ") - var/name = null - var/value = null - - if(pos) - name = lowertext(copytext(t, 1, pos)) - value = copytext(t, pos + 1) - else - name = lowertext(t) - - if(!name) - continue - - switch(name) - if("sql_enabled") - sql_enabled = 1 - if("address") - global.sqladdress = value - if("port") - global.sqlport = value - if("feedback_database") - global.sqlfdbkdb = value - if("feedback_login") - global.sqlfdbklogin = value - if("feedback_password") - global.sqlfdbkpass = value - if("feedback_tableprefix") - global.sqlfdbktableprefix = value - else - WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'") - -/datum/configuration/proc/pick_mode(mode_name) - // I wish I didn't have to instance the game modes in order to look up - // their information, but it is the only way (at least that I know of). - // ^ This guy didn't try hard enough - for(var/T in gamemode_cache) - var/datum/game_mode/M = T - var/ct = initial(M.config_tag) - if(ct && ct == mode_name) - return new T - return new /datum/game_mode/extended() - -/datum/configuration/proc/get_runnable_modes() - var/list/datum/game_mode/runnable_modes = new - for(var/T in gamemode_cache) - var/datum/game_mode/M = new T() - //to_chat(world, "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]") - if(!(M.config_tag in modes)) - qdel(M) - continue - if(probabilities[M.config_tag]<=0) - qdel(M) - continue - if(min_pop[M.config_tag]) - M.required_players = min_pop[M.config_tag] - if(max_pop[M.config_tag]) - M.maximum_players = max_pop[M.config_tag] - if(M.can_start()) - var/final_weight = probabilities[M.config_tag] - if(SSpersistence.saved_modes.len == 3 && repeated_mode_adjust.len == 3) - var/recent_round = min(SSpersistence.saved_modes.Find(M.config_tag),3) - var/adjustment = 0 - while(recent_round) - adjustment += repeated_mode_adjust[recent_round] - recent_round = SSpersistence.saved_modes.Find(M.config_tag,recent_round+1,0) - final_weight *= ((100-adjustment)/100) - runnable_modes[M] = final_weight - return runnable_modes - -/datum/configuration/proc/get_runnable_midround_modes(crew) - var/list/datum/game_mode/runnable_modes = new - for(var/T in (gamemode_cache - SSticker.mode.type)) - var/datum/game_mode/M = new T() - if(!(M.config_tag in modes)) - qdel(M) - continue - if(probabilities[M.config_tag]<=0) - qdel(M) - continue - if(min_pop[M.config_tag]) - M.required_players = min_pop[M.config_tag] - if(max_pop[M.config_tag]) - M.maximum_players = max_pop[M.config_tag] - if(M.required_players <= crew) - if(M.maximum_players >= 0 && M.maximum_players < crew) - continue - runnable_modes[M] = probabilities[M.config_tag] - return runnable_modes - -/datum/configuration/proc/stat_entry() - if(!statclick) - statclick = new/obj/effect/statclick/debug(null, "Edit", src) - - stat("[name]:", statclick) diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm new file mode 100644 index 00000000000..b439743a799 --- /dev/null +++ b/code/controllers/configuration/config_entry.dm @@ -0,0 +1,198 @@ +#undef CURRENT_RESIDENT_FILE + +#define LIST_MODE_NUM 0 +#define LIST_MODE_TEXT 1 +#define LIST_MODE_FLAG 2 + +/datum/config_entry + var/name //read-only, this is determined by the last portion of the derived entry type + var/value + var/default //read-only, just set value directly + + var/resident_file //the file which this belongs to, must be set + var/modified = FALSE //set to TRUE if the default has been overridden by a config entry + + var/protection = NONE + var/abstract_type = /datum/config_entry //do not instantiate if type matches this + + var/dupes_allowed = FALSE + +/datum/config_entry/New() + if(!resident_file) + CRASH("Config entry [type] has no resident_file set") + if(type == abstract_type) + CRASH("Abstract config entry [type] instatiated!") + name = lowertext(type2top(type)) + if(islist(value)) + var/list/L = value + default = L.Copy() + else + default = value + +/datum/config_entry/Destroy() + config.RemoveEntry(src) + return ..() + +/datum/config_entry/can_vv_get(var_name) + . = ..() + if(var_name == "value" || var_name == "default") + . &= !(protection & CONFIG_ENTRY_HIDDEN) + +/datum/config_entry/vv_edit_var(var_name, var_value) + var/static/list/banned_edits = list("name", "default", "resident_file", "protection", "abstract_type", "modified", "dupes_allowed") + if(var_name == "value") + if(protection & CONFIG_ENTRY_LOCKED) + return FALSE + . = ValidateAndSet("[var_value]") + if(.) + var_edited = TRUE + return + if(var_name in banned_edits) + return FALSE + return ..() + +/datum/config_entry/proc/VASProcCallGuard(str_val) + . = !(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "ValidateAndSet" && GLOB.LastAdminCalledTargetRef == "\ref[src]") + if(!.) + log_admin_private("Config set of [type] to [str_val] attempted by [key_name(usr)]") + +/datum/config_entry/proc/ValidateAndSet(str_val) + VASProcCallGuard(str_val) + CRASH("Invalid config entry type!") + +/datum/config_entry/proc/ValidateKeyedList(str_val, list_mode, splitter) + str_val = trim(str_val) + var/key_pos = findtext(str_val, splitter) + var/key_name = null + var/key_value = null + + if(key_pos || list_mode == LIST_MODE_FLAG) + key_name = lowertext(copytext(str_val, 1, key_pos)) + key_value = copytext(str_val, key_pos + 1) + var/temp + var/continue_check + switch(list_mode) + if(LIST_MODE_FLAG) + temp = TRUE + continue_check = TRUE + if(LIST_MODE_NUM) + temp = text2num(key_value) + continue_check = !isnull(temp) + if(LIST_MODE_TEXT) + temp = key_value + continue_check = temp + if(continue_check && ValidateKeyName(key_name)) + value[key_name] = temp + return TRUE + return FALSE + +/datum/config_entry/proc/ValidateKeyName(key_name) + return TRUE + +/datum/config_entry/string + value = "" + abstract_type = /datum/config_entry/string + var/auto_trim = TRUE + +/datum/config_entry/string/vv_edit_var(var_name, var_value) + return var_name != "auto_trim" && ..() + +/datum/config_entry/string/ValidateAndSet(str_val) + if(!VASProcCallGuard(str_val)) + return FALSE + value = auto_trim ? trim(str_val) : str_val + return TRUE + +/datum/config_entry/number + value = 0 + abstract_type = /datum/config_entry/number + var/integer = TRUE + var/max_val = INFINITY + var/min_val = -INFINITY + +/datum/config_entry/number/ValidateAndSet(str_val) + if(!VASProcCallGuard(str_val)) + return FALSE + var/temp = text2num(trim(str_val)) + if(!isnull(temp)) + value = Clamp(integer ? round(temp) : temp, min_val, max_val) + if(value != temp && !var_edited) + log_config("Changing [name] from [temp] to [value]!") + return TRUE + return FALSE + +/datum/config_entry/number/vv_edit_var(var_name, var_value) + var/static/list/banned_edits = list("max_val", "min_val", "integer") + return !(var_name in banned_edits) && ..() + +/datum/config_entry/flag + value = FALSE + abstract_type = /datum/config_entry/flag + +/datum/config_entry/flag/ValidateAndSet(str_val) + if(!VASProcCallGuard(str_val)) + return FALSE + value = text2num(trim(str_val)) != 0 + return TRUE + +/datum/config_entry/number_list + abstract_type = /datum/config_entry/number_list + value = list() + +/datum/config_entry/number_list/ValidateAndSet(str_val) + if(!VASProcCallGuard(str_val)) + return FALSE + str_val = trim(str_val) + var/list/new_list = list() + var/list/values = splittext(str_val," ") + for(var/I in values) + var/temp = text2num(I) + if(isnull(temp)) + return FALSE + new_list += temp + if(!new_list.len) + return FALSE + value = new_list + return TRUE + +/datum/config_entry/keyed_flag_list + abstract_type = /datum/config_entry/keyed_flag_list + value = list() + dupes_allowed = TRUE + +/datum/config_entry/keyed_flag_list/ValidateAndSet(str_val) + if(!VASProcCallGuard(str_val)) + return FALSE + return ValidateKeyedList(str_val, LIST_MODE_FLAG, " ") + +/datum/config_entry/keyed_number_list + abstract_type = /datum/config_entry/keyed_number_list + value = list() + dupes_allowed = TRUE + var/splitter = " " + +/datum/config_entry/keyed_number_list/vv_edit_var(var_name, var_value) + return var_name != "splitter" && ..() + +/datum/config_entry/keyed_number_list/ValidateAndSet(str_val) + if(!VASProcCallGuard(str_val)) + return FALSE + return ValidateKeyedList(str_val, LIST_MODE_NUM, splitter) + +/datum/config_entry/keyed_string_list + abstract_type = /datum/config_entry/keyed_string_list + value = list() + dupes_allowed = TRUE + var/splitter = " " + +/datum/config_entry/keyed_string_list/vv_edit_var(var_name, var_value) + return var_name != "splitter" && ..() + +/datum/config_entry/keyed_string_list/ValidateAndSet(str_val) + if(!VASProcCallGuard(str_val)) + return FALSE + return ValidateKeyedList(str_val, LIST_MODE_TEXT, splitter) + +#undef LIST_MODE_NUM +#undef LIST_MODE_TEXT +#undef LIST_MODE_FLAG diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm new file mode 100644 index 00000000000..a9807a599c1 --- /dev/null +++ b/code/controllers/configuration/configuration.dm @@ -0,0 +1,294 @@ +GLOBAL_VAR_INIT(config_dir, "config/") +GLOBAL_PROTECT(config_dir) + +/datum/controller/configuration + name = "Configuration" + + var/hiding_entries_by_type = TRUE //Set for readability, admins can set this to FALSE if they want to debug it + var/list/entries + var/list/entries_by_type + + var/list/maplist + var/datum/map_config/defaultmap + + var/list/modes // allowed modes + var/list/gamemode_cache + var/list/votable_modes // votable modes + var/list/mode_names + var/list/mode_reports + var/list/mode_false_report_weight + +/datum/controller/configuration/New() + config = src + var/list/config_files = InitEntries() + LoadModes() + for(var/I in config_files) + LoadEntries(I) + loadmaplist(CONFIG_MAPS_FILE) + +/datum/controller/configuration/Destroy() + entries_by_type.Cut() + QDEL_LIST_ASSOC_VAL(entries) + QDEL_LIST_ASSOC_VAL(maplist) + QDEL_NULL(defaultmap) + + config = null + + return ..() + +/datum/controller/configuration/proc/InitEntries() + var/list/_entries = list() + entries = _entries + var/list/_entries_by_type = list() + entries_by_type = _entries_by_type + + . = list() + + for(var/I in typesof(/datum/config_entry)) //typesof is faster in this case + var/datum/config_entry/E = I + if(initial(E.abstract_type) == I) + continue + E = new I + _entries_by_type[I] = E + var/esname = E.name + var/datum/config_entry/test = _entries[esname] + if(test) + log_config("Error: [test.type] has the same name as [E.type]: [esname]! Not initializing [E.type]!") + qdel(E) + continue + _entries[esname] = E + .[E.resident_file] = TRUE + +/datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE) + entries -= CE.name + entries_by_type -= CE.type + +/datum/controller/configuration/proc/LoadEntries(filename) + log_config("Loading config file [filename]...") + var/list/lines = world.file2list("[GLOB.config_dir][filename]") + var/list/_entries = entries + for(var/L in lines) + if(!L) + continue + + if(copytext(L, 1, 2) == "#") + continue + + var/lockthis = copytext(L, 1, 2) == "@" + if(lockthis) + L = copytext(L, 2) + + var/pos = findtext(L, " ") + var/entry = null + var/value = null + + if(pos) + entry = lowertext(copytext(L, 1, pos)) + value = copytext(L, pos + 1) + else + entry = lowertext(L) + + if(!entry) + continue + + var/datum/config_entry/E = _entries[entry] + if(!E) + log_config("Unknown setting in configuration: '[entry]'") + continue + + if(filename != E.resident_file) + log_config("Found [entry] in [filename] when it should have been in [E.resident_file]! Ignoring.") + continue + + if(lockthis) + E.protection |= CONFIG_ENTRY_LOCKED + + var/validated = E.ValidateAndSet(value) + if(!validated) + log_config("Failed to validate setting \"[value]\" for [entry]") + else if(E.modified && !E.dupes_allowed) + log_config("Duplicate setting for [entry] ([value]) detected! Using latest.") + + if(validated) + E.modified = TRUE + +/datum/controller/configuration/can_vv_get(var_name) + return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..() + +/datum/controller/configuration/vv_edit_var(var_name, var_value) + return !(var_name in list("entries_by_type", "entries")) && ..() + +/datum/controller/configuration/stat_entry() + if(!statclick) + statclick = new/obj/effect/statclick/debug(null, "Edit", src) + stat("[name]:", statclick) + +/datum/controller/configuration/proc/Get(entry_type) + if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "\ref[src]") + log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]") + return + var/datum/config_entry/E = entry_type + var/entry_is_abstract = initial(E.abstract_type) == entry_type + if(entry_is_abstract) + CRASH("Tried to retrieve an abstract config_entry: [entry_type]") + E = entries_by_type[entry_type] + if(!E) + CRASH("Missing config entry for [entry_type]!") + return E.value + +/datum/controller/configuration/proc/Set(entry_type, new_val) + if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "\ref[src]") + log_admin_private("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]") + return + var/datum/config_entry/E = entry_type + var/entry_is_abstract = initial(E.abstract_type) == entry_type + if(entry_is_abstract) + CRASH("Tried to retrieve an abstract config_entry: [entry_type]") + E = entries_by_type[entry_type] + if(!E) + CRASH("Missing config entry for [entry_type]!") + return E.ValidateAndSet(new_val) + +/datum/controller/configuration/proc/LoadModes() + gamemode_cache = typecacheof(/datum/game_mode, TRUE) + modes = list() + mode_names = list() + mode_reports = list() + mode_false_report_weight = list() + votable_modes = list() + var/list/probabilities = Get(/datum/config_entry/keyed_number_list/probability) + for(var/T in gamemode_cache) + // I wish I didn't have to instance the game modes in order to look up + // their information, but it is the only way (at least that I know of). + var/datum/game_mode/M = new T() + + if(M.config_tag) + if(!(M.config_tag in modes)) // ensure each mode is added only once + modes += M.config_tag + mode_names[M.config_tag] = M.name + probabilities[M.config_tag] = M.probability + mode_reports[M.config_tag] = M.generate_report() + mode_false_report_weight[M.config_tag] = M.false_report_weight + if(M.votable) + votable_modes += M.config_tag + qdel(M) + votable_modes += "secret" + +/datum/controller/configuration/proc/loadmaplist(filename) + filename = "[GLOB.config_dir][filename]" + log_config("Loading config file [filename]...") + var/list/Lines = world.file2list(filename) + + var/datum/map_config/currentmap = null + for(var/t in Lines) + if(!t) + continue + + t = trim(t) + if(length(t) == 0) + continue + else if(copytext(t, 1, 2) == "#") + continue + + var/pos = findtext(t, " ") + var/command = null + var/data = null + + if(pos) + command = lowertext(copytext(t, 1, pos)) + data = copytext(t, pos + 1) + else + command = lowertext(t) + + if(!command) + continue + + if (!currentmap && command != "map") + continue + + switch (command) + if ("map") + currentmap = new ("_maps/[data].json") + if(currentmap.defaulted) + log_config("Failed to load map config for [data]!") + if ("minplayers","minplayer") + currentmap.config_min_users = text2num(data) + if ("maxplayers","maxplayer") + currentmap.config_max_users = text2num(data) + if ("weight","voteweight") + currentmap.voteweight = text2num(data) + if ("default","defaultmap") + defaultmap = currentmap + if ("endmap") + LAZYINITLIST(maplist) + maplist[currentmap.map_name] = currentmap + currentmap = null + if ("disabled") + currentmap = null + else + WRITE_FILE(GLOB.config_error_log, "Unknown command in map vote config: '[command]'") + + +/datum/controller/configuration/proc/pick_mode(mode_name) + // I wish I didn't have to instance the game modes in order to look up + // their information, but it is the only way (at least that I know of). + // ^ This guy didn't try hard enough + for(var/T in gamemode_cache) + var/datum/game_mode/M = T + var/ct = initial(M.config_tag) + if(ct && ct == mode_name) + return new T + return new /datum/game_mode/extended() + +/datum/controller/configuration/proc/get_runnable_modes() + var/list/datum/game_mode/runnable_modes = new + var/list/probabilities = Get(/datum/config_entry/keyed_number_list/probability) + var/list/min_pop = Get(/datum/config_entry/keyed_number_list/min_pop) + var/list/max_pop = Get(/datum/config_entry/keyed_number_list/max_pop) + var/list/repeated_mode_adjust = Get(/datum/config_entry/number_list/repeated_mode_adjust) + for(var/T in gamemode_cache) + var/datum/game_mode/M = new T() + if(!(M.config_tag in modes)) + qdel(M) + continue + if(probabilities[M.config_tag]<=0) + qdel(M) + continue + if(min_pop[M.config_tag]) + M.required_players = min_pop[M.config_tag] + if(max_pop[M.config_tag]) + M.maximum_players = max_pop[M.config_tag] + if(M.can_start()) + var/final_weight = probabilities[M.config_tag] + if(SSpersistence.saved_modes.len == 3 && repeated_mode_adjust.len == 3) + var/recent_round = min(SSpersistence.saved_modes.Find(M.config_tag),3) + var/adjustment = 0 + while(recent_round) + adjustment += repeated_mode_adjust[recent_round] + recent_round = SSpersistence.saved_modes.Find(M.config_tag,recent_round+1,0) + final_weight *= ((100-adjustment)/100) + runnable_modes[M] = final_weight + return runnable_modes + +/datum/controller/configuration/proc/get_runnable_midround_modes(crew) + var/list/datum/game_mode/runnable_modes = new + var/list/probabilities = Get(/datum/config_entry/keyed_number_list/probability) + var/list/min_pop = Get(/datum/config_entry/keyed_number_list/min_pop) + var/list/max_pop = Get(/datum/config_entry/keyed_number_list/max_pop) + for(var/T in (gamemode_cache - SSticker.mode.type)) + var/datum/game_mode/M = new T() + if(!(M.config_tag in modes)) + qdel(M) + continue + if(probabilities[M.config_tag]<=0) + qdel(M) + continue + if(min_pop[M.config_tag]) + M.required_players = min_pop[M.config_tag] + if(max_pop[M.config_tag]) + M.maximum_players = max_pop[M.config_tag] + if(M.required_players <= crew) + if(M.maximum_players >= 0 && M.maximum_players < crew) + continue + runnable_modes[M] = probabilities[M.config_tag] + return runnable_modes diff --git a/code/controllers/configuration/entries/comms.dm b/code/controllers/configuration/entries/comms.dm new file mode 100644 index 00000000000..bf099f6cb62 --- /dev/null +++ b/code/controllers/configuration/entries/comms.dm @@ -0,0 +1,22 @@ +#define CURRENT_RESIDENT_FILE "comms.txt" + +CONFIG_DEF(string/comms_key) + protection = CONFIG_ENTRY_HIDDEN + +/datum/config_entry/string/comms_key/ValidateAndSet(str_val) + return str_val != "default_pwd" && length(str_val) > 6 && ..() + +CONFIG_DEF(string/cross_server_address) + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/string/cross_server_address/ValidateAndSet(str_val) + return str_val != "byond:\\address:port" && ..() + +CONFIG_DEF(string/cross_comms_name) + +GLOBAL_VAR_INIT(medals_enabled, TRUE) //will be auto set to false if the game fails contacting the medal hub to prevent unneeded calls. + +CONFIG_DEF(string/medal_hub_address) + +CONFIG_DEF(string/medal_hub_password) + protection = CONFIG_ENTRY_HIDDEN \ No newline at end of file diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm new file mode 100644 index 00000000000..dda8fd9a3ce --- /dev/null +++ b/code/controllers/configuration/entries/config.dm @@ -0,0 +1,351 @@ +#define CURRENT_RESIDENT_FILE "config.txt" + +CONFIG_DEF(flag/autoadmin) // if autoadmin is enabled + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(string/autoadmin_rank) // the rank for autoadmins + value = "Game Master" + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(string/servername) // server name (the name of the game window) + +CONFIG_DEF(string/serversqlname) // short form server name used for the DB + +CONFIG_DEF(string/stationname) // station name (the name of the station in-game) + +CONFIG_DEF(number/lobby_countdown) // In between round countdown. + value = 120 + min_val = 0 + +CONFIG_DEF(number/round_end_countdown) // Post round murder death kill countdown + value = 25 + min_val = 0 + +CONFIG_DEF(flag/hub) // if the game appears on the hub or not + +CONFIG_DEF(flag/log_ooc) // log OOC channel + +CONFIG_DEF(flag/log_access) // log login/logout + +CONFIG_DEF(flag/log_say) // log client say + +CONFIG_DEF(flag/log_admin) // log admin actions + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(flag/log_prayer) // log prayers + +CONFIG_DEF(flag/log_law) // log lawchanges + +CONFIG_DEF(flag/log_game) // log game events + +CONFIG_DEF(flag/log_vote) // log voting + +CONFIG_DEF(flag/log_whisper) // log client whisper + +CONFIG_DEF(flag/log_attack) // log attack messages + +CONFIG_DEF(flag/log_emote) // log emotes + +CONFIG_DEF(flag/log_adminchat) // log admin chat messages + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(flag/log_pda) // log pda messages + +CONFIG_DEF(flag/log_twitter) // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. + +CONFIG_DEF(flag/log_world_topic) // log all world.Topic() calls + +CONFIG_DEF(flag/allow_admin_ooccolor) // Allows admins with relevant permissions to have their own ooc colour + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(flag/allow_vote_restart) // allow votes to restart + +CONFIG_DEF(flag/allow_vote_mode) // allow votes to change mode + +CONFIG_DEF(number/vote_delay) // minimum time between voting sessions (deciseconds, 10 minute default) + value = 6000 + min_val = 0 + +CONFIG_DEF(number/vote_period) // length of voting period (deciseconds, default 1 minute) + value = 600 + min_val = 0 + +CONFIG_DEF(flag/default_no_vote) // vote does not default to nochange/norestart + +CONFIG_DEF(flag/no_dead_vote) // dead people can't vote + +CONFIG_DEF(flag/allow_metadata) // Metadata is supported. + +CONFIG_DEF(flag/popup_admin_pm) // adminPMs to non-admins show in a pop-up 'reply' window when set + +CONFIG_DEF(number/fps) + value = 20 + min_val = 1 + max_val = 100 //byond will start crapping out at 50, so this is just ridic + var/sync_validate = FALSE + +/datum/config_entry/number/fps/ValidateAndSet(str_val) + . = ..() + if(.) + sync_validate = TRUE + var/datum/config_entry/number/ticklag/TL = config.entries_by_type[/datum/config_entry/number/ticklag] + if(!TL.sync_validate) + TL.ValidateAndSet(10 / value) + sync_validate = FALSE + +CONFIG_DEF(number/ticklag) + integer = FALSE + var/sync_validate = FALSE + +/datum/config_entry/number/ticklag/New() //ticklag weirdly just mirrors fps + var/datum/config_entry/CE = /datum/config_entry/number/fps + value = 10 / initial(CE.value) + ..() + +/datum/config_entry/number/ticklag/ValidateAndSet(str_val) + . = text2num(str_val) > 0 && ..() + if(.) + sync_validate = TRUE + var/datum/config_entry/number/fps/FPS = config.entries_by_type[/datum/config_entry/number/fps] + if(!FPS.sync_validate) + FPS.ValidateAndSet(10 / value) + sync_validate = FALSE + +CONFIG_DEF(flag/allow_holidays) + +CONFIG_DEF(number/tick_limit_mc_init) //SSinitialization throttling + value = TICK_LIMIT_MC_INIT_DEFAULT + min_val = 0 //oranges warned us + integer = FALSE + +CONFIG_DEF(flag/admin_legacy_system) //Defines whether the server uses the legacy admin system with admins.txt or the SQL system + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(string/hostedby) + +CONFIG_DEF(flag/norespawn) + +CONFIG_DEF(flag/guest_jobban) + +CONFIG_DEF(flag/usewhitelist) + +CONFIG_DEF(flag/ban_legacy_system) //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(flag/use_age_restriction_for_jobs) //Do jobs use account age restrictions? --requires database + +CONFIG_DEF(flag/use_account_age_for_jobs) //Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected. + +CONFIG_DEF(flag/use_exp_tracking) + +CONFIG_DEF(flag/use_exp_restrictions_heads) + +CONFIG_DEF(number/use_exp_restrictions_heads_hours) + value = 0 + min_val = 0 + +CONFIG_DEF(flag/use_exp_restrictions_heads_department) + +CONFIG_DEF(flag/use_exp_restrictions_other) + +CONFIG_DEF(flag/use_exp_restrictions_admin_bypass) + +CONFIG_DEF(string/server) + +CONFIG_DEF(string/banappeals) + +CONFIG_DEF(string/wikiurl) + value = "http://www.tgstation13.org/wiki" + +CONFIG_DEF(string/forumurl) + value = "http://tgstation13.org/phpBB/index.php" + +CONFIG_DEF(string/rulesurl) + value = "http://www.tgstation13.org/wiki/Rules" + +CONFIG_DEF(string/githuburl) + value = "https://www.github.com/tgstation/-tg-station" + +CONFIG_DEF(number/githubrepoid) + value = null + min_val = 0 + +CONFIG_DEF(flag/guest_ban) + +CONFIG_DEF(number/id_console_jobslot_delay) + value = 30 + min_val = 0 + +CONFIG_DEF(number/inactivity_period) //time in ds until a player is considered inactive) + value = 3000 + min_val = 0 + +/datum/config_entry/number/inactivity_period/ValidateAndSet(str_val) + . = ..() + if(.) + value *= 10 //documented as seconds in config.txt + +CONFIG_DEF(number/afk_period) //time in ds until a player is considered inactive) + value = 3000 + min_val = 0 + +/datum/config_entry/number/afk_period/ValidateAndSet(str_val) + . = ..() + if(.) + value *= 10 //documented as seconds in config.txt + +CONFIG_DEF(flag/kick_inactive) //force disconnect for inactive players + +CONFIG_DEF(flag/load_jobs_from_txt) + +CONFIG_DEF(flag/forbid_singulo_possession) + +CONFIG_DEF(flag/automute_on) //enables automuting/spam prevention + +CONFIG_DEF(string/panic_server_name) + +/datum/config_entry/string/panic_server_name/ValidateAndSet(str_val) + return str_val != "\[Put the name here\]" && ..() + +CONFIG_DEF(string/panic_address) //Reconnect a player this linked server if this server isn't accepting new players + +/datum/config_entry/string/panic_address/ValidateAndSet(str_val) + return str_val != "byond://address:port" && ..() + +CONFIG_DEF(string/invoke_youtubedl) + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +CONFIG_DEF(flag/show_irc_name) + +CONFIG_DEF(flag/see_own_notes) //Can players see their own admin notes (read-only)? + +CONFIG_DEF(number/note_fresh_days) + value = null + min_val = 0 + integer = FALSE + +CONFIG_DEF(number/note_stale_days) + value = null + min_val = 0 + integer = FALSE + +CONFIG_DEF(flag/maprotation) + +CONFIG_DEF(number/maprotatechancedelta) + value = 0.75 + min_val = 0 + max_val = 1 + integer = FALSE + +CONFIG_DEF(number/soft_popcap) + value = null + min_val = 0 + +CONFIG_DEF(number/hard_popcap) + value = null + min_val = 0 + +CONFIG_DEF(number/extreme_popcap) + value = null + min_val = 0 + +CONFIG_DEF(string/soft_popcap_message) + value = "Be warned that the server is currently serving a high number of users, consider using alternative game servers." + +CONFIG_DEF(string/hard_popcap_message) + value = "The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers." + +CONFIG_DEF(string/extreme_popcap_message) + value = "The server is currently serving a high number of users, find alternative servers." + +CONFIG_DEF(flag/panic_bunker) // prevents people the server hasn't seen before from connecting + +CONFIG_DEF(number/notify_new_player_age) // how long do we notify admins of a new player + min_val = -1 + +CONFIG_DEF(number/notify_new_player_account_age) // how long do we notify admins of a new byond account + min_val = 0 + +CONFIG_DEF(flag/irc_first_connection_alert) // do we notify the irc channel when somebody is connecting for the first time? + +CONFIG_DEF(flag/check_randomizer) + +CONFIG_DEF(string/ipintel_email) + +/datum/config_entry/string/ipintel_email/ValidateAndSet(str_val) + return str_val != "ch@nge.me" && ..() + +CONFIG_DEF(number/ipintel_rating_bad) + value = 1 + integer = FALSE + min_val = 0 + max_val = 1 + +CONFIG_DEF(number/ipintel_save_good) + value = 12 + min_val = 0 + +CONFIG_DEF(number/ipintel_save_bad) + value = 1 + min_val = 0 + +CONFIG_DEF(string/ipintel_domain) + value = "check.getipintel.net" + +CONFIG_DEF(flag/aggressive_changelog) + +CONFIG_DEF(flag/autoconvert_notes) //if all connecting player's notes should attempt to be converted to the database + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(flag/allow_webclient) + +CONFIG_DEF(flag/webclient_only_byond_members) + +CONFIG_DEF(flag/announce_admin_logout) + +CONFIG_DEF(flag/announce_admin_login) + +CONFIG_DEF(flag/allow_map_voting) + +CONFIG_DEF(flag/generate_minimaps) + +CONFIG_DEF(number/client_warn_version) + value = null + min_val = 500 + max_val = DM_VERSION - 1 + +CONFIG_DEF(string/client_warn_message) + value = "Your version of byond may have issues or be blocked from accessing this server in the future." + +CONFIG_DEF(number/client_error_version) + value = null + min_val = 500 + max_val = DM_VERSION - 1 + +CONFIG_DEF(string/client_error_message) + value = "Your version of byond is too old, may have issues, and is blocked from accessing this server." + +CONFIG_DEF(number/minute_topic_limit) + value = null + min_val = 0 + +CONFIG_DEF(number/second_topic_limit) + value = null + min_val = 0 + +CONFIG_DEF(number/error_cooldown) // The "cooldown" time for each occurrence of a unique error) + value = 600 + min_val = 0 + +CONFIG_DEF(number/error_limit) // How many occurrences before the next will silence them + value = 50 + +CONFIG_DEF(number/error_silence_time) // How long a unique error will be silenced for + value = 6000 + +CONFIG_DEF(number/error_msg_delay) // How long to wait between messaging admins about occurrences of a unique error + value = 50 + +CONFIG_DEF(flag/irc_announce_new_game) + +CONFIG_DEF(flag/debug_admin_hrefs) \ No newline at end of file diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm new file mode 100644 index 00000000000..c46880686ac --- /dev/null +++ b/code/controllers/configuration/entries/dbconfig.dm @@ -0,0 +1,28 @@ +#define CURRENT_RESIDENT_FILE "dbconfig.txt" + +CONFIG_DEF(flag/sql_enabled) // for sql switching + protection = CONFIG_ENTRY_LOCKED + +CONFIG_DEF(string/address) + value = "localhost" + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +CONFIG_DEF(number/port) + value = 3306 + min_val = 0 + max_val = 65535 + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +CONFIG_DEF(string/feedback_database) + value = "test" + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +CONFIG_DEF(string/feedback_login) + value = "root" + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +CONFIG_DEF(string/feedback_password) + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +CONFIG_DEF(string/feedback_tableprefix) + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm new file mode 100644 index 00000000000..106804a576e --- /dev/null +++ b/code/controllers/configuration/entries/game_options.dm @@ -0,0 +1,266 @@ +#define CURRENT_RESIDENT_FILE "game_options.txt" + +CONFIG_DEF(number_list/repeated_mode_adjust) + +CONFIG_DEF(keyed_number_list/probability) + +/datum/config_entry/keyed_number_list/probability/ValidateKeyName(key_name) + return key_name in config.modes + +CONFIG_DEF(keyed_number_list/max_pop) + +/datum/config_entry/keyed_number_list/max_pop/ValidateKeyName(key_name) + return key_name in config.modes + +CONFIG_DEF(keyed_number_list/min_pop) + +/datum/config_entry/keyed_number_list/min_pop/ValidateKeyName(key_name) + return key_name in config.modes + +CONFIG_DEF(keyed_flag_list/continuous) // which roundtypes continue if all antagonists die + +/datum/config_entry/keyed_flag_list/continuous/ValidateKeyName(key_name) + return key_name in config.modes + +CONFIG_DEF(keyed_flag_list/midround_antag) // which roundtypes use the midround antagonist system + +/datum/config_entry/keyed_flag_list/midround_antag/ValidateKeyName(key_name) + return key_name in config.modes + +CONFIG_DEF(keyed_string_list/policy) + +CONFIG_DEF(number/damage_multiplier) + value = 1 + integer = FALSE + +CONFIG_DEF(number/minimal_access_threshold) //If the number of players is larger than this threshold, minimal access will be turned on. + min_val = 0 + +CONFIG_DEF(flag/jobs_have_minimal_access) //determines whether jobs use minimal access or expanded access. + +CONFIG_DEF(flag/assistants_have_maint_access) + +CONFIG_DEF(flag/security_has_maint_access) + +CONFIG_DEF(flag/everyone_has_maint_access) + +CONFIG_DEF(flag/sec_start_brig) //makes sec start in brig instead of dept sec posts + +CONFIG_DEF(flag/force_random_names) + +CONFIG_DEF(flag/humans_need_surnames) + +CONFIG_DEF(flag/allow_ai) // allow ai job + +CONFIG_DEF(flag/disable_secborg) // disallow secborg module to be chosen. + +CONFIG_DEF(flag/disable_peaceborg) + +CONFIG_DEF(number/traitor_scaling_coeff) //how much does the amount of players get divided by to determine traitors + value = 6 + min_val = 1 + +CONFIG_DEF(number/brother_scaling_coeff) //how many players per brother team + value = 25 + min_val = 1 + +CONFIG_DEF(number/changeling_scaling_coeff) //how much does the amount of players get divided by to determine changelings + value = 6 + min_val = 1 + +CONFIG_DEF(number/security_scaling_coeff) //how much does the amount of players get divided by to determine open security officer positions + value = 8 + min_val = 1 + +CONFIG_DEF(number/abductor_scaling_coeff) //how many players per abductor team + value = 15 + min_val = 1 + +CONFIG_DEF(number/traitor_objectives_amount) + value = 2 + min_val = 0 + +CONFIG_DEF(number/brother_objectives_amount) + value = 2 + min_val = 0 + +CONFIG_DEF(flag/reactionary_explosions) //If we use reactionary explosions, explosions that react to walls and doors + +CONFIG_DEF(flag/protect_roles_from_antagonist) //If security and such can be traitor/cult/other + +CONFIG_DEF(flag/protect_assistant_from_antagonist) //If assistants can be traitor/cult/other + +CONFIG_DEF(flag/enforce_human_authority) //If non-human species are barred from joining as a head of staff + +CONFIG_DEF(flag/allow_latejoin_antagonists) // If late-joining players can be traitor/changeling + +CONFIG_DEF(number/midround_antag_time_check) // How late (in minutes) you want the midround antag system to stay on, setting this to 0 will disable the system + value = 60 + min_val = 0 + +CONFIG_DEF(number/midround_antag_life_check) // A ratio of how many people need to be alive in order for the round not to immediately end in midround antagonist + value = 0.7 + integer = FALSE + min_val = 0 + max_val = 1 + +CONFIG_DEF(number/shuttle_refuel_delay) + value = 12000 + min_val = 0 + +CONFIG_DEF(flag/show_game_type_odds) //if set this allows players to see the odds of each roundtype on the get revision screen + +CONFIG_DEF(flag/join_with_mutant_race) //players can choose their mutant race before joining the game + +CONFIG_DEF(keyed_flag_list/roundstart_races) //races you can play as from the get go. If left undefined the game's roundstart var for species is used + var/first_edit = TRUE + +/datum/config_entry/keyed_flag_list/roundstart_races/New() + for(var/I in subtypesof(/datum/species)) + var/datum/species/S = I + if(initial(S.roundstart)) + value[initial(S.id)] = TRUE + ..() + +/datum/config_entry/keyed_flag_list/roundstart_races/ValidateAndSet(str_val) + var/list/old_val + if(first_edit) + old_val = value + old_val = old_val.Copy() + . = ..() + if(first_edit) + if(!.) + value = old_val + else + first_edit = FALSE + +CONFIG_DEF(flag/join_with_mutant_humans) //players can pick mutant bodyparts for humans before joining the game + +CONFIG_DEF(flag/no_summon_guns) //No + +CONFIG_DEF(flag/no_summon_magic) //Fun + +CONFIG_DEF(flag/no_summon_events) //Allowed + +CONFIG_DEF(flag/no_intercept_report) //Whether or not to send a communications intercept report roundstart. This may be overriden by gamemodes. + +CONFIG_DEF(number/arrivals_shuttle_dock_window) //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station + value = 55 + min_val = 30 + +CONFIG_DEF(flag/arrivals_shuttle_require_undocked) //Require the arrivals shuttle to be undocked before latejoiners can join + +CONFIG_DEF(flag/arrivals_shuttle_require_safe_latejoin) //Require the arrivals shuttle to be operational in order for latejoiners to join + +CONFIG_DEF(string/alert_green) + value = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." + +CONFIG_DEF(string/alert_blue_upto) + value = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." + +CONFIG_DEF(string/alert_blue_downto) + value = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed." + +CONFIG_DEF(string/alert_red_upto) + value = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised." + +CONFIG_DEF(string/alert_red_downto) + value = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." + +CONFIG_DEF(string/alert_delta) + value = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." + +CONFIG_DEF(flag/revival_pod_plants) + +CONFIG_DEF(flag/revival_cloning) + +CONFIG_DEF(number/revival_brain_life) + value = -1 + min_val = -1 + +CONFIG_DEF(flag/rename_cyborg) + +CONFIG_DEF(flag/ooc_during_round) + +CONFIG_DEF(flag/emojis) + +CONFIG_DEF(number/run_delay) //Used for modifying movement speed for mobs. + +CONFIG_DEF(number/walk_delay) + + +CONFIG_DEF(number/human_delay) //Mob specific modifiers. NOTE: These will affect different mob types in different ways +CONFIG_DEF(number/robot_delay) +CONFIG_DEF(number/monkey_delay) +CONFIG_DEF(number/alien_delay) +CONFIG_DEF(number/slime_delay) +CONFIG_DEF(number/animal_delay) + +CONFIG_DEF(number/gateway_delay) //How long the gateway takes before it activates. Default is half an hour. + value = 18000 + min_val = 0 + +CONFIG_DEF(flag/ghost_interaction) + +CONFIG_DEF(flag/silent_ai) +CONFIG_DEF(flag/silent_borg) + +CONFIG_DEF(flag/sandbox_autoclose) // close the sandbox panel after spawning an item, potentially reducing griff + +CONFIG_DEF(number/default_laws) //Controls what laws the AI spawns with. + value = 0 + min_val = 0 + max_val = 3 + +CONFIG_DEF(number/silicon_max_law_amount) + value = 12 + min_val = 0 + +CONFIG_DEF(keyed_flag_list/random_laws) + +CONFIG_DEF(keyed_number_list/law_weight) + splitter = "," + +CONFIG_DEF(number/assistant_cap) + value = -1 + min_val = -1 + +CONFIG_DEF(flag/starlight) +CONFIG_DEF(flag/grey_assistants) + +CONFIG_DEF(number/lavaland_budget) + value = 60 + min_val = 0 + +CONFIG_DEF(number/space_budget) + value = 16 + min_val = 0 + +CONFIG_DEF(flag/allow_random_events) // Enables random events mid-round when set + +CONFIG_DEF(number/events_min_time_mul) // Multipliers for random events minimal starting time and minimal players amounts + value = 1 + min_val = 0 + integer = FALSE + +CONFIG_DEF(number/events_min_players_mul) + value = 1 + min_val = 0 + integer = FALSE + +CONFIG_DEF(number/mice_roundstart) + value = 10 + min_val = 0 + +CONFIG_DEF(number/bombcap) + value = 14 + min_val = 4 + +/datum/config_entry/number/bombcap/ValidateAndSet(str_val) + . = ..() + if(.) + GLOB.MAX_EX_DEVESTATION_RANGE = round(value / 4) + GLOB.MAX_EX_HEAVY_RANGE = round(value / 2) + GLOB.MAX_EX_LIGHT_RANGE = value + GLOB.MAX_EX_FLASH_RANGE = value + GLOB.MAX_EX_FLAME_RANGE = value diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 11c460e326c..6ed3121179d 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -169,7 +169,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/start_timeofday = REALTIMEOFDAY // Initialize subsystems. - current_ticklimit = config.tick_limit_mc_init + current_ticklimit = CONFIG_GET(number/tick_limit_mc_init) for (var/datum/controller/subsystem/SS in subsystems) if (SS.flags & SS_NO_INIT) continue @@ -189,7 +189,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new sortTim(subsystems, /proc/cmp_subsystem_display) // Set world options. world.sleep_offline = 1 - world.fps = config.fps + world.fps = CONFIG_GET(number/fps) var/initialized_tod = REALTIMEOFDAY sleep(1) initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10 diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index eee6945c419..e160c132b97 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -69,7 +69,7 @@ can_fire = 0 flags |= SS_NO_FIRE Master.subsystems -= src - + return ..() //Queue it to run. // (we loop thru a linked list until we get to the end or find the right point) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 2f296e5f293..66c933314f7 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -322,7 +322,7 @@ SUBSYSTEM_DEF(air) EG.dismantle() CHECK_TICK - var/msg = "HEY! LISTEN! [(world.timeofday - timer)/10] Seconds were wasted processing [starting_ats] turf(s) (connected to [ending_ats] other turfs) with atmos differences at round start." + var/msg = "HEY! LISTEN! [DisplayTimeText(world.timeofday - timer)] were wasted processing [starting_ats] turf(s) (connected to [ending_ats] other turfs) with atmos differences at round start." to_chat(world, "[msg]") warning(msg) diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index 32086f52ed6..38e9724b5fb 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -14,6 +14,9 @@ SUBSYSTEM_DEF(augury) /datum/controller/subsystem/augury/proc/register_doom(atom/A, severity) doombringers[A] = severity +/datum/controller/subsystem/augury/proc/unregister_doom(atom/A) + doombringers -= A + /datum/controller/subsystem/augury/fire() var/biggest_doom = null var/biggest_threat = null diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 8143385486f..56238d5b85b 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -38,7 +38,7 @@ SUBSYSTEM_DEF(blackbox) var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port, round_id) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', '[GLOB.round_id]')") query_record_playercount.Execute() - if(config.use_exp_tracking) + if(CONFIG_GET(flag/use_exp_tracking)) if((triggertime < 0) || (world.time > (triggertime +3000))) //subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check update_exp(10,FALSE) @@ -274,7 +274,7 @@ SUBSYSTEM_DEF(blackbox) details += "\"[deets]\"" /datum/feedback_variable/proc/get_details() - return details.Join(" | ") + return details ? details.Join(" | ") : null /datum/feedback_variable/proc/get_parsed() return list(variable,value,details.Join(" | ")) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index f610cde218f..10978b7d322 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -54,32 +54,27 @@ SUBSYSTEM_DEF(dbcore) if(failed_connections > FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to connect anymore. return FALSE - if(!config.sql_enabled) + if(!CONFIG_GET(flag/sql_enabled)) return FALSE - var/user = global.sqlfdbklogin - var/pass = global.sqlfdbkpass - var/db = global.sqlfdbkdb - var/address = global.sqladdress - var/port = global.sqlport + var/user = CONFIG_GET(string/feedback_login) + var/pass = CONFIG_GET(string/feedback_password) + var/db = CONFIG_GET(string/feedback_database) + var/address = CONFIG_GET(string/address) + var/port = CONFIG_GET(number/port) - doConnect("dbi:mysql:[db]:[address]:[port]", user, pass) + _dm_db_connect(_db_con, "dbi:mysql:[db]:[address]:[port]", user, pass, Default_Cursor, null) . = IsConnected() if (!.) log_sql("Connect() failed | [ErrorMsg()]") ++failed_connections -/datum/controller/subsystem/dbcore/proc/doConnect(dbi_handler, user_handler, password_handler) - if(!config.sql_enabled) - return FALSE - return _dm_db_connect(_db_con, dbi_handler, user_handler, password_handler, Default_Cursor, null) - /datum/controller/subsystem/dbcore/proc/Disconnect() failed_connections = 0 return _dm_db_close(_db_con) /datum/controller/subsystem/dbcore/proc/IsConnected() - if(!config.sql_enabled) + if(!CONFIG_GET(flag/sql_enabled)) return FALSE return _dm_db_is_connected(_db_con) @@ -87,7 +82,7 @@ SUBSYSTEM_DEF(dbcore) return _dm_db_quote(_db_con, str) /datum/controller/subsystem/dbcore/proc/ErrorMsg() - if(!config.sql_enabled) + if(!CONFIG_GET(flag/sql_enabled)) return "Database disabled by configuration" return _dm_db_error_msg(_db_con) diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 7816a6bdf8d..f435d7e8196 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -56,7 +56,7 @@ SUBSYSTEM_DEF(events) //selects a random event based on whether it can occur and it's 'weight'(probability) /datum/controller/subsystem/events/proc/spawnEvent() set waitfor = FALSE //for the admin prompt - if(!config.allow_random_events) + if(!CONFIG_GET(flag/allow_random_events)) // var/datum/round_event_control/E = locate(/datum/round_event_control/dust) in control // if(E) E.runEvent() return @@ -171,7 +171,7 @@ SUBSYSTEM_DEF(events) //sets up the holidays and holidays list /datum/controller/subsystem/events/proc/getHoliday() - if(!config.allow_holidays) + if(!CONFIG_GET(flag/allow_holidays)) return // Holiday stuff was not enabled in the config! var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 1be36e5ac75..80f2c12f80b 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(job) /datum/controller/subsystem/job/Initialize(timeofday) if(!occupations.len) SetupOccupations() - if(config.load_jobs_from_txt) + if(CONFIG_GET(flag/load_jobs_from_txt)) LoadJobs() ..() @@ -106,7 +106,7 @@ SUBSYSTEM_DEF(job) if(player.mind && job.title in player.mind.restricted_roles) Debug("FOC incompatible with antagonist role, Player: [player]") continue - if(config.enforce_human_authority && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features)) + if(CONFIG_GET(flag/enforce_human_authority) && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features)) Debug("FOC non-human failed, Player: [player]") continue if(player.client.prefs.GetJobDepartment(job, level) & job.flag) @@ -143,7 +143,7 @@ SUBSYSTEM_DEF(job) Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]") continue - if(config.enforce_human_authority && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features)) + if(CONFIG_GET(flag/enforce_human_authority) && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features)) Debug("GRJ non-human failed, Player: [player]") continue @@ -245,11 +245,12 @@ SUBSYSTEM_DEF(job) setup_officer_positions() //Jobs will have fewer access permissions if the number of players exceeds the threshold defined in game_options.txt - if(config.minimal_access_threshold) - if(config.minimal_access_threshold > unassigned.len) - config.jobs_have_minimal_access = 0 + var/mat = CONFIG_GET(number/minimal_access_threshold) + if(mat) + if(mat > unassigned.len) + CONFIG_SET(flag/jobs_have_minimal_access, FALSE) else - config.jobs_have_minimal_access = 1 + CONFIG_SET(flag/jobs_have_minimal_access, TRUE) //Shuffle players and jobs unassigned = shuffle(unassigned) @@ -317,7 +318,7 @@ SUBSYSTEM_DEF(job) Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]") continue - if(config.enforce_human_authority && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features)) + if(CONFIG_GET(flag/enforce_human_authority) && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features)) Debug("DO non-human failed, Player: [player], Job:[job.title]") continue @@ -415,8 +416,8 @@ SUBSYSTEM_DEF(job) to_chat(M, "To speak on your departments radio, use the :h button. To see others, look closely at your headset.") if(job.req_admin_notify) to_chat(M, "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.") - if(config.minimal_access_threshold) - to_chat(M, "As this station was initially staffed with a [config.jobs_have_minimal_access ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.") + if(CONFIG_GET(number/minimal_access_threshold)) + to_chat(M, "As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.") if(job && H) job.after_spawn(H, M) @@ -429,9 +430,10 @@ SUBSYSTEM_DEF(job) if(!J) throw EXCEPTION("setup_officer_positions(): Security officer job is missing") - if(config.security_scaling_coeff > 0) + var/ssc = CONFIG_GET(number/security_scaling_coeff) + if(ssc > 0) if(J.spawn_positions > 0) - var/officer_positions = min(12, max(J.spawn_positions, round(unassigned.len/config.security_scaling_coeff))) //Scale between configured minimum and 12 officers + var/officer_positions = min(12, max(J.spawn_positions, round(unassigned.len / ssc))) //Scale between configured minimum and 12 officers Debug("Setting open security officer positions to [officer_positions]") J.total_positions = officer_positions J.spawn_positions = officer_positions @@ -491,8 +493,10 @@ SUBSYSTEM_DEF(job) SSblackbox.add_details("job_preferences",tmp_str) /datum/controller/subsystem/job/proc/PopcapReached() - if(config.hard_popcap || config.extreme_popcap) - var/relevent_cap = max(config.hard_popcap, config.extreme_popcap) + var/hpc = CONFIG_GET(number/hard_popcap) + var/epc = CONFIG_GET(number/extreme_popcap) + if(hpc || epc) + var/relevent_cap = max(hpc, epc) if((initial_players_to_assign - unassigned.len) >= relevent_cap) return 1 return 0 diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index bcb94c835b6..231cb37ae49 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(lighting) /datum/controller/subsystem/lighting/Initialize(timeofday) if(!initialized) - if (config.starlight) + if (CONFIG_GET(flag/starlight)) for(var/I in GLOB.sortedAreas) var/area/A = I if (A.dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index f2bb300471a..ab2ba544316 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -43,19 +43,19 @@ SUBSYSTEM_DEF(mapping) loading_ruins = TRUE var/mining_type = config.minetype if (mining_type == "lavaland") - seedRuins(list(ZLEVEL_LAVALAND), global.config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates) + seedRuins(list(ZLEVEL_LAVALAND), CONFIG_GET(number/lavaland_budget), /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates) spawn_rivers() // deep space ruins var/space_zlevels = list() for(var/i in ZLEVEL_SPACEMIN to ZLEVEL_SPACEMAX) switch(i) - if(ZLEVEL_MINING, ZLEVEL_LAVALAND, ZLEVEL_EMPTY_SPACE, ZLEVEL_TRANSIT) + if(ZLEVEL_MINING, ZLEVEL_LAVALAND, ZLEVEL_EMPTY_SPACE, ZLEVEL_TRANSIT, ZLEVEL_CITYOFCOGS) continue else space_zlevels += i - seedRuins(space_zlevels, global.config.space_budget, /area/space, space_ruins_templates) + seedRuins(space_zlevels, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates) loading_ruins = FALSE repopulate_sorted_areas() // Set up Z-level transistions. @@ -141,7 +141,8 @@ SUBSYSTEM_DEF(mapping) var/players = GLOB.clients.len var/list/mapvotes = list() //count votes - if(global.config.allow_map_voting) + var/amv = CONFIG_GET(flag/allow_map_voting) + if(amv) for (var/client/c in GLOB.clients) var/vote = c.prefs.preferred_map if (!vote) @@ -174,7 +175,7 @@ SUBSYSTEM_DEF(mapping) mapvotes.Remove(map) continue - if(global.config.allow_map_voting) + if(amv) mapvotes[map] = mapvotes[map]*VM.voteweight var/pickedmap = pickweight(mapvotes) diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 4e58212b44d..463b82b13ef 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(minimap) /datum/controller/subsystem/minimap/Initialize(timeofday) var/hash = md5(SSmapping.config.GetFullMapPath()) - if(config.generate_minimaps) + if(CONFIG_GET(flag/generate_minimaps)) if(hash == trim(file2text(hash_path()))) for(var/z in z_levels) //We have these files cached, let's register them register_asset("minimap_[z].png", fcopy_rsc(map_path(z))) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index e714dc1171b..26262542793 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -22,48 +22,54 @@ SUBSYSTEM_DEF(persistence) /datum/controller/subsystem/persistence/proc/LoadSatchels() var/placed_satchel = 0 var/path - var/obj/item/storage/backpack/satchel/flat/F = new() - if(fexists("data/npc_saves/SecretSatchels.sav")) //legacy compatability to convert old format to new + if(fexists("data/npc_saves/SecretSatchels.sav")) //legacy conversion. Will only ever run once. var/savefile/secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav") - var/sav_text - secret_satchels[SSmapping.config.map_name] >> sav_text - fdel("data/npc_saves/SecretSatchels.sav") - if(sav_text) - old_secret_satchels = splittext(sav_text,"#") - if(old_secret_satchels.len >= 20) - var/satchel_string = pick_n_take(old_secret_satchels) + for(var/map in secret_satchels) + var/json_file = file("data/npc_saves/SecretSatchels[map].json") + var/list/legacy_secret_satchels = splittext(secret_satchels[map],"#") + var/list/satchels = list() + for(var/i=1,i<=legacy_secret_satchels.len,i++) + var/satchel_string = legacy_secret_satchels[i] var/list/chosen_satchel = splittext(satchel_string,"|") if(chosen_satchel.len == 3) - F.x = text2num(chosen_satchel[1]) - F.y = text2num(chosen_satchel[2]) - F.z = ZLEVEL_STATION_PRIMARY - path = text2path(chosen_satchel[3]) - else - var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json") - if(!fexists(json_file)) - return - var/list/json = list() + var/list/data = list() + data["x"] = text2num(chosen_satchel[1]) + data["y"] = text2num(chosen_satchel[2]) + data["saved_obj"] = chosen_satchel[3] + satchels += list(data) + var/list/file_data = list() + file_data["data"] = satchels + WRITE_FILE(json_file, json_encode(file_data)) + fdel("data/npc_saves/SecretSatchels.sav") + + var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json") + var/list/json = list() + if(fexists(json_file)) json = json_decode(file2text(json_file)) - old_secret_satchels = json["data"] - if(old_secret_satchels.len) - if(old_secret_satchels.len >= 20) //guards against low drop pools assuring that one player cannot reliably find his own gear. - var/pos = rand(1, old_secret_satchels.len) - old_secret_satchels.Cut(pos, pos+1) - F.x = old_secret_satchels[pos]["x"] - F.y = old_secret_satchels[pos]["y"] - F.z = ZLEVEL_STATION_PRIMARY - path = text2path(old_secret_satchels[pos]["saved_obj"]) - if(!ispath(path)) - return - if(isfloorturf(F.loc) && !istype(F.loc, /turf/open/floor/plating/)) - F.hide(1) - new path(F) - placed_satchel++ - var/list/free_satchels = list() + + old_secret_satchels = json["data"] + var/obj/item/storage/backpack/satchel/flat/F + if(old_secret_satchels && old_secret_satchels.len >= 10) //guards against low drop pools assuring that one player cannot reliably find his own gear. + var/pos = rand(1, old_secret_satchels.len) + F = new() + old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len) + F.x = old_secret_satchels[pos]["x"] + F.y = old_secret_satchels[pos]["y"] + F.z = ZLEVEL_STATION_PRIMARY + path = text2path(old_secret_satchels[pos]["saved_obj"]) + + if(F) + if(isfloorturf(F.loc) && !istype(F.loc, /turf/open/floor/plating/)) + F.hide(1) + if(ispath(path)) + new path(F) + placed_satchel++ + var/free_satchels = 0 for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,ZLEVEL_STATION_PRIMARY), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,ZLEVEL_STATION_PRIMARY)))) //Nontrivially expensive but it's roundstart only if(isfloorturf(T) && !istype(T, /turf/open/floor/plating/)) - free_satchels += new /obj/item/storage/backpack/satchel/flat/secret(T) - if(!isemptylist(free_satchels) && ((free_satchels.len + placed_satchel) >= (50 - old_secret_satchels.len) * 0.1)) //up to six tiles, more than enough to kill anything that moves + new /obj/item/storage/backpack/satchel/flat/secret(T) + free_satchels++ + if((free_satchels + placed_satchel) == 10) //ten tiles, more than enough to kill anything that moves break /datum/controller/subsystem/persistence/proc/LoadPoly() @@ -85,8 +91,7 @@ SUBSYSTEM_DEF(persistence) var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json") if(!fexists(json_file)) return - var/list/json - json = json_decode(file2text(json_file)) + var/list/json = json_decode(file2text(json_file)) if(!json) return @@ -130,8 +135,7 @@ SUBSYSTEM_DEF(persistence) var/json_file = file("data/npc_saves/TrophyItems.json") if(!fexists(json_file)) return - var/list/json = list() - json = json_decode(file2text(json_file)) + var/list/json = json_decode(file2text(json_file)) if(!json) return saved_trophies = json["data"] @@ -141,8 +145,7 @@ SUBSYSTEM_DEF(persistence) var/json_file = file("data/RecentModes.json") if(!fexists(json_file)) return - var/list/json = list() - json = json_decode(file2text(json_file)) + var/list/json = json_decode(file2text(json_file)) if(!json) return saved_modes = json["data"] @@ -180,8 +183,8 @@ SUBSYSTEM_DEF(persistence) CollectRoundtype() /datum/controller/subsystem/persistence/proc/CollectSecretSatchels() - var/list/satchels = list() satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar)) + var/list/satchels_to_add = list() for(var/A in new_secret_satchels) var/obj/item/storage/backpack/satchel/flat/F = A if(QDELETED(F) || F.z != ZLEVEL_STATION_PRIMARY || F.invisibility != INVISIBILITY_MAXIMUM) @@ -200,11 +203,12 @@ SUBSYSTEM_DEF(persistence) data["x"] = F.x data["y"] = F.y data["saved_obj"] = pick(savable_obj) - satchels += list(data) + satchels_to_add += list(data) + var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json") var/list/file_data = list() - file_data["data"] = satchels fdel(json_file) + file_data["data"] = old_secret_satchels + satchels_to_add WRITE_FILE(json_file, json_encode(file_data)) /datum/controller/subsystem/persistence/proc/CollectChiselMessages() diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index ec34cfb8edb..0b8fa750b6d 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -10,7 +10,7 @@ SUBSYSTEM_DEF(server_maint) var/list/currentrun /datum/controller/subsystem/server_maint/Initialize(timeofday) - if (config.hub) + if (CONFIG_GET(flag/hub)) world.update_hub_visibility(TRUE) ..() @@ -21,16 +21,19 @@ SUBSYSTEM_DEF(server_maint) var/list/currentrun = src.currentrun var/round_started = SSticker.HasRoundStarted() + var/kick_inactive = CONFIG_GET(flag/kick_inactive) + var/afk_period + if(kick_inactive) + afk_period = CONFIG_GET(number/afk_period) for(var/I in currentrun) var/client/C = I //handle kicking inactive players - if(round_started && config.kick_inactive) - if(C.is_afk(config.afk_period)) - var/cmob = C.mob - if(!(isobserver(cmob) || (isdead(cmob) && C.holder))) - log_access("AFK: [key_name(C)]") - to_chat(C, "You have been inactive for more than [config.afk_period / 600] minutes and have been disconnected.") - qdel(C) + if(round_started && kick_inactive && C.is_afk(afk_period)) + var/cmob = C.mob + if(!(isobserver(cmob) || (isdead(cmob) && C.holder))) + log_access("AFK: [key_name(C)]") + to_chat(C, "You have been inactive for more than [DisplayTimeText(afk_period)] and have been disconnected.") + qdel(C) if (!(!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1))) winset(C, null, "command=.update_ping+[world.time+world.tick_lag*TICK_USAGE_REAL/100]") @@ -40,7 +43,7 @@ SUBSYSTEM_DEF(server_maint) /datum/controller/subsystem/server_maint/Shutdown() kick_clients_in_lobby("The round came to an end with you in the lobby.", TRUE) //second parameter ensures only afk clients are kicked - var/server = config.server + var/server = CONFIG_GET(string/server) for(var/thing in GLOB.clients) if(!thing) continue diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 265134dff3e..0ec7c11f1d2 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -174,9 +174,9 @@ SUBSYSTEM_DEF(shuttle) Good luck.") return emergency = backup_shuttle - - if(world.time - SSticker.round_start_time < config.shuttle_refuel_delay) - to_chat(user, "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again.") + var/srd = CONFIG_GET(number/shuttle_refuel_delay) + if(world.time - SSticker.round_start_time < srd) + to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText(srd - (world.time - SSticker.round_start_time))] before trying again.") return switch(emergency.mode) @@ -218,7 +218,7 @@ SUBSYSTEM_DEF(shuttle) if(call_reason) SSblackbox.add_details("shuttle_reason", call_reason) log_game("Shuttle call reason: [call_reason]") - message_admins("[key_name_admin(user)] has called the shuttle. (TRIGGER CENTCOM RECALL)") + message_admins("[key_name_admin(user)] has called the shuttle. (TRIGGER CENTCOM RECALL)") /datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message) if(emergency.mode != SHUTTLE_CALL || emergency.timer != old_timer) @@ -421,17 +421,14 @@ SUBSYSTEM_DEF(shuttle) continue base if(!(T.flags_1 & UNUSED_TRANSIT_TURF_1)) continue base - //to_chat(world, "[COORD(topleft)] and [COORD(bottomright)]") break base if((!proposed_zone) || (!proposed_zone.len)) return FALSE var/turf/topleft = proposed_zone[1] - //to_chat(world, "[COORD(topleft)] is TOPLEFT") // Then create a transit docking port in the middle var/coords = M.return_coords(0, 0, dock_dir) - //to_chat(world, json_encode(coords)) /* 0------2 | | | | @@ -469,11 +466,9 @@ SUBSYSTEM_DEF(shuttle) if(WEST) transit_path = /turf/open/space/transit/west - //to_chat(world, "Docking port at [transit_x], [transit_y], [topleft.z]") var/turf/midpoint = locate(transit_x, transit_y, topleft.z) if(!midpoint) return FALSE - //to_chat(world, "Making transit dock at [COORD(midpoint)]") var/area/shuttle/transit/A = new() A.parallax_movedir = travel_dir A.contents = proposed_zone diff --git a/code/controllers/subsystem/squeak.dm b/code/controllers/subsystem/squeak.dm index d94efd0a4ac..022b659d8a2 100644 --- a/code/controllers/subsystem/squeak.dm +++ b/code/controllers/subsystem/squeak.dm @@ -10,7 +10,8 @@ SUBSYSTEM_DEF(squeak) var/list/exposed_wires = list() /datum/controller/subsystem/squeak/Initialize(timeofday) - trigger_migration(config.mice_roundstart) + trigger_migration(CONFIG_GET(number/mice_roundstart)) + return ..() /datum/controller/subsystem/squeak/proc/trigger_migration(num_mice=10) if(!num_mice) @@ -32,8 +33,9 @@ SUBSYSTEM_DEF(squeak) /datum/controller/subsystem/squeak/proc/find_exposed_wires() exposed_wires.Cut() - - var/list/all_turfs = block(locate(1,1,1), locate(world.maxx,world.maxy,1)) + var/list/all_turfs + for (var/z in GLOB.station_z_levels) + all_turfs += block(locate(1,1,z), locate(world.maxx,world.maxy,z)) for(var/turf/open/floor/plating/T in all_turfs) if(is_blocked_turf(T)) continue diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index f245b0766cb..97d84a0d3bc 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -57,6 +57,9 @@ SUBSYSTEM_DEF(throwing) var/pure_diagonal var/diagonal_error var/datum/callback/callback + var/paused = FALSE + var/delayed_time = 0 + var/last_move = 0 /datum/thrownthing/proc/tick() var/atom/movable/AM = thrownthing @@ -64,14 +67,20 @@ SUBSYSTEM_DEF(throwing) finalize() return + if(paused) + delayed_time += world.time - last_move + return + if (dist_travelled && hitcheck()) //to catch sneaky things moving on our tile while we slept finalize() return var/atom/step + last_move = world.time + //calculate how many tiles to move, making up for any missed ticks. - var/tilestomove = Ceiling(min(((((world.time+world.tick_lag) - start_time) * speed) - (dist_travelled ? dist_travelled : -1)), speed*MAX_TICKS_TO_MAKE_UP) * (world.tick_lag * SSthrowing.wait)) + var/tilestomove = Ceiling(min(((((world.time+world.tick_lag) - start_time + delayed_time) * speed) - (dist_travelled ? dist_travelled : -1)), speed*MAX_TICKS_TO_MAKE_UP) * (world.tick_lag * SSthrowing.wait)) while (tilestomove-- > 0) if ((dist_travelled >= maxrange || AM.loc == target_turf) && AM.has_gravity(AM.loc)) finalize() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 481d555a1dc..05cde4b83c2 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -51,14 +51,14 @@ SUBSYSTEM_DEF(ticker) var/queue_delay = 0 var/list/queued_players = list() //used for join queues when the server exceeds the hard population cap - var/obj/screen/cinematic = null //used for station explosion cinematic - var/maprotatechecked = 0 var/news_report var/late_join_disabled + var/roundend_check_paused = FALSE + var/round_start_time = 0 var/list/round_start_events var/mode_result = "undefined" @@ -77,16 +77,18 @@ SUBSYSTEM_DEF(ticker) if(!GLOB.syndicate_code_response) GLOB.syndicate_code_response = generate_code_phrase() ..() - start_at = world.time + (config.lobby_countdown * 10) + start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) /datum/controller/subsystem/ticker/fire() switch(current_state) if(GAME_STATE_STARTUP) if(Master.initializations_finished_with_no_players_logged_in) - start_at = world.time + (config.lobby_countdown * 10) + start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. to_chat(world, "Welcome to [station_name()]!") + if(CONFIG_GET(flag/irc_announce_new_game)) + SERVER_TOOLS_CHAT_BROADCAST("New round starting on [SSmapping.config.map_name]!") current_state = GAME_STATE_PREGAME //Everyone who wants to be an observer is now spawned create_observers() @@ -132,7 +134,7 @@ SUBSYSTEM_DEF(ticker) check_maprotate() scripture_states = scripture_unlock_alert(scripture_states) - if(!mode.explosion_in_progress && mode.check_finished(force_ending) || force_ending) + if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending) current_state = GAME_STATE_FINISHED toggle_ooc(TRUE) // Turn it on toggle_dooc(TRUE) @@ -202,7 +204,7 @@ SUBSYSTEM_DEF(ticker) else mode.announce() - if(!config.ooc_during_round) + if(!CONFIG_GET(flag/ooc_during_round)) toggle_ooc(FALSE) // Turn it off CHECK_TICK @@ -269,144 +271,6 @@ SUBSYSTEM_DEF(ticker) if(epi) explosion(epi, 0, 256, 512, 0, TRUE, TRUE, 0, TRUE) -//Plus it provides an easy way to make cinematics for other events. Just use this as a template -/datum/controller/subsystem/ticker/proc/station_explosion_cinematic(station_missed=0, override = null, atom/bomb = null) - if( cinematic ) - return //already a cinematic in progress! - - for (var/datum/html_interface/hi in GLOB.html_interfaces) - hi.closeAll() - SStgui.close_all_uis() - - //Turn off the shuttles, there's no escape now - if(!station_missed && bomb) - SSshuttle.registerHostileEnvironment(src) - SSshuttle.lockdown = TRUE - - //initialise our cinematic screen object - cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity = MOUSE_OPACITY_TRANSPARENT;screen_loc="1,0";}(src) - - for(var/mob/M in GLOB.mob_list) - M.notransform = TRUE //stop everything moving - if(M.client) - M.client.screen += cinematic //show every client the cinematic - - var/actually_blew_up = TRUE - //Now animate the cinematic - switch(station_missed) - if(NUKE_NEAR_MISS) //nuke was nearby but (mostly) missed - if(mode && !override ) - override = mode.name - switch( override ) - if("nuclear emergency") //Nuke wasn't on station when it blew up - flick("intro_nuke",cinematic) - sleep(35) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) - flick("station_intact_fade_red",cinematic) - cinematic.icon_state = "summary_nukefail" - if("cult") - cinematic.icon_state = null - flick("intro_cult",cinematic) - sleep(25) - SEND_SOUND(world, sound('sound/magic/enter_blood.ogg')) - sleep(28) - SEND_SOUND(world, sound('sound/machines/terminal_off.ogg')) - sleep(20) - flick("station_corrupted",cinematic) - SEND_SOUND(world, sound('sound/effects/ghost.ogg')) - actually_blew_up = FALSE - sleep(70) - if("fake") //The round isn't over, we're just freaking people out for fun - flick("intro_nuke",cinematic) - sleep(35) - SEND_SOUND(world, sound('sound/items/bikehorn.ogg')) - flick("summary_selfdes",cinematic) - actually_blew_up = FALSE - else - flick("intro_nuke",cinematic) - sleep(35) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) - - - if(NUKE_MISS_STATION || NUKE_SYNDICATE_BASE) //nuke was nowhere nearby //TODO: a really distant explosion animation - sleep(50) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) - actually_blew_up = station_missed == NUKE_SYNDICATE_BASE //don't kill everyone on station if it detonated off station - else //station was destroyed - if( mode && !override ) - override = mode.name - switch( override ) - if("nuclear emergency") //Nuke Ops successfully bombed the station - flick("intro_nuke",cinematic) - sleep(35) - flick("station_explode_fade_red",cinematic) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) - cinematic.icon_state = "summary_nukewin" - if("AI malfunction") //Malf (screen,explosion,summary) - flick("intro_malf",cinematic) - sleep(76) - flick("station_explode_fade_red",cinematic) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) //TODO: If we ever decide to actually detonate the vault bomb - cinematic.icon_state = "summary_malf" - if("blob") //Station nuked (nuke,explosion,summary) - flick("intro_nuke",cinematic) - sleep(35) - flick("station_explode_fade_red",cinematic) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) //TODO: no idea what this case could be - cinematic.icon_state = "summary_selfdes" - if("cult") //Station nuked (nuke,explosion,summary) - flick("intro_nuke",cinematic) - sleep(35) - flick("station_explode_fade_red",cinematic) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) //TODO: no idea what this case could be - cinematic.icon_state = "summary_cult" - if("no_core") //Nuke failed to detonate as it had no core - flick("intro_nuke",cinematic) - sleep(35) - flick("station_intact",cinematic) - SEND_SOUND(world, sound('sound/ambience/signal.ogg')) - addtimer(CALLBACK(src, .proc/finish_cinematic, null, FALSE), 100) - return //Faster exit, since nothing happened - else //Station nuked (nuke,explosion,summary) - flick("intro_nuke",cinematic) - sleep(35) - flick("station_explode_fade_red", cinematic) - SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) - station_explosion_detonation(bomb) - cinematic.icon_state = "summary_selfdes" - //If its actually the end of the round, wait for it to end. - //Otherwise if its a verb it will continue on afterwards. - - var/bombloc = null - if(actually_blew_up) - if(bomb && bomb.loc) - bombloc = bomb.z - else if(!station_missed) - bombloc = ZLEVEL_STATION_PRIMARY - - if(mode) - mode.explosion_in_progress = 0 - to_chat(world, "The station was destoyed by the nuclear blast!") - mode.station_was_nuked = (station_missed<2) //station_missed==1 is a draw. the station becomes irradiated and needs to be evacuated. - - addtimer(CALLBACK(src, .proc/finish_cinematic, bombloc, actually_blew_up), 300) - -/datum/controller/subsystem/ticker/proc/finish_cinematic(killz, actually_blew_up) - if(cinematic) - qdel(cinematic) //end the cinematic - cinematic = null - for(var/mob/M in GLOB.mob_list) - M.notransform = FALSE - if(actually_blew_up && !isnull(killz) && M.stat != DEAD && M.z == killz) - M.gib() - /datum/controller/subsystem/ticker/proc/create_characters() for(var/mob/dead/new_player/player in GLOB.player_list) if(player.ready == PLAYER_READY_TO_PLAY && player.mind) @@ -466,10 +330,11 @@ SUBSYSTEM_DEF(ticker) var/num_shuttle_escapees = 0 to_chat(world, "
The round has ended.") + if(LAZYLEN(GLOB.round_end_notifiees)) + send2irc("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.") - var/nocredits = config.no_credits_round_end for(var/client/C in GLOB.clients) - if(!C.credits && !nocredits) + if(!C.credits) C.RollCredits() C.playtitlemusic(40) @@ -501,7 +366,7 @@ SUBSYSTEM_DEF(ticker) end_state.count() var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) - to_chat(world, "
[GLOB.TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]") + to_chat(world, "
[GLOB.TAB]Shift Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]") to_chat(world, "
[GLOB.TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]") if(mode.station_was_nuked) SSticker.news_report = STATION_DESTROYED_NUKE @@ -562,7 +427,7 @@ SUBSYSTEM_DEF(ticker) CHECK_TICK - if(config.cross_allowed) + if(CONFIG_GET(string/cross_server_address)) send_news_report() CHECK_TICK @@ -628,7 +493,8 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "Tip of the round: [html_encode(m)]") /datum/controller/subsystem/ticker/proc/check_queue() - if(!queued_players.len || !config.hard_popcap) + var/hpc = CONFIG_GET(number/hard_popcap) + if(!queued_players.len || !hpc) return queue_delay++ @@ -636,7 +502,7 @@ SUBSYSTEM_DEF(ticker) switch(queue_delay) if(5) //every 5 ticks check if there is a slot available - if(living_player_count() < config.hard_popcap) + if(living_player_count() < hpc) if(next_in_line && next_in_line.client) to_chat(next_in_line, "A slot has opened! You have approximately 20 seconds to join. \>\>Join Game\<\<") SEND_SOUND(next_in_line, sound('sound/misc/notice1.ogg')) @@ -650,7 +516,7 @@ SUBSYSTEM_DEF(ticker) queue_delay = 0 /datum/controller/subsystem/ticker/proc/check_maprotate() - if (!config.maprotation) + if (!CONFIG_GET(flag/maprotation)) return if (SSshuttle.emergency && SSshuttle.emergency.mode != SHUTTLE_ESCAPE || SSshuttle.canRecall()) return @@ -660,7 +526,7 @@ SUBSYSTEM_DEF(ticker) maprotatechecked = 1 //map rotate chance defaults to 75% of the length of the round (in minutes) - if (!prob((world.time/600)*config.maprotatechancedelta)) + if (!prob((world.time/600)*CONFIG_GET(number/maprotatechancedelta))) return INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) @@ -700,13 +566,11 @@ SUBSYSTEM_DEF(ticker) queue_delay = SSticker.queue_delay queued_players = SSticker.queued_players - cinematic = SSticker.cinematic maprotatechecked = SSticker.maprotatechecked round_start_time = SSticker.round_start_time queue_delay = SSticker.queue_delay queued_players = SSticker.queued_players - cinematic = SSticker.cinematic maprotatechecked = SSticker.maprotatechecked switch (current_state) @@ -813,7 +677,7 @@ SUBSYSTEM_DEF(ticker) return if(!delay) - delay = config.round_end_countdown * 10 + delay = CONFIG_GET(number/round_end_countdown) * 10 var/skip_delay = check_rights() if(delay_end && !skip_delay) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 7c560c89f81..1f03cf15f3e 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/fire() //called by master_controller if(mode) - time_remaining = round((started_time + config.vote_period - world.time)/10) + time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10) if(time_remaining < 0) result() @@ -54,7 +54,7 @@ SUBSYSTEM_DEF(vote) if(votes > greatest_votes) greatest_votes = votes //default-vote for everyone who didn't vote - if(!config.vote_no_default && choices.len) + if(!CONFIG_GET(flag/default_no_vote) && choices.len) var/list/non_voters = GLOB.directory.Copy() non_voters -= voted for (var/non_voter_ckey in non_voters) @@ -139,7 +139,7 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/proc/submit_vote(vote) if(mode) - if(config.vote_no_dead && usr.stat == DEAD && !usr.client.holder) + if(CONFIG_GET(flag/no_dead_vote) && usr.stat == DEAD && !usr.client.holder) return 0 if(!(usr.ckey in voted)) if(vote && 1<=vote && vote<=choices.len) @@ -151,7 +151,7 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key) if(!mode) if(started_time) - var/next_allowed_time = (started_time + config.vote_delay) + var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay)) if(mode) to_chat(usr, "There is already a vote in progress! please wait for it to finish.") return 0 @@ -162,7 +162,7 @@ SUBSYSTEM_DEF(vote) admin = TRUE if(next_allowed_time > world.time && !admin) - to_chat(usr, "A vote was initiated recently, you must wait roughly [(next_allowed_time-world.time)/10] seconds before a new vote can be started!") + to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!") return 0 reset() @@ -189,8 +189,9 @@ SUBSYSTEM_DEF(vote) if(mode == "custom") text += "\n[question]" log_vote(text) - to_chat(world, "\n[text]\nType vote or click here to place your votes.\nYou have [config.vote_period/10] seconds to vote.") - time_remaining = round(config.vote_period/10) + var/vp = CONFIG_GET(number/vote_period) + to_chat(world, "\n[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote.") + time_remaining = round(vp/10) for(var/c in GLOB.clients) var/client/C = c var/datum/action/vote/V = new @@ -229,20 +230,22 @@ SUBSYSTEM_DEF(vote) else . += "
Start a vote:
- " //restart - if(trialmin || config.allow_vote_restart) + var/avr = CONFIG_GET(flag/allow_vote_restart) + if(trialmin || avr) . += "Restart" else . += "Restart (Disallowed)" if(trialmin) - . += "\t([config.allow_vote_restart?"Allowed":"Disallowed"])" + . += "\t([avr ? "Allowed" : "Disallowed"])" . += "
- " //gamemode - if(trialmin || config.allow_vote_mode) + var/avm = CONFIG_GET(flag/allow_vote_mode) + if(trialmin || avm) . += "GameMode" else . += "GameMode (Disallowed)" if(trialmin) - . += "\t([config.allow_vote_mode?"Allowed":"Disallowed"])" + . += "\t([avm ? "Allowed" : "Disallowed"])" . += " " //custom @@ -266,15 +269,15 @@ SUBSYSTEM_DEF(vote) reset() if("toggle_restart") if(usr.client.holder) - config.allow_vote_restart = !config.allow_vote_restart + CONFIG_SET(flag/allow_vote_restart, !CONFIG_GET(flag/allow_vote_restart)) if("toggle_gamemode") if(usr.client.holder) - config.allow_vote_mode = !config.allow_vote_mode + CONFIG_SET(flag/allow_vote_mode, !CONFIG_GET(flag/allow_vote_mode)) if("restart") - if(config.allow_vote_restart || usr.client.holder) + if(CONFIG_GET(flag/allow_vote_restart) || usr.client.holder) initiate_vote("restart",usr.key) if("gamemode") - if(config.allow_vote_mode || usr.client.holder) + if(CONFIG_GET(flag/allow_vote_mode) || usr.client.holder) initiate_vote("gamemode",usr.key) if("custom") if(usr.client.holder) diff --git a/code/datums/action.dm b/code/datums/action.dm index ca71a7cbec6..60a0722f0fd 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -485,7 +485,7 @@ /datum/action/spell_action/New(Target) ..() - var/obj/effect/proc_holder/spell/S = target + var/obj/effect/proc_holder/S = target S.action = src name = S.name desc = S.desc @@ -495,36 +495,40 @@ button.name = name /datum/action/spell_action/Destroy() - var/obj/effect/proc_holder/spell/S = target + var/obj/effect/proc_holder/S = target S.action = null return ..() /datum/action/spell_action/Trigger() if(!..()) - return 0 + return FALSE if(target) - var/obj/effect/proc_holder/spell = target - spell.Click() - return 1 + var/obj/effect/proc_holder/S = target + S.Click() + return TRUE /datum/action/spell_action/IsAvailable() if(!target) - return 0 - var/obj/effect/proc_holder/spell/spell = target - if(owner) - return spell.can_cast(owner) - return 0 + return FALSE + return TRUE +/datum/action/spell_action/spell/IsAvailable() + if(!target) + return FALSE + var/obj/effect/proc_holder/spell/S = target + if(owner) + return S.can_cast(owner) + return FALSE /datum/action/spell_action/alien /datum/action/spell_action/alien/IsAvailable() if(!target) - return 0 + return FALSE var/obj/effect/proc_holder/alien/ab = target if(owner) return ab.cost_check(ab.check_turf,owner,1) - return 0 + return FALSE @@ -587,3 +591,4 @@ var/mob/M = owner var/datum/language_holder/H = M.get_language_holder() H.open_language_menu(usr) + diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 24daad00f9e..8d86507271e 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -208,7 +208,8 @@ /* General ai_law functions */ /datum/ai_laws/proc/set_laws_config() - switch(config.default_laws) + var/list/law_ids = CONFIG_GET(keyed_flag_list/random_laws) + switch(CONFIG_GET(number/default_laws)) if(0) add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") @@ -220,7 +221,7 @@ var/list/randlaws = list() for(var/lpath in subtypesof(/datum/ai_laws)) var/datum/ai_laws/L = lpath - if(initial(L.id) in config.lawids) + if(initial(L.id) in law_ids) randlaws += lpath var/datum/ai_laws/lawtype if(randlaws.len) @@ -234,21 +235,14 @@ if(3) pick_weighted_lawset() - else: - log_law("Invalid law config. Please check silicon_laws.txt") - add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - WARNING("Invalid custom AI laws, check silicon_laws.txt") - /datum/ai_laws/proc/pick_weighted_lawset() var/datum/ai_laws/lawtype - - while(!lawtype && config.law_weights.len) - var/possible_id = pickweight(config.law_weights) + var/list/law_weights = CONFIG_GET(keyed_number_list/law_weight) + while(!lawtype && law_weights.len) + var/possible_id = pickweight(law_weights) lawtype = lawid_to_type(possible_id) if(!lawtype) - config.law_weights -= possible_id + law_weights -= possible_id WARNING("Bad lawid in game_options.txt: [possible_id]") if(!lawtype) @@ -310,7 +304,7 @@ replaceable_groups[LAW_INHERENT] = inherent.len if(supplied.len && (LAW_SUPPLIED in groups)) replaceable_groups[LAW_SUPPLIED] = supplied.len - var picked_group = pickweight(replaceable_groups) + var/picked_group = pickweight(replaceable_groups) switch(picked_group) if(LAW_ZEROTH) . = zeroth diff --git a/code/datums/antagonists/datum_abductor.dm b/code/datums/antagonists/datum_abductor.dm new file mode 100644 index 00000000000..6d08d61b8af --- /dev/null +++ b/code/datums/antagonists/datum_abductor.dm @@ -0,0 +1,60 @@ +/datum/antagonist/abductor + name = "Abductor" + var/datum/objective_team/abductor_team/team + var/sub_role + var/outfit + var/landmark_type + var/greet_text + +/datum/antagonist/abductor/agent + sub_role = "Agent" + outfit = /datum/outfit/abductor/agent + landmark_type = /obj/effect/landmark/abductor/agent + greet_text = "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve." + +/datum/antagonist/abductor/scientist + sub_role = "Scientist" + outfit = /datum/outfit/abductor/scientist + landmark_type = /obj/effect/landmark/abductor/scientist + greet_text = "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve." + +/datum/antagonist/abductor/New(datum/mind/new_owner, datum/objective_team/abductor_team/T) + team = T + return ..() + +/datum/antagonist/abductor/on_gain() + SSticker.mode.abductors += owner + owner.special_role = "[name] [sub_role]" + owner.objectives += team.objectives + finalize_abductor() + return ..() + +/datum/antagonist/abductor/on_removal() + SSticker.mode.abductors -= owner + team.members -= owner + owner.objectives -= team.objectives + if(owner.current) + to_chat(owner.current,"You are no longer the [owner.special_role]!") + owner.special_role = null + return ..() + +/datum/antagonist/abductor/greet() + to_chat(owner.current, "You are the [owner.special_role]!") + to_chat(owner.current, "With the help of your teammate, kidnap and experiment on station crew members!") + to_chat(owner.current, "[greet_text]") + owner.announce_objectives() + +/datum/antagonist/abductor/proc/finalize_abductor() + //Equip + var/mob/living/carbon/human/H = owner.current + H.set_species(/datum/species/abductor) + H.real_name = "[team.name] [sub_role]" + H.equipOutfit(outfit) + + //Teleport to ship + for(var/obj/effect/landmark/abductor/LM in GLOB.landmarks_list) + if(istype(LM, landmark_type) && LM.team_number == team.team_number) + H.forceMove(LM.loc) + break + + SSticker.mode.update_abductor_icons_added(owner) diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index 5dd7a48923b..09309a184a3 100644 --- a/code/datums/antagonists/datum_clockcult.dm +++ b/code/datums/antagonists/datum_clockcult.dm @@ -103,23 +103,22 @@ S.laws.associate(S) S.update_icons() S.show_laws() - hierophant_network.Grant(S) hierophant_network.title = "Silicon" hierophant_network.span_for_name = "nezbere" hierophant_network.span_for_message = "brass" else if(isbrain(current)) - hierophant_network.Grant(current) hierophant_network.title = "Vessel" hierophant_network.span_for_name = "nezbere" hierophant_network.span_for_message = "alloy" else if(isclockmob(current)) - hierophant_network.Grant(current) hierophant_network.title = "Construct" hierophant_network.span_for_name = "nezbere" hierophant_network.span_for_message = "brass" + hierophant_network.Grant(current) current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump) - if(!GLOB.clockwork_gateway_activated) - current.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs) + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar + if(G.active && ishuman(current)) + current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)) /datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override) var/mob/living/current = owner.current @@ -129,9 +128,10 @@ current.faction -= "ratvar" current.remove_language(/datum/language/ratvar) current.clear_alert("clockinfo") - current.clear_alert("scripturereq") - for(var/datum/action/innate/function_call/F in owner.current.actions) //Removes any bound Ratvarian spears - qdel(F) + for(var/datum/action/innate/clockwork_arnaments/C in owner.current.actions) //Removes any bound clockwork armor + qdel(C) + for(var/datum/action/innate/call_weapon/W in owner.current.actions) //and weapons too + qdel(W) if(issilicon(current)) var/mob/living/silicon/S = current if(isAI(S)) @@ -149,6 +149,8 @@ R.module.rebuild_modules() if(temp_owner) temp_owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them, we need to update buttons + temp_owner.cut_overlays() + temp_owner.regenerate_icons() /datum/antagonist/clockcult/on_removal() SSticker.mode.servants_of_ratvar -= owner diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm index 6ab513152a5..e2c6299837c 100644 --- a/code/datums/antagonists/datum_traitor.dm +++ b/code/datums/antagonists/datum_traitor.dm @@ -85,7 +85,7 @@ if(owner.assigned_role == "Clown") var/mob/living/carbon/human/traitor_mob = owner.current if(traitor_mob&&istype(traitor_mob)) - if(!silent) + if(!silent) to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") traitor_mob.dna.remove_mutation(CLOWNMUT) @@ -138,10 +138,11 @@ assign_exchange_role(SSticker.mode.exchange_red) assign_exchange_role(SSticker.mode.exchange_blue) objective_count += 1 //Exchange counts towards number of objectives - for(var/i = objective_count, i < config.traitor_objectives_amount, i++) + var/toa = CONFIG_GET(number/traitor_objectives_amount) + for(var/i = objective_count, i < toa, i++) forge_single_objective() - if(is_hijacker && objective_count <= config.traitor_objectives_amount) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount + if(is_hijacker && objective_count <= toa) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount if (!(locate(/datum/objective/hijack) in owner.objectives)) var/datum/objective/hijack/hijack_objective = new hijack_objective.owner = owner @@ -174,15 +175,15 @@ if(prob(30)) objective_count += forge_single_objective() - for(var/i = objective_count, i < config.traitor_objectives_amount, i++) + for(var/i = objective_count, i < CONFIG_GET(number/traitor_objectives_amount), i++) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = owner kill_objective.find_target() add_objective(kill_objective) - var/datum/objective/survive/survive_objective = new - survive_objective.owner = owner - add_objective(survive_objective) + var/datum/objective/survive/exist/exist_objective = new + exist_objective.owner = owner + add_objective(exist_objective) /datum/antagonist/traitor/proc/forge_single_objective() return 0 /datum/antagonist/traitor/human/forge_single_objective() //Returns how many objectives are added @@ -205,10 +206,16 @@ kill_objective.find_target() add_objective(kill_objective) else - var/datum/objective/steal/steal_objective = new - steal_objective.owner = owner - steal_objective.find_target() - add_objective(steal_objective) + if(prob(15) && !(locate(/datum/objective/download in owner.objectives))) + var/datum/objective/download/download_objective = new + download_objective.owner = owner + download_objective.gen_amount_goal() + add_objective(download_objective) + else + var/datum/objective/steal/steal_objective = new + steal_objective.owner = owner + steal_objective.find_target() + add_objective(steal_objective) /datum/antagonist/traitor/AI/forge_single_objective() .=1 diff --git a/code/datums/antagonists/devil.dm b/code/datums/antagonists/devil.dm index 14c92f3263e..f66fc5a3b23 100644 --- a/code/datums/antagonists/devil.dm +++ b/code/datums/antagonists/devil.dm @@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/regress_blood_lizard() var/mob/living/carbon/true_devil/D = owner.current to_chat(D, "Your powers weaken, have more contracts be signed to regain power.") - D.oldform.loc = D.loc + D.oldform.forceMove(D.drop_location()) owner.transfer_to(D.oldform) give_appropriate_spells() qdel(D) @@ -236,7 +236,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", sleep(50) var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc) A.faction |= "hell" - owner.current.loc = A + owner.current.forceMove(A) A.oldform = owner.current owner.transfer_to(A) A.set_name() diff --git a/code/datums/antagonists/ninja.dm b/code/datums/antagonists/ninja.dm index 230a4d64e45..f51b22dde2d 100644 --- a/code/datums/antagonists/ninja.dm +++ b/code/datums/antagonists/ninja.dm @@ -1,6 +1,5 @@ /datum/antagonist/ninja name = "Ninja" - var/team var/helping_station = 0 var/give_objectives = TRUE @@ -19,36 +18,8 @@ ..(new_owner) helping_station = rand(0,1) -/datum/antagonist/ninja/proc/equip_space_ninja(mob/living/carbon/human/H = owner.current, safety=0)//Safety in case you need to unequip stuff for existing characters. - if(safety) - qdel(H.w_uniform) - qdel(H.wear_suit) - qdel(H.wear_mask) - qdel(H.head) - qdel(H.shoes) - qdel(H.gloves) - - var/obj/item/clothing/suit/space/space_ninja/theSuit = new(H) - var/obj/item/dash/energy_katana/EK = new(H) - theSuit.energyKatana = EK - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/space_ninja(H), slot_shoes) - H.equip_to_slot_or_del(theSuit, slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/space_ninja(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/space_ninja(H), slot_wear_mask) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses) - H.equip_to_slot_or_del(EK, slot_belt) - H.equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(H), slot_l_store) - H.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen(H), slot_s_store) - H.equip_to_slot_or_del(new /obj/item/tank/jetpack/carbondioxide(H), slot_back) - theSuit.randomize_param() - - var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H) - E.implant(H) - return 1 +/datum/antagonist/ninja/proc/equip_space_ninja(mob/living/carbon/human/H = owner.current) + return H.equipOutfit(/datum/outfit/ninja) /datum/antagonist/ninja/proc/addMemories() owner.store_memory("I am an elite mercenary assassin of the mighty Spider Clan. A SPACE NINJA!") diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 9092cae09e4..b6738d5ad63 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -257,7 +257,6 @@ winset(user, windowid, "on-close=\".windowclose [param]\"") - //to_chat(world, "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]") // the on-close client verb @@ -269,12 +268,10 @@ set hidden = 1 // hide this verb from the user's panel set name = ".windowclose" // no autocomplete on cmd line - //to_chat(world, "windowclose: [atomref]") if(atomref!="null") // if passed a real atomref var/hsrc = locate(atomref) // find the reffed atom var/href = "close=1" if(hsrc) - //to_chat(world, "[src] Topic [href] [hsrc]") usr = src.mob src.Topic(href, params2list(href), hsrc) // this will direct to the atom's return // Topic() proc via client.Topic() @@ -282,6 +279,5 @@ // no atomref specified (or not found) // so just reset the user mob's machine var if(src && src.mob) - //to_chat(world, "[src] was [src.mob.machine], setting to null") src.mob.unset_machine() return diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm new file mode 100644 index 00000000000..3f72ff995b3 --- /dev/null +++ b/code/datums/cinematic.dm @@ -0,0 +1,223 @@ +GLOBAL_LIST_EMPTY(cinematics) + +// Use to play cinematics. +// Watcher can be world,mob, or a list of mobs +// Blocks until sequence is done. +/proc/Cinematic(id,watcher,datum/callback/special_callback) + var/datum/cinematic/playing + for(var/V in subtypesof(/datum/cinematic)) + var/datum/cinematic/C = V + if(initial(C.id) == id) + playing = new V() + break + if(!playing) + CRASH("Cinematic type not found") + if(special_callback) + playing.special_callback = special_callback + if(watcher == world) + playing.is_global = TRUE + watcher = GLOB.mob_list + playing.play(watcher) + +/obj/screen/cinematic + icon = 'icons/effects/station_explosion.dmi' + icon_state = "station_intact" + layer = 21 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + screen_loc = "1,1" + +/datum/cinematic + var/id = CINEMATIC_DEFAULT + var/list/watching = list() //List of clients watching this + var/list/locked = list() //Who had notransform set during the cinematic + var/is_global = FALSE //Global cinematics will override mob-specific ones + var/obj/screen/cinematic/screen + var/datum/callback/special_callback //For special effects synced with animation (explosions after the countdown etc) + var/cleanup_time = 300 //How long for the final screen to remain + +/datum/cinematic/New() + GLOB.cinematics += src + screen = new(src) + +/datum/cinematic/Destroy() + GLOB.cinematics -= src + QDEL_NULL(screen) + for(var/mob/M in locked) + M.notransform = FALSE + return ..() + +/datum/cinematic/proc/play(watchers) + //Check if you can actually play it (stop mob cinematics for global ones) and create screen objects + for(var/A in GLOB.cinematics) + var/datum/cinematic/C = A + if(C == src) + continue + if(C.is_global || !is_global) + return //Can't play two global or local cinematics at the same time + + //Close all open windows if global + if(is_global) + for (var/datum/html_interface/hi in GLOB.html_interfaces) + hi.closeAll() + SStgui.close_all_uis() + + + for(var/mob/M in GLOB.mob_list) + if(M in watchers) + M.notransform = TRUE //Should this be done for non-global cinematics or even at all ? + locked += M + //Close watcher ui's + SStgui.close_user_uis(M) + if(M.client) + watching += M.client + M.client.screen += screen + else + if(is_global) + M.notransform = TRUE + locked += M + + //Actually play it + content() + //Cleanup + sleep(cleanup_time) + qdel(src) + +//Sound helper +/datum/cinematic/proc/cinematic_sound(s) + if(is_global) + SEND_SOUND(world,s) + else + for(var/C in watching) + SEND_SOUND(C,s) + +//Fire up special callback for actual effects synchronized with animation (eg real nuke explosion happens midway) +/datum/cinematic/proc/special() + if(special_callback) + special_callback.Invoke() + +//Actual cinematic goes in here +/datum/cinematic/proc/content() + sleep(50) + +/datum/cinematic/nuke_win + id = CINEMATIC_NUKE_WIN + +/datum/cinematic/nuke_win/content() + flick("intro_nuke",screen) + sleep(35) + flick("station_explode_fade_red",screen) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + screen.icon_state = "summary_nukewin" + +/datum/cinematic/nuke_miss + id = CINEMATIC_NUKE_MISS + +/datum/cinematic/nuke_miss/content() + flick("intro_nuke",screen) + sleep(35) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + flick("station_intact_fade_red",screen) + screen.icon_state = "summary_nukefail" + +//Also used for blob +/datum/cinematic/nuke_selfdestruct + id = CINEMATIC_SELFDESTRUCT + +/datum/cinematic/nuke_selfdestruct/content() + flick("intro_nuke",screen) + sleep(35) + flick("station_explode_fade_red", screen) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + screen.icon_state = "summary_selfdes" + +/datum/cinematic/nuke_selfdestruct_miss + id = CINEMATIC_SELFDESTRUCT_MISS + +/datum/cinematic/nuke_selfdestruct_miss/content() + flick("intro_nuke",screen) + sleep(35) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + screen.icon_state = "station_intact" + +/datum/cinematic/malf + id = CINEMATIC_MALF + +/datum/cinematic/malf/content() + flick("intro_malf",screen) + sleep(76) + flick("station_explode_fade_red",screen) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + screen.icon_state = "summary_malf" + +/datum/cinematic/cult + id = CINEMATIC_CULT + +/datum/cinematic/cult/content() + screen.icon_state = null + flick("intro_cult",screen) + sleep(25) + cinematic_sound(sound('sound/magic/enter_blood.ogg')) + sleep(28) + cinematic_sound(sound('sound/machines/terminal_off.ogg')) + sleep(20) + flick("station_corrupted",screen) + cinematic_sound(sound('sound/effects/ghost.ogg')) + sleep(70) + special() + +/datum/cinematic/nuke_annihilation + id = CINEMATIC_ANNIHILATION + +/datum/cinematic/nuke_annihilation/content() + flick("intro_nuke",screen) + sleep(35) + flick("station_explode_fade_red",screen) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + screen.icon_state = "summary_totala" + +/datum/cinematic/fake + id = CINEMATIC_NUKE_FAKE + cleanup_time = 100 + +/datum/cinematic/fake/content() + flick("intro_nuke",screen) + sleep(35) + cinematic_sound(sound('sound/items/bikehorn.ogg')) + flick("summary_selfdes",screen) //??? + special() + +/datum/cinematic/no_core + id = CINEMATIC_NUKE_NO_CORE + cleanup_time = 100 + +/datum/cinematic/no_core/content() + flick("intro_nuke",screen) + sleep(35) + flick("station_intact",screen) + cinematic_sound(sound('sound/ambience/signal.ogg')) + sleep(100) + +/datum/cinematic/nuke_far + id = CINEMATIC_NUKE_FAR + cleanup_time = 0 + +/datum/cinematic/nuke_far/content() + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + +/* Intended usage. +Nuke.Explosion() + -> Cinematic(NUKE_BOOM,world) + -> ActualExplosion() + -> Mode.OnExplosion() + + +Narsie() + -> Cinematic(CULT,world) +*/ \ No newline at end of file diff --git a/code/datums/components/README.md b/code/datums/components/README.md index 93a846035f1..81218700c1c 100644 --- a/code/datums/components/README.md +++ b/code/datums/components/README.md @@ -62,7 +62,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set 1. `/datum/proc/LoadComponent(component_type(type), ...) -> datum/component` (public, final) * Equivalent to calling `GetComponent(component_type)` where, if the result would be `null`, returns `AddComponent(component_type, ...)` instead -1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract) +1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract, async) * Called on a component's `parent` after a signal recieved causes it to activate. `src` is the parameter * Will only be called if a component's callback returns `TRUE` 1. `/datum/proc/TakeComponent(datum/component/C)` (public, final) @@ -87,22 +87,20 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo * Called on a component when a component of the same type was added to the same parent * See `/datum/component/var/dupe_mode` * `C`'s type will always be the same of the called component -1. `/datum/component/proc/AfterComponentActivated()` (abstract) +1. `/datum/component/proc/AfterComponentActivated()` (abstract, async) * Called on a component that was activated after it's `parent`'s `ComponentActivated()` is called 1. `/datum/component/proc/OnTransfer(datum/new_parent)` (abstract, no-sleep) * Called before the new `parent` is assigned in `TakeComponent()`, after the remove signal, before the added signal * Allows the component to react to ownership transfers 1. `/datum/component/proc/_RemoveNoSignal()` (private, final) * Internal, clears the parent var and removes the component from the parents component list -1. `/datum/component/proc/RegisterSignal(signal(string), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz) +1. `/datum/component/proc/RegisterSignal(signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz) + * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments * Makes a component listen for the specified `signal` on it's `parent` datum. * When that signal is recieved `proc_ref` will be called on the component, along with associated arguments * Example proc ref: `.proc/OnEvent` * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this * These callbacks run asyncronously * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `SendSignal()` that initiated it -1. `/datum/component/proc/ReceiveSignal(signal, ...)` (virtual) - * Called when a component recieves any signal and is enabled - * Default implementation looks if the signal is registered and runs the appropriate proc ### See/Define signals and their arguments in __DEFINES\components.dm diff --git a/code/datums/components/component.dm b/code/datums/components/_component.dm similarity index 81% rename from code/datums/components/component.dm rename to code/datums/components/_component.dm index 6b902a6ac65..a4c85f78163 100644 --- a/code/datums/components/component.dm +++ b/code/datums/components/_component.dm @@ -95,7 +95,7 @@ P.datum_components = null parent = null -/datum/component/proc/RegisterSignal(sig_type, proc_on_self, override = FALSE) +/datum/component/proc/RegisterSignal(sig_type_or_types, proc_on_self, override = FALSE) if(QDELETED(src)) return var/list/procs = signal_procs @@ -103,21 +103,14 @@ procs = list() signal_procs = procs - if(!override) - . = procs[sig_type] - if(.) - stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning") - - procs[sig_type] = CALLBACK(src, proc_on_self) - -/datum/component/proc/ReceiveSignal(sigtype, ...) - var/list/sps = signal_procs - var/datum/callback/CB = LAZYACCESS(sps, sigtype) - if(!CB) - return FALSE - var/list/arguments = args.Copy() - arguments.Cut(1, 2) - return CB.InvokeAsync(arglist(arguments)) + var/list/sig_types = islist(sig_type_or_types) ? sig_type_or_types : list(sig_type_or_types) + for(var/sig_type in sig_types) + if(!override) + . = procs[sig_type] + if(.) + stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning") + + procs[sig_type] = CALLBACK(src, proc_on_self) /datum/component/proc/InheritComponent(datum/component/C, i_am_original) return @@ -126,6 +119,7 @@ return /datum/component/proc/AfterComponentActivated() + set waitfor = FALSE return /datum/component/proc/_GetInverseTypeList(current_type) @@ -136,26 +130,40 @@ /datum/proc/SendSignal(sigtype, ...) var/list/comps = datum_components - . = FALSE if(!comps) - return + return FALSE + var/list/arguments = args.Copy() + arguments.Cut(1, 2) var/target = comps[/datum/component] if(!islist(target)) var/datum/component/C = target - if(C.enabled && C.ReceiveSignal(arglist(args))) + if(!C.enabled) + return FALSE + var/list/sps = C.signal_procs + var/datum/callback/CB = LAZYACCESS(sps, sigtype) + if(!CB) + return FALSE + . = CB.InvokeAsync(arglist(arguments)) + if(.) ComponentActivated(C) C.AfterComponentActivated() - return TRUE else + . = FALSE for(var/I in target) var/datum/component/C = I if(!C.enabled) + continue + var/list/sps = C.signal_procs + var/datum/callback/CB = LAZYACCESS(sps, sigtype) + if(!CB) continue - if(C.ReceiveSignal(arglist(args))) + if(CB.InvokeAsync(arglist(arguments))) ComponentActivated(C) + C.AfterComponentActivated() . = TRUE /datum/proc/ComponentActivated(datum/component/C) + set waitfor = FALSE return /datum/proc/GetComponent(c_type) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 55504d47d5a..d4b75e3892a 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -17,6 +17,7 @@ var/show_on_examine var/list/allowed_typecache var/last_inserted_type + var/last_inserted_id var/last_amount_inserted var/last_insert_success var/datum/callback/precondition @@ -52,7 +53,10 @@ /datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user) var/list/tc = allowed_typecache - if(user.a_intent == INTENT_HARM || (I.flags_2 & HOLOGRAM_2) || (tc && !is_type_in_typecache(I, tc))) + if(user.a_intent == INTENT_HARM) + return FALSE + if((I.flags_2 & (HOLOGRAM_2 | NO_MAT_REDEMPTION_2)) || (tc && !is_type_in_typecache(I, tc))) + to_chat(user, "[parent] won't accept [I]!") return FALSE . = TRUE last_insert_success = FALSE @@ -113,7 +117,7 @@ if(!amt) return 0 - insert_materials(S,amt) + last_inserted_id = insert_materials(S,amt) last_inserted_type = S.type S.use(amt) last_amount_inserted = amt @@ -130,17 +134,22 @@ if(!material_amount || !has_space(material_amount)) return 0 - insert_materials(I, multiplier) + last_inserted_id = insert_materials(I, multiplier) last_inserted_type = I.type last_amount_inserted = material_amount return material_amount /datum/component/material_container/proc/insert_materials(obj/item/I, multiplier = 1) //for internal usage only var/datum/material/M + var/primary_mat + var/max_mat_value = 0 for(var/MAT in materials) M = materials[MAT] M.amount += I.materials[MAT] * multiplier total_amount += I.materials[MAT] * multiplier + if(I.materials[MAT] > max_mat_value) + primary_mat = MAT + return primary_mat //For consuming material //mats is a list of types of material to use and the corresponding amounts, example: list(MAT_METAL=100, MAT_GLASS=200) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 321d407e921..573bb81d110 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -6,10 +6,7 @@ /datum/component/slippery/Initialize(_intensity, _lube_flags = NONE) intensity = max(_intensity, 0) lube_flags = _lube_flags - if(ismovableatom(parent)) - RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/Slip) - else - RegisterSignal(COMSIG_ATOM_ENTERED, .proc/Slip) + RegisterSignal(list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip) /datum/component/slippery/proc/Slip(atom/movable/AM) var/mob/victim = AM diff --git a/code/datums/components/squeek.dm b/code/datums/components/squeek.dm index 40fd0af598c..7b9a7866ca6 100644 --- a/code/datums/components/squeek.dm +++ b/code/datums/components/squeek.dm @@ -24,22 +24,9 @@ if(use_delay_override) use_delay = use_delay_override - if(istype(parent, /atom)) - RegisterSignal(COMSIG_ATOM_BLOB_ACT, .proc/play_squeak) - RegisterSignal(COMSIG_ATOM_HULK_ATTACK, .proc/play_squeak) - RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/play_squeak) - if(istype(parent, /atom/movable)) - RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/play_squeak) - RegisterSignal(COMSIG_MOVABLE_COLLIDE, .proc/play_squeak) - RegisterSignal(COMSIG_MOVABLE_IMPACT, .proc/play_squeak) - if(istype(parent, /obj/item)) - RegisterSignal(COMSIG_ITEM_ATTACK, .proc/play_squeak) - RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak) - RegisterSignal(COMSIG_ITEM_ATTACK_OBJ, .proc/play_squeak) - if(istype(parent, /obj/item/clothing/shoes)) - RegisterSignal(COMSIG_SHOES_STEP_ACTION, .proc/step_squeak) - else - RegisterSignal(COMSIG_ATOM_ENTERED, .proc/play_squeak) + RegisterSignal(list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_CROSSED, COMSIG_MOVABLE_COLLIDE, COMSIG_MOVABLE_IMPACT, COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ), .proc/play_squeak) + RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak) + RegisterSignal(COMSIG_SHOES_STEP_ACTION, .proc/step_squeak) /datum/component/squeak/proc/play_squeak() if(prob(squeak_chance)) diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm new file mode 100644 index 00000000000..1637655d188 --- /dev/null +++ b/code/datums/dash_weapon.dm @@ -0,0 +1,50 @@ +/datum/action/innate/dash + name = "Dash" + desc = "Teleport to the targeted location." + icon_icon = 'icons/mob/actions/actions_items.dmi' + button_icon_state = "jetboot" + var/current_charges = 1 + var/max_charges = 1 + var/charge_rate = 250 + var/mob/living/carbon/human/holder + var/obj/item/dashing_item + var/dash_sound = 'sound/magic/blink.ogg' + var/recharge_sound = 'sound/magic/charge.ogg' + var/beam_effect = "blur" + var/phasein = /obj/effect/temp_visual/dir_setting/ninja/phase + var/phaseout = /obj/effect/temp_visual/dir_setting/ninja/phase/out + +/datum/action/innate/dash/Grant(mob/user, obj/dasher) + . = ..() + dashing_item = dasher + holder = user + +/datum/action/innate/dash/IsAvailable() + if(current_charges > 0) + return TRUE + else + return FALSE + +/datum/action/innate/dash/Activate() + dashing_item.attack_self(holder) //Used to toggle dash behavior in the dashing item + +/datum/action/innate/dash/proc/Teleport(mob/user, atom/target) + if(!IsAvailable()) + return + var/turf/T = get_turf(target) + if(target in view(user.client.view, get_turf(user))) + var/obj/spot1 = new phaseout(get_turf(user), user.dir) + user.forceMove(T) + playsound(T, dash_sound, 25, 1) + var/obj/spot2 = new phasein(get_turf(user), user.dir) + spot1.Beam(spot2,beam_effect,time=20) + current_charges-- + holder.update_action_buttons_icon() + addtimer(CALLBACK(src, .proc/charge), charge_rate) + +/datum/action/innate/dash/proc/charge() + current_charges = Clamp(current_charges + 1, 0, max_charges) + holder.update_action_buttons_icon() + if(recharge_sound) + playsound(dashing_item, recharge_sound, 50, 1) + to_chat(holder, "[src] now has [current_charges]/[max_charges] charges.") \ No newline at end of file diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index e6cd7d325e6..57d7dc504de 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -223,7 +223,7 @@ G.fields["name"] = H.real_name G.fields["rank"] = assignment G.fields["age"] = H.age - if(config.mutant_races) + if(CONFIG_GET(flag/join_with_mutant_race)) G.fields["species"] = H.dna.species.name G.fields["fingerprint"] = md5(H.dna.uni_identity) G.fields["p_stat"] = "Active" diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index d55a32609a0..b653e5c6ae1 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -83,10 +83,10 @@ if(isliving(A)) atomsnowflake += "[D]" if(A.dir) - atomsnowflake += "
- You're in a place called Reebe right now. The crew can't get here normally. \ +
- In the north is your base camp, with supplies, consoles, and the Ark. In the south is an inaccessible area that the crew can walk between \ + once they arrive (more on that later.) Everything between that space is an open area. \ +
- Your job as a servant is to build fortifications and defenses to protect the Ark and your base once the Ark activates. You can do this \ + however you like, but work with your allies and coordinate your efforts. \ +
- Once the Ark activates, the station will be alerted. Portals to Reebe will open up in nearly every room. When they take these portals, \ + the crewmembers will arrive in the area that you can't access, but can get through it freely - whereas you can't. Treat this as the \"spawn\" of the \ + crew and defend it accordingly. \ +
- Dressing Room: Contains clothing, a dresser, and a mirror. There are spare slabs and absconders here. \ +
- Listening Station: Contains intercoms, a telecomms relay, and a list of frequencies. \ +
- Ark Chamber: Houses the Ark. \ +
- Observation Room: Contains five camera observers. These can be used to watch the station through its cameras, as well as to teleport down \ + to most areas. To do this, use the Warp action while hovering over the tile you want to warp to. \ +
- Infirmary: Contains sleepers and basic medical supplies for superficial wounds. The sleepers can consume Vitality to heal any occupants. \ + This room is generally more useful during the preparation phase; when defending the Ark, scripture is more useful. \ +
- Scripture no longer requires components, and instead uses power. \ +
- Added a 5-minute grace period for the crew to prepare for the assault when the Ark activates. \ +
- Script and Application scriptures can now be unlocked with enough power. \ +
- Added the Hateful Manacles scripture, which handcuffs targets! \ +
<< [dir2text(A.dir)] >>" + atomsnowflake += "
<< [dir2text(A.dir)] >>" var/mob/living/M = A atomsnowflake += {" -
[M.ckey ? M.ckey : "No ckey"] / [M.real_name ? M.real_name : "No real name"] +
[M.ckey ? M.ckey : "No ckey"] / [M.real_name ? M.real_name : "No real name"]
BRUTE:[M.getBruteLoss()] FIRE:[M.getFireLoss()] diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 1d3e7f2a12a..a00d43ad8fd 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -43,7 +43,7 @@ SSdisease.active_diseases += DD //Add it to the active diseases list, now that it's actually in a mob and being processed. //Copy properties over. This is so edited diseases persist. - var/list/skipped = list("affected_mob","holder","carrier","stage","type","parent_type","vars","transformed","symptoms") + var/list/skipped = list("affected_mob","holder","carrier","stage","type","parent_type","vars","transformed","symptoms","processing") for(var/V in DD.vars) if(V in skipped) continue diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 9be242a391d..26f42fa059f 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -245,7 +245,6 @@ /datum/disease/advance/proc/GenerateCure() if(properties && properties.len) var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) - //to_chat(world, "Res = [res]") cures = list(advance_cures[res]) // Get the cure name from the cure_id @@ -333,9 +332,6 @@ // Mix a list of advance diseases and return the mixed result. /proc/Advance_Mix(var/list/D_list) - - //to_chat(world, "Mixing!!!!") - var/list/diseases = list() for(var/datum/disease/advance/A in D_list) @@ -359,7 +355,6 @@ D2.Mix(D1) // Should be only 1 entry left, but if not let's only return a single entry - //to_chat(world, "END MIXING!!!!!") var/datum/disease/advance/to_return = pick(diseases) to_return.Refresh(1) return to_return diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm index 539c57c92e7..ef8822470ef 100644 --- a/code/datums/diseases/advance/symptoms/viral.dm +++ b/code/datums/diseases/advance/symptoms/viral.dm @@ -68,8 +68,8 @@ Bonus /datum/symptom/viralreverse name = "Viral aggressive metabolism" - desc = "The virus sacrifices its long term survivability to gain a near-instant spread when inside a host. \ - The virus will start at the lastest stage, but will eventually decay and die off by itself." + desc = "The virus sacrifices its long term survivability to nearly instantly fully spread inside a host. \ + The virus will start at the last stage, but will eventually decay and die off by itself." stealth = -2 resistance = 1 stage_speed = 3 diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm index 0df7e0f7d37..a5d87be9801 100644 --- a/code/datums/diseases/parrotpossession.dm +++ b/code/datums/diseases/parrotpossession.dm @@ -22,6 +22,6 @@ /datum/disease/parrot_possession/cure() if(parrot && parrot.loc == affected_mob) - parrot.loc = affected_mob.loc + parrot.forceMove(affected_mob.drop_location()) affected_mob.visible_message("[parrot] is violently driven out of [affected_mob]!", "[parrot] bursts out of your chest!") ..() \ No newline at end of file diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 66d81804b85..ae6e0835e71 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -112,6 +112,6 @@ STI KALY - blind return affected_mob.say("SCYAR NILA [uppertext(thearea.name)]!") - affected_mob.loc = pick(L) + affected_mob.forceMove(pick(L)) return diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 01fea665931..c764a3f7ccd 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -230,7 +230,9 @@ dna.features = newfeatures if(mrace) - set_species(mrace, icon_update=0) + var/datum/species/newrace = new mrace.type + newrace.copy_properties_from(mrace) + set_species(newrace, icon_update=0) if(newreal_name) real_name = newreal_name @@ -257,7 +259,7 @@ /mob/living/carbon/proc/create_dna() dna = new /datum/dna(src) if(!dna.species) - var/rando_race = pick(config.roundstart_races) + var/rando_race = pick(CONFIG_GET(keyed_flag_list/roundstart_races)) dna.species = new rando_race() //proc used to update the mob's appearance after its dna UI has been changed diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm index 5e381c0322e..9869b43d8f8 100644 --- a/code/datums/explosion.dm +++ b/code/datums/explosion.dm @@ -140,7 +140,7 @@ GLOBAL_LIST_EMPTY(explosions) var/list/exploded_this_tick = list() //open turfs that need to be blocked off while we sleep var/list/affected_turfs = GatherSpiralTurfs(max_range, epicenter) - var/reactionary = config.reactionary_explosions + var/reactionary = CONFIG_GET(flag/reactionary_explosions) var/list/cached_exp_block if(reactionary) diff --git a/code/datums/forced_movement.dm b/code/datums/forced_movement.dm index 73bc89748c7..e07e4c62ed9 100644 --- a/code/datums/forced_movement.dm +++ b/code/datums/forced_movement.dm @@ -84,7 +84,7 @@ /mob/Collide(atom/A) . = ..() - if(force_moving && force_moving.allow_climbing && istype(A, /obj/structure)) + if(force_moving && force_moving.allow_climbing && isstructure(A)) var/obj/structure/S = A if(S.climbable) S.do_climb(src) diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index af53f681059..7768a929daf 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -62,6 +62,14 @@ qdel(holder) return +/datum/construction/proc/spawn_mecha_result() + if(result) + var/obj/mecha/m = new result(get_turf(holder)) + var/obj/item/oldcell = locate (/obj/item/stock_parts/cell) in m + QDEL_NULL(oldcell) + m.CheckParts(holder.contents) + QDEL_NULL(holder) + /datum/construction/proc/set_desc(index as num) var/list/step = steps[index] holder.desc = step["desc"] diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index f3a2e61722f..dfaa6c752a6 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -2,25 +2,10 @@ var/originmastercommit var/commit var/list/testmerge = list() - var/has_pr_details = FALSE //tgs2 support var/date /datum/getrev/New() - if(world.RunningService()) - var/file_name - if(ServiceVersion()) //will return null for versions < 3.0.91.0 - file_name = SERVICE_PR_TEST_JSON - else - file_name = SERVICE_PR_TEST_JSON_OLD - if(fexists(file_name)) - testmerge = json_decode(file2text(file_name)) -#ifdef SERVERTOOLS - else if(!world.RunningService() && fexists("../prtestjob.lk")) //tgs2 support - var/list/tmp = world.file2list("..\\prtestjob.lk") - for(var/I in tmp) - if(I) - testmerge |= I -#endif + testmerge = SERVER_TOOLS_PR_LIST log_world("Running /tg/ revision:") var/list/logs = world.file2list(".git/logs/HEAD") if(logs) @@ -36,58 +21,23 @@ log_world(commit) for(var/line in testmerge) if(line) - if(world.RunningService()) - var/tmcommit = testmerge[line]["commit"] - log_world("Test merge active of PR #[line] commit [tmcommit]") - SSblackbox.add_details("testmerged_prs","[line]|[tmcommit]") - else //tgs2 support - log_world("Test merge active of PR #[line]") - SSblackbox.add_details("testmerged_prs","[line]") + var/tmcommit = testmerge[line]["commit"] + log_world("Test merge active of PR #[line] commit [tmcommit]") + SSblackbox.add_details("testmerged_prs","[line]|[tmcommit]") log_world("Based off origin/master commit [originmastercommit]") else log_world(originmastercommit) -/datum/getrev/proc/DownloadPRDetails() - if(!config.githubrepoid) - if(testmerge.len) - log_world("PR details download failed: No github repo config set") - return - if(!isnum(text2num(config.githubrepoid))) - log_world("PR details download failed: Invalid github repo id: [config.githubrepoid]") - return - for(var/line in testmerge) - if(!isnum(text2num(line))) - log_world("PR details download failed: Invalid PR number: [line]") - return - - var/url = "https://api.github.com/repositories/[config.githubrepoid]/pulls/[line].json" - GLOB.valid_HTTPSGet = TRUE - var/json = HTTPSGet(url) - if(!json) - return - - testmerge[line] = json_decode(json) - - if(!testmerge[line]) - log_world("PR details download failed: null details returned") - return - CHECK_TICK - log_world("PR details successfully downloaded") - has_pr_details = TRUE /datum/getrev/proc/GetTestMergeInfo(header = TRUE) if(!testmerge.len) return "" . = header ? "The following pull requests are currently test merged:
" : "" for(var/line in testmerge) - var/details - if(world.RunningService()) - var/cm = testmerge[line]["commit"] - details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 7))) - else if(has_pr_details) //tgs2 support - details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["user"]["login"]) + var/cm = testmerge[line]["commit"] + var/details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 7))) if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder)) continue - . += "#[line][details]
" + . += "#[line][details]
" /client/verb/showrevinfo() set category = "OOC" @@ -101,44 +51,47 @@ to_chat(src, GLOB.revdata.GetTestMergeInfo()) prefix = "Based off origin/master commit: " var/pc = GLOB.revdata.originmastercommit - to_chat(src, "[prefix][copytext(pc, 1, min(length(pc), 7))]") + to_chat(src, "[prefix][copytext(pc, 1, min(length(pc), 7))]") else to_chat(src, "Revision unknown") to_chat(src, "Current Informational Settings:") - to_chat(src, "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]") - to_chat(src, "Protect Assistant Role From Traitor: [config.protect_assistant_from_antagonist]") - to_chat(src, "Enforce Human Authority: [config.enforce_human_authority]") - to_chat(src, "Allow Latejoin Antagonists: [config.allow_latejoin_antagonists]") - to_chat(src, "Enforce Continuous Rounds: [config.continuous.len] of [config.modes.len] roundtypes") - to_chat(src, "Allow Midround Antagonists: [config.midround_antag.len] of [config.modes.len] roundtypes") - if(config.show_game_type_odds) + to_chat(src, "Protect Authority Roles From Traitor: [CONFIG_GET(flag/protect_roles_from_antagonist)]") + to_chat(src, "Protect Assistant Role From Traitor: [CONFIG_GET(flag/protect_assistant_from_antagonist)]") + to_chat(src, "Enforce Human Authority: [CONFIG_GET(flag/enforce_human_authority)]") + to_chat(src, "Allow Latejoin Antagonists: [CONFIG_GET(flag/allow_latejoin_antagonists)]") + to_chat(src, "Enforce Continuous Rounds: [length(CONFIG_GET(keyed_flag_list/continuous))] of [config.modes.len] roundtypes") + to_chat(src, "Allow Midround Antagonists: [length(CONFIG_GET(keyed_flag_list/midround_antag))] of [config.modes.len] roundtypes") + if(CONFIG_GET(flag/show_game_type_odds)) + var/list/probabilities = CONFIG_GET(keyed_number_list/probability) if(SSticker.IsRoundInProgress()) var/prob_sum = 0 var/current_odds_differ = FALSE var/list/probs = list() var/list/modes = config.gamemode_cache + var/list/min_pop = CONFIG_GET(keyed_number_list/min_pop) + var/list/max_pop = CONFIG_GET(keyed_number_list/max_pop) for(var/mode in modes) var/datum/game_mode/M = mode var/ctag = initial(M.config_tag) - if(!(ctag in config.probabilities)) + if(!(ctag in probabilities)) continue - if((config.min_pop[ctag] && (config.min_pop[ctag] > SSticker.totalPlayersReady)) || (config.max_pop[ctag] && (config.max_pop[ctag] < SSticker.totalPlayersReady)) || (initial(M.required_players) > SSticker.totalPlayersReady)) + if((min_pop[ctag] && (min_pop[ctag] > SSticker.totalPlayersReady)) || (max_pop[ctag] && (max_pop[ctag] < SSticker.totalPlayersReady)) || (initial(M.required_players) > SSticker.totalPlayersReady)) current_odds_differ = TRUE continue probs[ctag] = 1 - prob_sum += config.probabilities[ctag] + prob_sum += probabilities[ctag] if(current_odds_differ) to_chat(src, "Game Mode Odds for current round:") for(var/ctag in probs) - if(config.probabilities[ctag] > 0) - var/percentage = round(config.probabilities[ctag] / prob_sum * 100, 0.1) + if(probabilities[ctag] > 0) + var/percentage = round(probabilities[ctag] / prob_sum * 100, 0.1) to_chat(src, "[ctag] [percentage]%") to_chat(src, "All Game Mode Odds:") var/sum = 0 - for(var/ctag in config.probabilities) - sum += config.probabilities[ctag] - for(var/ctag in config.probabilities) - if(config.probabilities[ctag] > 0) - var/percentage = round(config.probabilities[ctag] / sum * 100, 0.1) + for(var/ctag in probabilities) + sum += probabilities[ctag] + for(var/ctag in probabilities) + if(probabilities[ctag] > 0) + var/percentage = round(probabilities[ctag] / sum * 100, 0.1) to_chat(src, "[ctag] [percentage]%") diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 1ff83aeac84..e7408730521 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -11,11 +11,13 @@ var/minetype = "lavaland" + //Order matters here. var/list/transition_config = list(CENTCOM = SELFLOOPING, MAIN_STATION = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED, MINING = SELFLOOPING, + CITY_OF_COGS = SELFLOOPING, EMPTY_AREA_3 = CROSSLINKED, EMPTY_AREA_4 = CROSSLINKED, EMPTY_AREA_5 = CROSSLINKED, @@ -28,6 +30,7 @@ var/config_min_users = 0 var/voteweight = 1 var/allow_custom_shuttles = "yes" + /datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after) if(default_to_box) return @@ -119,6 +122,8 @@ return MAIN_STATION if("CENTCOM") return CENTCOM + if("CITY_OF_COGS") + return CITY_OF_COGS if("MINING") return MINING if("EMPTY_AREA_1") diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 6ce082bd2ad..84f0f00e45b 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -11,7 +11,7 @@ /datum/action/neck_chop/Trigger() if(owner.incapacitated()) - to_chat(owner, "You can't use Krav Maga while you're incapacitated.") + to_chat(owner, "You can't use [name] while you're incapacitated.") return var/mob/living/carbon/human/H = owner if (H.mind.martial_art.streak == "neck_chop") @@ -28,7 +28,7 @@ /datum/action/leg_sweep/Trigger() if(owner.incapacitated()) - to_chat(owner, "You can't use Krav Maga while you're incapacitated.") + to_chat(owner, "You can't use [name] while you're incapacitated.") return var/mob/living/carbon/human/H = owner if (H.mind.martial_art.streak == "leg_sweep") @@ -45,7 +45,7 @@ /datum/action/lung_punch/Trigger() if(owner.incapacitated()) - to_chat(owner, "You can't use Krav Maga while you're incapacitated.") + to_chat(owner, "You can't use [name] while you're incapacitated.") return var/mob/living/carbon/human/H = owner if (H.mind.martial_art.streak == "quick_choke") @@ -57,14 +57,14 @@ /datum/martial_art/krav_maga/teach(mob/living/carbon/human/H,make_temporary=0) if(..()) - to_chat(H, "You know the arts of Krav Maga!") + to_chat(H, "You know the arts of [name]!") to_chat(H, "Place your cursor over a move at the top of the screen to see what it does.") neckchop.Grant(H) legsweep.Grant(H) lungpunch.Grant(H) /datum/martial_art/krav_maga/on_remove(mob/living/carbon/human/H) - to_chat(H, "You suddenly forget the arts of Krav Maga...") + to_chat(H, "You suddenly forget the arts of [name]...") neckchop.Remove(H) legsweep.Remove(H) lungpunch.Remove(H) @@ -140,7 +140,7 @@ playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1) D.visible_message("[A] [picked_hit_type] [D]!", \ "[A] [picked_hit_type] you!") - add_logs(A, D, "[picked_hit_type] with Krav Maga") + add_logs(A, D, "[picked_hit_type] with [name]") return 1 /datum/martial_art/krav_maga/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index e8724eb7175..66cc3c8781a 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -63,6 +63,7 @@ var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems) var/datum/language_holder/language_holder + var/unconvertable = FALSE /datum/mind/New(var/key) src.key = key @@ -206,7 +207,7 @@ /datum/mind/proc/remove_wizard() if(src in SSticker.mode.wizards) SSticker.mode.wizards -= src - current.spellremove(current) + RemoveAllSpells() special_role = null remove_antag_equip() @@ -590,8 +591,6 @@ if(src in SSticker.mode.abductors) text += "Abductor | human" text += " | undress | equip" - else - text += "abductor | human" if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -674,7 +673,7 @@ text = "[text]: " if(is_servant_of_ratvar(current)) text += "not mindshielded | employee | SERVANT" - text += "
Give slab" + text += "
Equip" else if(is_eligible_servant(current)) text += "not mindshielded | EMPLOYEE | servant" else @@ -1031,9 +1030,9 @@ log_admin("[key_name(usr)] has made [current] into a servant of Ratvar.") if("slab") if(!SSticker.mode.equip_servant(current)) - to_chat(usr, "Failed to outfit [current] with a slab!") + to_chat(usr, "Failed to outfit [current]!") else - to_chat(usr, "Successfully gave [current] a clockwork slab!") + to_chat(usr, "Successfully gave [current] servant equipment!") else if (href_list["wizard"]) switch(href_list["wizard"]) @@ -1052,7 +1051,7 @@ log_admin("[key_name(usr)] has wizard'ed [current].") SSticker.mode.update_wiz_icons_added(src) if("lair") - current.loc = pick(GLOB.wizardstart) + current.forceMove(pick(GLOB.wizardstart)) if("dressup") SSticker.mode.equip_wizard(current) if("name") @@ -1114,7 +1113,7 @@ message_admins("[key_name_admin(usr)] has nuke op'ed [current].") log_admin("[key_name(usr)] has nuke op'ed [current].") if("lair") - current.loc = get_turf(locate("landmark*Syndicate-Spawn")) + current.forceMove(pick(GLOB.nukeop_start)) if("dressup") var/mob/living/carbon/human/H = current qdel(H.belt) @@ -1238,13 +1237,6 @@ if("clear") to_chat(usr, "Not implemented yet. Sorry!") //SSticker.mode.update_abductor_icons_removed(src) - if("abductor") - if(!ishuman(current)) - to_chat(usr, "This only works on humans!") - return - make_Abductor() - log_admin("[key_name(usr)] turned [current] into abductor.") - SSticker.mode.update_abductor_icons_added(src) if("equip") if(!ishuman(current)) to_chat(usr, "This only works on humans!") @@ -1273,7 +1265,6 @@ src = null M = H.monkeyize() src = M.mind - //to_chat(world, "DEBUG: \"healthy\": M=[M], M.mind=[M.mind], src=[src]!") else if (istype(M) && length(M.viruses)) for(var/thing in M.viruses) var/datum/disease/D = thing @@ -1396,7 +1387,7 @@ current.faction |= "syndicate" if(spawnloc) - current.loc = spawnloc + current.forceMove(spawnloc) if(ishuman(current)) var/mob/living/carbon/human/H = current @@ -1446,7 +1437,7 @@ SSjob.SendToLateJoin(current) to_chat(current, "HOT INSERTION, GO GO GO") else - current.loc = pick(GLOB.wizardstart) + current.forceMove(pick(GLOB.wizardstart)) SSticker.mode.equip_wizard(current) SSticker.mode.name_wizard(current) @@ -1492,52 +1483,6 @@ var/fail = 0 fail |= !SSticker.mode.equip_revolutionary(current) - -/datum/mind/proc/make_Abductor() - var/role = alert("Abductor Role ?","Role","Agent","Scientist") - var/team = input("Abductor Team ?","Team ?") in list(1,2,3,4) - var/teleport = alert("Teleport to ship ?","Teleport","Yes","No") - - if(!role || !team || !teleport) - return - - if(!ishuman(current)) - return - - SSticker.mode.abductors |= src - - var/datum/objective/experiment/O = new - O.owner = src - objectives += O - - var/mob/living/carbon/human/H = current - - H.set_species(/datum/species/abductor) - var/datum/species/abductor/S = H.dna.species - - if(role == "Scientist") - S.scientist = TRUE - S.team = team - - var/list/obj/effect/landmark/abductor/agent_landmarks = new - var/list/obj/effect/landmark/abductor/scientist_landmarks = new - agent_landmarks.len = 4 - scientist_landmarks.len = 4 - for(var/obj/effect/landmark/abductor/A in GLOB.landmarks_list) - if(istype(A, /obj/effect/landmark/abductor/agent)) - agent_landmarks[text2num(A.team)] = A - else if(istype(A, /obj/effect/landmark/abductor/scientist)) - scientist_landmarks[text2num(A.team)] = A - - var/obj/effect/landmark/L - if(teleport=="Yes") - switch(role) - if("Agent") - L = agent_landmarks[team] - if("Scientist") - L = scientist_landmarks[team] - H.forceMove(L.loc) - /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S) spell_list += S S.action.Grant(current) @@ -1555,6 +1500,10 @@ spell_list -= S qdel(S) +/datum/mind/proc/RemoveAllSpells() + for(var/obj/effect/proc_holder/S in spell_list) + RemoveSpell(S) + /datum/mind/proc/transfer_martial_arts(mob/living/new_character) if(!ishuman(new_character)) return diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 8d4413171d1..3c3ab905eac 100755 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -102,10 +102,10 @@ if(implants) for(var/implant_type in implants) var/obj/item/implant/I = new implant_type(H) - I.implant(H, null, silent=TRUE) + I.implant(H, null, TRUE) H.update_body() - return 1 + return TRUE /datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/H) if(!istype(H)) diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index e3e8d0e366f..f9883cfe50a 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -29,7 +29,6 @@ bar.pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1)) /datum/progressbar/proc/update(progress) - //to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]") if (!user || !user.client) shown = 0 return diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 69749475cd0..20d218f7677 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -71,7 +71,7 @@ /datum/status_effect/vanguard_shield/on_apply() owner.log_message("gained Vanguard stun immunity", INDIVIDUAL_ATTACK_LOG) - owner.add_stun_absorption("vanguard", 200, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!") + owner.add_stun_absorption("vanguard", INFINITY, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!") owner.visible_message("[owner] begins to faintly glow!", "You will absorb all stuns for the next twenty seconds.") owner.SetStun(0, FALSE) owner.SetKnockdown(0) @@ -87,7 +87,8 @@ var/vanguard = owner.stun_absorption["vanguard"] var/stuns_blocked = 0 if(vanguard) - stuns_blocked = round(min(vanguard["stuns_absorbed"] * 0.25, 20)) + stuns_blocked = Floor(min(vanguard["stuns_absorbed"] * 0.25, 400)) + vanguard["end_time"] = 0 //so it doesn't absorb the stuns we're about to apply if(owner.stat != DEAD) var/message_to_owner = "You feel your Vanguard quietly fade..." var/otheractiveabsorptions = FALSE @@ -95,7 +96,6 @@ if(owner.stun_absorption[i]["end_time"] > world.time && owner.stun_absorption[i]["priority"] > vanguard["priority"]) otheractiveabsorptions = TRUE if(!GLOB.ratvar_awakens && stuns_blocked && !otheractiveabsorptions) - vanguard["end_time"] = 0 //so it doesn't absorb the stuns we're about to apply owner.Knockdown(stuns_blocked) message_to_owner = "The weight of the Vanguard's protection crashes down upon you!" if(stuns_blocked >= 300) @@ -384,3 +384,31 @@ if(islist(owner.stun_absorption) && owner.stun_absorption["blooddrunk"]) owner.stun_absorption -= "blooddrunk" +/datum/status_effect/sword_spin + id = "Bastard Sword Spin" + duration = 50 + tick_interval = 8 + alert_type = null + + +/datum/status_effect/sword_spin/on_apply() + owner.visible_message("[owner] begins swinging the sword with inhuman strength!") + var/oldcolor = owner.color + owner.color = "#ff0000" + owner.add_stun_absorption("bloody bastard sword", duration, 2, "doesn't even flinch as the sword's power courses through them!", "You shrug off the stun!", " glowing with a blazing red aura!") + owner.spin(duration,1) + animate(owner, color = oldcolor, time = duration, easing = EASE_IN) + addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration) + playsound(owner, 'sound/weapons/fwoosh.wav', 75, 0) + return ..() + + +/datum/status_effect/sword_spin/tick() + playsound(owner, 'sound/weapons/fwoosh.wav', 75, 0) + var/obj/item/slashy + slashy = owner.get_active_held_item() + for(var/mob/living/M in orange(1,owner)) + slashy.attack(M, owner) + +/datum/status_effect/sword_spin/on_remove() + owner.visible_message("[owner]'s inhuman strength dissipates and the sword's runes grow cold!") diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 9ca564cd2de..a2d799752ca 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -29,11 +29,20 @@ /datum/status_effect/incapacitating/knockdown id = "knockdown" +/datum/status_effect/incapacitating/knockdown/tick() + if(owner.staminaloss) + owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds + + //UNCONSCIOUS /datum/status_effect/incapacitating/unconscious id = "unconscious" needs_update_stat = TRUE +/datum/status_effect/incapacitating/unconscious/tick() + if(owner.staminaloss) + owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds + //SLEEPING /datum/status_effect/incapacitating/sleeping id = "sleeping" @@ -57,7 +66,7 @@ /datum/status_effect/incapacitating/sleeping/tick() if(owner.staminaloss) - owner.adjustStaminaLoss(-0.35) //reduce stamina loss by 0.35 per tick, 7 per 2 seconds + owner.adjustStaminaLoss(-0.5) //reduce stamina loss by 0.5 per tick, 10 per 2 seconds if(human_owner && human_owner.drunkenness) human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds if(prob(20)) @@ -139,21 +148,6 @@ if(owner.m_intent == MOVE_INTENT_WALK) owner.toggle_move_intent() -/datum/status_effect/geis_tracker - id = "geis_tracker" - duration = -1 - alert_type = null - var/obj/structure/destructible/clockwork/geis_binding/binding - -/datum/status_effect/geis_tracker/on_creation(mob/living/new_owner, obj/structure/destructible/clockwork/geis_binding/new_binding) - . = ..() - if(.) - binding = new_binding - -/datum/status_effect/geis_tracker/tick() - if(QDELETED(binding)) - qdel(src) - /datum/status_effect/maniamotor id = "maniamotor" duration = -1 @@ -191,7 +185,7 @@ return if(!motor.active) //it being off makes it fall off much faster if(!is_servant && !warned_turnoff) - if(motor.total_accessable_power() > motor.mania_cost) + if(can_access_clockwork_power(motor, motor.mania_cost)) to_chat(owner, "\"[text2ratvar(pick(turnoff_messages))]\"") else var/pickedmessage = pick(powerloss_messages) @@ -452,3 +446,40 @@ /obj/effect/temp_visual/curse/Initialize() . = ..() deltimer(timerid) + + +//Kindle: Used by servants of Ratvar. 10-second knockdown, reduced by 1 second per 5 damage taken while the effect is active. +/datum/status_effect/kindle + id = "kindle" + status_type = STATUS_EFFECT_UNIQUE + tick_interval = 5 + duration = 100 + alert_type = /obj/screen/alert/status_effect/kindle + var/old_health + +/datum/status_effect/kindle/tick() + owner.Knockdown(15) + if(iscarbon(owner)) + var/mob/living/carbon/C = owner + C.silent = max(2, C.silent) + C.stuttering = max(5, C.stuttering) + if(!old_health) + old_health = owner.health + var/health_difference = old_health - owner.health + if(!health_difference) + return + owner.visible_message("The light in [owner]'s eyes dims as they're harmed!", \ + "The dazzling lights dim as you're harmed!") + health_difference *= 2 //so 10 health difference translates to 20 deciseconds of stun reduction + duration -= health_difference + old_health = owner.health + +/datum/status_effect/kindle/on_remove() + owner.visible_message("The light in [owner]'s eyes fades!", \ + "You snap out of your daze!") + +/obj/screen/alert/status_effect/kindle + name = "Dazzling Lights" + desc = "Blinding light dances in your vision, stunning and silencing you. Any damage taken will shorten the light's effects!" + icon_state = "kindle" + alerttooltipstyle = "clockcult" diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index 2c2212fde56..a1dc9ece69e 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -27,7 +27,7 @@ probability = 90 /datum/weather/ash_storm/proc/is_ash_immune(mob/living/L) - if(istype(L.loc, /obj/mecha)) //Mechs are immune + if(ismecha(L.loc)) //Mechs are immune return TRUE if(ishuman(L)) //Are you immune? var/mob/living/carbon/human/H = L diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index cb2b9b1ea56..ae938f18cef 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -144,7 +144,7 @@ /datum/wires/proc/attach_assembly(color, obj/item/device/assembly/S) if(S && istype(S) && S.attachable && !is_attached(color)) assemblies[color] = S - S.loc = holder + S.forceMove(holder) S.connected = src return S @@ -153,7 +153,7 @@ if(S && istype(S)) assemblies -= color S.connected = null - S.loc = holder.loc + S.forceMove(holder.drop_location()) return S /datum/wires/proc/emp_pulse() diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 4846cc2bc2b..c4b5c5caaec 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -151,7 +151,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/department/medical name = "Medbay Maintenance" - icon_state = "asmaint" + icon_state = "medbay_maint" + +/area/maintenance/department/medical/morgue + name = "Morgue Maintenance" + icon_state = "morgue_maint" /area/maintenance/department/science name = "Science Maintenance" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index d6f15b25e8d..b634ecbaa33 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -119,7 +119,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) else if(dynamic_lighting != DYNAMIC_LIGHTING_IFSTARLIGHT) dynamic_lighting = DYNAMIC_LIGHTING_DISABLED if(dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT) - dynamic_lighting = config.starlight ? DYNAMIC_LIGHTING_ENABLED : DYNAMIC_LIGHTING_DISABLED + dynamic_lighting = CONFIG_GET(flag/starlight) ? DYNAMIC_LIGHTING_ENABLED : DYNAMIC_LIGHTING_DISABLED . = ..() diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index e3f4a5d984d..b2587e48c3c 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -143,3 +143,18 @@ /area/ctf/flag_room2 name = "Flag Room B" + +// REEBE + +/area/reebe + name = "Reebe" + icon_state = "yellow" + requires_power = FALSE + has_gravity = TRUE + noteleport = TRUE + hidden = TRUE + +/area/reebe/city_of_cogs + name = "City of Cogs" + icon_state = "purple" + hidden = FALSE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 0a9a7918e95..ee0924cdd64 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -189,6 +189,7 @@ /atom/proc/CollidedWith(atom/movable/AM) + set waitfor = FALSE return // Convenience proc to see if a container is open for chemistry handling @@ -455,7 +456,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) cur_y = y_arr.Find(src.z) if(cur_y) break -// to_chat(world, "X = [cur_x]; Y = [cur_y]") if(cur_x && cur_y) return list("x"=cur_x,"y"=cur_y) else @@ -639,3 +639,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/Entered(atom/movable/AM, atom/oldLoc) SendSignal(COMSIG_ATOM_ENTERED, AM, oldLoc) + +/atom/proc/return_temperature() + return diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 70bbb44a77a..9227fdcbb81 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -226,6 +226,17 @@ A.CollidedWith(src) /atom/movable/proc/forceMove(atom/destination) + . = FALSE + if(destination) + . = doMove(destination) + else + CRASH("No valid destination passed into forceMove") + +/atom/movable/proc/moveToNullspace() + return doMove(null) + +/atom/movable/proc/doMove(atom/destination) + . = FALSE if(destination) if(pulledby) pulledby.stop_pulling() @@ -252,8 +263,17 @@ AM.Crossed(src, oldloc) Moved(oldloc, 0) - return 1 - return 0 + . = TRUE + + //If no destination, move the atom into nullspace (don't do this unless you know what you're doing) + else + . = TRUE + var/atom/oldloc = loc + var/area/old_area = get_area(oldloc) + oldloc.Exited(src, null) + if(old_area) + old_area.Exited(src, null) + loc = null /mob/living/forceMove(atom/destination) stop_pulling() @@ -262,9 +282,10 @@ if(has_buckled_mobs()) unbuckle_all_mobs(force=1) . = ..() - if(client) - reset_perspective(destination) - update_canmove() //if the mob was asleep inside a container and then got forceMoved out we need to make them fall. + if(.) + if(client) + reset_perspective(destination) + update_canmove() //if the mob was asleep inside a container and then got forceMoved out we need to make them fall. /mob/living/brain/forceMove(atom/destination) if(container) @@ -318,7 +339,8 @@ step(src, AM.dir) ..() -/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback) +/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback) //If this returns FALSE then callback will not be called. + . = FALSE if (!target || (flags_1 & NODROP_1) || speed <= 0) return @@ -347,7 +369,9 @@ //then lets add it to speed speed += user_momentum if (speed <= 0) - return //no throw speed, the user was moving too fast. + return//no throw speed, the user was moving too fast. + + . = TRUE // No failure conditions past this point. var/datum/thrownthing/TT = new() TT.thrownthing = src diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 9b585ea6532..3b5b8625597 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -203,9 +203,9 @@ var/mob/living/silicon/robot/R switch(borg_to_spawn) if("Medical") - R = new /mob/living/silicon/robot/syndicate/medical(T) + R = new /mob/living/silicon/robot/modules/syndicate/medical(T) else - R = new /mob/living/silicon/robot/syndicate(T) //Assault borg by default + R = new /mob/living/silicon/robot/modules/syndicate(T) //Assault borg by default var/brainfirstname = pick(GLOB.first_names_male) if(prob(50)) @@ -261,7 +261,7 @@ /obj/item/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "") - var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) + var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) var/mob/living/simple_animal/slaughter/S = new demon_type(holder) S.holder = holder S.key = C.key diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 242c02f3a21..a5c5b1d8969 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(blobs_legit) //used for win-score calculations, contains only var/mob/camera/blob/B = blob.current.become_overmind(TRUE, round(blob_base_starting_points/blob_overminds.len)) B.mind.name = B.name var/turf/T = pick(GLOB.blobstart) - B.loc = T + B.forceMove(T) B.base_point_rate = blob_point_rate SSshuttle.registerHostileEnvironment(src) diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index b1cea567a1a..6d97fb52f93 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -7,7 +7,7 @@ if(B.blob_core || !B.placed) return 0 if(!GLOB.blob_cores.len) //blob is dead - if(config.continuous["blob"]) + if(CONFIG_GET(keyed_flag_list/continuous)["blob"]) message_sent = FALSE //disable the win count at this point continuous_sanity_checked = 1 //Nonstandard definition of "alive" gets past the check otherwise SSshuttle.clearHostileEnvironment(src) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index b6d31b1d5b1..5801da1e603 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -85,7 +85,7 @@ src.grille += 1 else if(istype(O, /obj/machinery/door)) src.door += 1 - else if(istype(O, /obj/machinery)) + else if(ismachinery(O)) src.mach += 1 if(count_territories) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index e22b2747e0e..9f8a44bed2e 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -57,7 +57,7 @@ if(!placed) if(manualplace_min_time && world.time >= manualplace_min_time) to_chat(src, "You may now place your blob core.") - to_chat(src, "You will automatically place your blob core in [round((autoplace_max_time - world.time)/600, 0.5)] minutes.") + to_chat(src, "You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].") manualplace_min_time = 0 if(autoplace_max_time && world.time >= autoplace_max_time) place_blob_core(base_point_rate, 1) diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 6baf8b4dbec..865a58fd819 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -59,7 +59,7 @@ set name = "Jump to Core" set desc = "Move your camera to your core." if(blob_core) - src.loc = blob_core.loc + forceMove(blob_core.drop_location()) /mob/camera/blob/verb/jump_to_node() set category = "Blob" @@ -365,5 +365,5 @@ to_chat(src, "Shortcuts: Click = Expand Blob | Middle Mouse Click = Rally Spores | Ctrl Click = Create Shield Blob | Alt Click = Remove Blob") to_chat(src, "Attempting to talk will send a message to all other overminds, allowing you to coordinate with them.") if(!placed && autoplace_max_time <= world.time) - to_chat(src, "You will automatically place your blob core in [round((autoplace_max_time - world.time)/600, 0.5)] minutes.") + to_chat(src, "You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].") to_chat(src, "You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.") diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 6ad12a76fc4..da457a12eb9 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -190,7 +190,7 @@ B.density = TRUE if(T.Enter(B,src)) //NOW we can attempt to move into the tile B.density = initial(B.density) - B.loc = T + B.forceMove(T) B.update_icon() if(B.overmind && expand_reaction) B.overmind.blob_reagent_datum.expand_reaction(src, B, T, controller) diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm index ccb6b774b3f..0dd3d6be0f7 100644 --- a/code/game/gamemodes/brother/traitor_bro.dm +++ b/code/game/gamemodes/brother/traitor_bro.dm @@ -17,7 +17,7 @@ /datum/objective_team/brother_team/proc/forge_brother_objectives() objectives = list() var/is_hijacker = prob(10) - for(var/i = 1 to max(1, config.brother_objectives_amount + (members.len > 2) - is_hijacker)) + for(var/i = 1 to max(1, CONFIG_GET(number/brother_objectives_amount) + (members.len > 2) - is_hijacker)) forge_single_objective() if(is_hijacker) if(!locate(/datum/objective/hijack) in objectives) @@ -58,16 +58,17 @@ var/meeting_areas = list("The Bar", "Dorms", "Escape Dock", "Arrivals", "Holodeck", "Primary Tool Storage", "Recreation Area", "Chapel", "Library") /datum/game_mode/traitor/bros/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" var/list/datum/mind/possible_brothers = get_players_for_role(ROLE_BROTHER) var/num_teams = team_amount - if(config.brother_scaling_coeff) - num_teams = max(1, round(num_players()/config.brother_scaling_coeff)) + var/bsc = CONFIG_GET(number/brother_scaling_coeff) + if(bsc) + num_teams = max(1, round(num_players() / bsc)) for(var/j = 1 to num_teams) if(possible_brothers.len < min_team_size || antag_candidates.len <= required_enemies) @@ -80,7 +81,7 @@ antag_candidates -= bro team.members += bro bro.restricted_roles = restricted_jobs - log_game("[key_name(bro)] has been selected as a Brother") + log_game("[bro.key] (ckey) has been selected as a Brother") pre_brother_teams += team return ..() @@ -95,6 +96,9 @@ brother_teams += pre_brother_teams return ..() +/datum/game_mode/traitor/bros/generate_report() + return "It's Syndicate recruiting season. Be alert for potential Syndicate infiltrators, but also watch out for disgruntled employees trying to defect. Unlike Nanotrasen, the Syndicate prides itself in teamwork and will only recruit pairs that share a brotherly trust." + /datum/game_mode/proc/auto_declare_completion_brother() if(!LAZYLEN(brother_teams)) return diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 259c3d491f5..4f68fec7b3a 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -52,16 +52,17 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w /datum/game_mode/changeling/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" var/num_changelings = 1 - if(config.changeling_scaling_coeff) - num_changelings = max(1, min( round(num_players()/(config.changeling_scaling_coeff*2))+2, round(num_players()/config.changeling_scaling_coeff) )) + var/csc = CONFIG_GET(number/changeling_scaling_coeff) + if(csc) + num_changelings = max(1, min(round(num_players() / (csc * 2)) + 2, round(num_players() / csc))) else num_changelings = max(1, min(num_players(), changeling_amount)) @@ -103,10 +104,11 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w ..() /datum/game_mode/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners - var/changelingcap = min( round(GLOB.joined_player_list.len/(config.changeling_scaling_coeff*2))+2, round(GLOB.joined_player_list.len/config.changeling_scaling_coeff) ) + var/csc = CONFIG_GET(number/changeling_scaling_coeff) + var/changelingcap = min(round(GLOB.joined_player_list.len / (csc * 2)) + 2, round(GLOB.joined_player_list.len / csc)) if(SSticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists return - if(SSticker.mode.changelings.len <= (changelingcap - 2) || prob(100 - (config.changeling_scaling_coeff*2))) + if(SSticker.mode.changelings.len <= (changelingcap - 2) || prob(100 - (csc * 2))) if(ROLE_CHANGELING in character.client.prefs.be_special) if(!jobban_isbanned(character, ROLE_CHANGELING) && !jobban_isbanned(character, "Syndicate")) if(age_check(character.client)) @@ -132,10 +134,16 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w changeling.objectives += absorb_objective if(prob(60)) - var/datum/objective/steal/steal_objective = new - steal_objective.owner = changeling - steal_objective.find_target() - changeling.objectives += steal_objective + if(prob(85)) + var/datum/objective/steal/steal_objective = new + steal_objective.owner = changeling + steal_objective.find_target() + changeling.objectives += steal_objective + else + var/datum/objective/download/download_objective = new + download_objective.owner = changeling + download_objective.gen_amount_goal() + changeling.objectives += download_objective var/list/active_ais = active_ais() if(active_ais.len && prob(100/GLOB.joined_player_list.len)) diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index 94d83e25207..e7f23bc07bc 100644 --- a/code/game/gamemodes/changeling/powers/headcrab.dm +++ b/code/game/gamemodes/changeling/powers/headcrab.dm @@ -30,7 +30,7 @@ sleep(5) // So it's not killed in explosion var/mob/living/simple_animal/hostile/headcrab/crab = new(turf) for(var/obj/item/organ/I in organs) - I.loc = crab + I.forceMove(crab) crab.origin = M if(crab.origin) crab.origin.active = 1 diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index ca2fd6f03e9..1732e98630d 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -77,10 +77,10 @@ return ..() -/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/target) +/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/living/carbon/target) if(!..()) return - if((target.disabilities & HUSK) || !target.has_dna()) + if((target.disabilities & HUSK) || !iscarbon(target) || (NOTRANSSTING in target.dna.species.species_traits)) to_chat(user, "Our sting appears ineffective against its DNA.") return 0 return 1 diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 883430ae84c..df85a11bab7 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -25,18 +25,19 @@ return 1 /datum/game_mode/traitor/changeling/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" var/list/datum/mind/possible_changelings = get_players_for_role(ROLE_CHANGELING) var/num_changelings = 1 - if(config.changeling_scaling_coeff) - num_changelings = max(1, min( round(num_players()/(config.changeling_scaling_coeff*4))+2, round(num_players()/(config.changeling_scaling_coeff*2)) )) + var/csc = CONFIG_GET(number/changeling_scaling_coeff) + if(csc) + num_changelings = max(1, min(round(num_players() / (csc * 4)) + 2, round(num_players() / (csc * 2)))) else num_changelings = max(1, min(num_players(), changeling_amount/2)) @@ -65,11 +66,12 @@ return /datum/game_mode/traitor/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners - var/changelingcap = min( round(GLOB.joined_player_list.len/(config.changeling_scaling_coeff*4))+2, round(GLOB.joined_player_list.len/(config.changeling_scaling_coeff*2)) ) + var/csc = CONFIG_GET(number/changeling_scaling_coeff) + var/changelingcap = min( round(GLOB.joined_player_list.len / (csc * 4)) + 2, round(GLOB.joined_player_list.len / (csc * 2))) if(SSticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists ..() return - if(SSticker.mode.changelings.len <= (changelingcap - 2) || prob(100 / (config.changeling_scaling_coeff * 4))) + if(SSticker.mode.changelings.len <= (changelingcap - 2) || prob(100 / (csc * 4))) if(ROLE_CHANGELING in character.client.prefs.be_special) if(!jobban_isbanned(character, ROLE_CHANGELING) && !jobban_isbanned(character, "Syndicate")) if(age_check(character.client)) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 0fb720f9d6a..261a2581019 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -8,12 +8,9 @@ Imprisoned within a massive construct known as the Celestial Derelict - or Reebe Ratvar, unable to act in the mortal plane, seeks to return and forms covenants with mortals in order to bolster his influence. Due to his mechanical nature, Ratvar is also capable of influencing silicon-based lifeforms, unlike Nar-Sie, who can only influence natural life. -This is a team-based gamemode, and the team's objective is shared by all cultists. It can include summoning Ratvar, escaping on the shuttle, or converting the AI and its cyborgs. +This is a team-based gamemode, and the team's objective is shared by all cultists. Their goal is to defend an object called the Ark on a separate z-level. The clockwork version of an arcane tome is the clockwork slab. -While it can perform certain actions, it consumes a resource called components. -Components, which are fallen fragments of Ratvar's body as he rusts in Reebe, are powerful and have various effects. -Game-wise, clockwork slabs will generate components over time, with more powerful components being slower. This file's folder contains: clock_cult.dm: Core gamemode files. @@ -36,8 +33,8 @@ Credit where due: 2. SkowronX from /vg/ for MANY of the assets 3. FuryMcFlurry from /vg/ for many of the assets 4. PJB3005 from /vg/ for the failed continuation PR -5. Xhuis from /tg/ for coding the basic gamemode as it is today -6. ChangelingRain from /tg/ for maintaining the gamemode for months after its release +5. Xhuis from /tg/ for coding the first iteration of the mode, and the new, reworked version +6. ChangelingRain from /tg/ for maintaining the gamemode for months after its release prior to its rework */ @@ -56,6 +53,8 @@ Credit where due: return FALSE if(M.mind.enslaved_to && !is_servant_of_ratvar(M.mind.enslaved_to)) return FALSE + if(M.mind.unconvertable) + return FALSE else return FALSE if(iscultist(M) || isconstruct(M) || M.isloyal() || ispAI(M)) @@ -88,7 +87,7 @@ Credit where due: /datum/game_mode var/list/servants_of_ratvar = list() //The Enlightened servants of Ratvar - var/clockwork_explanation = "Construct a Gateway to the Celestial Derelict and free Ratvar." //The description of the current objective + var/clockwork_explanation = "Defend the Ark of the Clockwork Justiciar and free Ratvar." //The description of the current objective /datum/game_mode/clockwork_cult name = "clockwork cult" @@ -103,30 +102,34 @@ Credit where due: restricted_jobs = list("Chaplain", "Captain") announce_span = "brass" announce_text = "Servants of Ratvar are trying to summon the Justiciar!\n\ - Servants: Take over the station and summon Ratvar.\n\ + Servants: Construct defenses to protect the Ark. Sabotage the station!\n\ Crew: Stop the servants before they can summon the Clockwork Justiciar." var/servants_to_serve = list() var/roundstart_player_count + var/ark_time //In minutes, how long the Ark waits before activation; this is equal to 30 + (number of players / 5) (max 40 mins.) /datum/game_mode/clockwork_cult/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" - var/starter_servants = 3 //Guaranteed three servants + var/starter_servants = 4 //Guaranteed four servants var/number_players = num_players() roundstart_player_count = number_players - if(number_players > 30) //plus one servant for every additional 15 players + if(number_players > 30) //plus one servant for every additional 10 players above 30 number_players -= 30 - starter_servants += round(number_players/15) + starter_servants += round(number_players / 10) + starter_servants = min(starter_servants, 8) //max 8 servants (that sould only happen with a ton of players) while(starter_servants) var/datum/mind/servant = pick(antag_candidates) servants_to_serve += servant antag_candidates -= servant modePlayer += servant + servant.assigned_role = "Servant of Ratvar" servant.special_role = "Servant of Ratvar" - servant.restricted_roles = restricted_jobs starter_servants-- + ark_time = 30 + round((roundstart_player_count / 5)) //In minutes, how long the Ark will wait before activation + ark_time = min(ark_time, 35) //35 minute maximum for the activation timer return 1 /datum/game_mode/clockwork_cult/post_setup() @@ -134,26 +137,34 @@ Credit where due: var/datum/mind/servant = S log_game("[servant.key] was made an initial servant of Ratvar") var/mob/living/L = servant.current + var/turf/T = pick(GLOB.servant_spawns) + L.forceMove(T) + GLOB.servant_spawns -= T greet_servant(L) equip_servant(L) add_servant_of_ratvar(L, TRUE) + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar //that's a mouthful + G.initial_activation_delay = ark_time * 60 + G.seconds_until_activation = ark_time * 60 //60 seconds in a minute * number of minutes ..() return 1 /datum/game_mode/clockwork_cult/proc/greet_servant(mob/M) //Description of their role if(!M) return 0 - var/greeting_text = "
You are a servant of Ratvar, the Clockwork Justiciar.\n\ - Rusting eternally in the Celestial Derelict, Ratvar has formed a covenant of mortals, with you as one of its members. As one of the Justiciar's servants, you are to work to the best of your \ - ability to assist in completion of His agenda. You may not know the specifics of how to do so, but luckily you have a vessel to help you learn." - to_chat(M, greeting_text) + to_chat(M, "You are a servant of Ratvar, the Clockwork Justiciar!") + to_chat(M, "You have approximately [ark_time] minutes until the Ark activates.") + to_chat(M, "Unlock Script scripture by converting a new servant.") + to_chat(M, "Application scripture will be unlocked halfway until the Ark's activation.") M.playsound_local(get_turf(M), 'sound/ambience/antag/clockcultalr.ogg', 100, FALSE, pressure_affected = FALSE) return 1 -/datum/game_mode/proc/equip_servant(mob/living/L) //Grants a clockwork slab to the mob, with one of each component - if(!L || !istype(L)) +/datum/game_mode/proc/equip_servant(mob/living/M) //Grants a clockwork slab to the mob, with one of each component + if(!M || !ishuman(M)) return FALSE - var/obj/item/clockwork/slab/starter/S = new/obj/item/clockwork/slab/starter(null) //start it off in null + var/mob/living/carbon/human/L = M + L.equipOutfit(/datum/outfit/servant_of_ratvar) + var/obj/item/clockwork/slab/S = new var/slot = "At your feet" var/list/slots = list("In your left pocket" = slot_l_store, "In your right pocket" = slot_r_store, "In your backpack" = slot_in_backpack, "On your belt" = slot_belt) if(ishuman(L)) @@ -165,26 +176,24 @@ Credit where due: if(!S.forceMove(get_turf(L))) qdel(S) if(S && !QDELETED(S)) - to_chat(L, "[slot] is a link to the halls of Reebe and your master. You may use it to perform many tasks, but also become oriented with the workings of Ratvar and how to best complete your \ - tasks. This clockwork slab will be instrumental in your triumph. Remember: you can speak discreetly with your fellow servants by using the Hierophant Network action button, \ - and you can find a concise tutorial by using the slab in-hand and selecting Recollection.") - to_chat(L, "Alternatively, check out the wiki page at https://tgstation13.org/wiki/Clockwork_Cult, which contains additional information.") + to_chat(L, "There is a paper in your backpack! Read it!") + to_chat(L, "[slot] is a clockwork slab, a multipurpose tool used to construct machines and invoke ancient words of power. If this is your first time \ + as a servant, you can find a concise tutorial in the Recollection category of its interface.") + to_chat(L, "If you want more information, you can find a wiki link here! https://tgstation13.org/wiki/Clockwork_Cult") return TRUE return FALSE /datum/game_mode/clockwork_cult/proc/check_clockwork_victory() - if(GLOB.clockwork_gateway_activated) - SSticker.news_report = CLOCK_PROSELYTIZATION //failure, technically, but we have the station - if(GLOB.ratvar_awakens) - SSticker.news_report = CLOCK_SUMMON - return TRUE + if(GLOB.clockwork_gateway_activated || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) + SSticker.news_report = CLOCK_SUMMON + return TRUE else SSticker.news_report = CULT_FAILURE return FALSE /datum/game_mode/clockwork_cult/declare_completion() ..() - return 0 //Doesn't end until the round does + return //Doesn't end until the round does /datum/game_mode/clockwork_cult/generate_report() return "We have lost contact with multiple stations in your sector. They have gone dark and do not respond to all transmissions, although they appear intact and the crew's life \ @@ -198,21 +207,12 @@ Credit where due: if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) //Possibly hacky? var/datum/game_mode/clockwork_cult/C = SSticker.mode if(C.check_clockwork_victory()) - text += "Ratvar's servants have succeeded in fulfilling His goals!" + text += "Ratvar's servants defended the Ark until its activation!" SSticker.mode_result = "win - servants completed their objective (summon ratvar)" else - var/half_victory = FALSE - var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = locate() in GLOB.all_clockwork_objects - if(G) - half_victory = TRUE - if(half_victory) - text += "The crew escaped before Ratvar could rise, but the gateway \ - was successfully constructed!" - SSticker.mode_result = "halfwin - servants constructed the gateway but their objective was not completed (summon ratvar)" - else - text += "Ratvar's servants have failed!" - SSticker.mode_result = "loss - servants failed their objective (summon ratvar)" - text += "
The servants' objective was:
[CLOCKCULT_OBJECTIVE]" + text += "The Ark was destroyed! Ratvar will rust away for all eternity!" + SSticker.mode_result = "loss - servants failed their objective (summon ratvar)" + text += "
The servants' objective was: [CLOCKCULT_OBJECTIVE]." text += "
Ratvar's servants had [GLOB.clockwork_caches] Tinkerer's Caches." text += "
Construction Value(CV) was: [GLOB.clockwork_construction_value]" for(var/i in SSticker.scripture_states) @@ -233,3 +233,79 @@ Credit where due: var/datum/atom_hud/antag/A = GLOB.huds[ANTAG_HUD_CLOCKWORK] A.leave_hud(M.current) set_antag_hud(M.current, null) + + + +//Servant of Ratvar outfit +/datum/outfit/servant_of_ratvar + name = "Servant of Ratvar" + uniform = /obj/item/clothing/under/chameleon/ratvar + shoes = /obj/item/clothing/shoes/workboots + back = /obj/item/storage/backpack + ears = /obj/item/device/radio/headset + gloves = /obj/item/clothing/gloves/color/yellow + belt = /obj/item/storage/belt/utility/servant + backpack_contents = list(/obj/item/storage/box/engineer = 1, \ + /obj/item/clockwork/replica_fabricator = 1, /obj/item/stack/tile/brass/fifty = 1, /obj/item/paper/servant_primer = 1) + id = /obj/item/card/id + var/plasmaman //We use this to determine if we should activate internals in post_equip() + +/datum/outfit/servant_of_ratvar/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(H.dna.species.id == "plasmaman") //Plasmamen get additional equipment because of how they work + head = /obj/item/clothing/head/helmet/space/plasmaman + uniform = /obj/item/clothing/under/plasmaman //Plasmamen generally shouldn't need chameleon suits anyways, since everyone expects them to wear their fire suit + r_hand = /obj/item/tank/internals/plasmaman/belt/full + mask = /obj/item/clothing/mask/breath + plasmaman = TRUE + +/datum/outfit/servant_of_ratvar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + var/obj/item/card/id/W = H.wear_id + W.assignment = "Assistant" + W.access += ACCESS_MAINT_TUNNELS + W.registered_name = H.real_name + W.update_label() + if(plasmaman && !visualsOnly) //If we need to breathe from the plasma tank, we should probably start doing that + H.internal = H.get_item_for_held_index(2) + H.update_internals_hud_icon(1) + +/obj/item/paper/servant_primer + name = "The Ark And You: A Primer On Servitude" + color = "#DAAA18" + info = "DON'T PANIC.
\ + Here's a quick primer on what you should know here.\ +
- \
+
\ + Here is the layout of Reebe, from left to right:\ +
- \
+
\ +
Things that have changed:
\ +- \
+
\ + Good luck!" + +/obj/item/paper/servant_primer/examine(mob/user) + if(!is_servant_of_ratvar(user) && !isobserver(user)) + to_chat(user, "You can't understand any of the words on [src].") + ..() diff --git a/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm b/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm new file mode 100644 index 00000000000..a1946c4c221 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm @@ -0,0 +1,50 @@ +//These spawn across the station when the Ark activates. Anyone can walk through one to teleport to Reebe. +/obj/effect/clockwork/city_of_cogs_rift + name = "celestial rift" + desc = "A stable bluespace rip. You're not sure it where leads." + clockwork_desc = "A one-way rift to the City of Cogs. Because it's linked to the Ark, it can't be closed." + icon_state = "city_of_cogs_rift" + resistance_flags = INDESTRUCTIBLE + density = TRUE + light_range = 2 + light_power = 3 + light_color = "#6A4D2F" + +/obj/effect/clockwork/city_of_cogs_rift/Initialize() + . = ..() + visible_message("The air above [loc] shimmers and pops as a [name] forms there!") + for(var/mob/M in GLOB.player_list) + if(M.z == z) + if(get_dist(src, M) >= 7) + M.playsound_local(src, 'sound/magic/blink.ogg', 10, FALSE, falloff = 10) + else + M.playsound_local(src, 'sound/magic/blink.ogg', 50, FALSE) + +/obj/effect/clockwork/city_of_cogs_rift/Destroy() + visible_message("[src] cracks as it destabilizes and breaks apart!") + return ..() + +/obj/effect/clockwork/city_of_cogs_rift/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item/nullrod)) + to_chat(user, "Your [I.name] seems to have no effect on [src]!") + return + . = ..() + +/obj/effect/clockwork/city_of_cogs_rift/attack_hand(atom/movable/AM) + beckon(AM) + +/obj/effect/clockwork/city_of_cogs_rift/CollidedWith(atom/movable/AM) + if(!QDELETED(AM)) + beckon(AM) + +/obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM) + AM.visible_message("[AM] passes through [src]!", ignore_mob = AM) + AM.forceMove(pick(!is_servant_of_ratvar(AM) ? GLOB.city_of_cogs_spawns : GLOB.servant_spawns)) + AM.visible_message("[AM] materializes from the air!", \ + "You pass through [src] and appear [is_servant_of_ratvar(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."].") + do_sparks(5, TRUE, src) + do_sparks(5, TRUE, AM) + if(isliving(AM)) + var/mob/living/L = AM + L.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static) + L.clear_fullscreen("flash", 5) diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm index d607adb37fa..d5b9ce44011 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm @@ -11,21 +11,11 @@ var/stat_affected = CONSCIOUS var/sigil_name = "Sigil" var/resist_string = "glows blinding white" //string for when a null rod blocks its effects, "glows [resist_string]" - var/list/component_refund = list() /obj/effect/clockwork/sigil/attackby(obj/item/I, mob/living/user, params) - if(is_servant_of_ratvar(user)) - if(istype(I, /obj/item/clockwork/slab)) - user.visible_message("[user] starts to dispel [src]...", "You start to dispel [src]...") - if(do_after(user, 20, target = src)) - user.visible_message("[user] dispels [src]!", "You dispel [src]!") - for(var/i in component_refund) - if(component_refund[i]) - for(var/r in 1 to component_refund[i]) - generate_cache_component(i, src) - qdel(src) - return 1 - else if(I.force) + if(I.force) + if(is_servant_of_ratvar(user) && user.a_intent != INTENT_HARM) + return ..() user.visible_message("[user] scatters [src] with [I]!", "You scatter [src] with [I]!") qdel(src) return 1 @@ -35,7 +25,9 @@ return //you can't tk stomp sigils, but you can hit them with something /obj/effect/clockwork/sigil/attack_hand(mob/user) - if(iscarbon(user) && !user.stat && !is_servant_of_ratvar(user)) + if(iscarbon(user) && !user.stat) + if(is_servant_of_ratvar(user) && user.a_intent != INTENT_HARM) + return ..() user.visible_message("[user] stamps out [src]!", "You stomp on [src], scattering it into thousands of particles.") qdel(src) return 1 @@ -75,7 +67,6 @@ light_power = 1 light_color = "#FAE48C" sigil_name = "Sigil of Transgression" - component_refund = list(HIEROPHANT_ANSIBLE = 1) /obj/effect/clockwork/sigil/transgression/sigil_effects(mob/living/L) var/target_flashed = L.flash_act() @@ -85,10 +76,11 @@ if(iscultist(L)) to_chat(L, "\"Watch your step, wretch.\"") L.adjustBruteLoss(10) - L.Knockdown(140, FALSE) + L.Knockdown(80, FALSE) L.visible_message("[src] appears around [L] in a burst of light!", \ "[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!") - L.Stun(100) + L.Stun(40) + L.apply_status_effect(STATUS_EFFECT_BELLIGERENT) new /obj/effect/temp_visual/ratvar/sigil/transgression(get_turf(src)) qdel(src) @@ -107,18 +99,23 @@ light_color = "#FAE48C" stat_affected = UNCONSCIOUS resist_string = "glows faintly yellow" - sigil_name = "Sigil of Submission" - component_refund = list(GEIS_CAPACITOR = 1) var/convert_time = 80 var/delete_on_finish = TRUE + sigil_name = "Sigil of Submission" var/glow_type = /obj/effect/temp_visual/ratvar/sigil/submission /obj/effect/clockwork/sigil/submission/sigil_effects(mob/living/L) - if(istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding)) - if(is_servant_of_ratvar(L.pulledby)) - L.pulledby.stop_pulling() - if(is_servant_of_ratvar(L.buckled.pulledby)) - L.buckled.pulledby.stop_pulling() + var/turf/T = get_turf(src) + var/has_sigil = FALSE + var/has_servant = FALSE + if(locate(/obj/effect/clockwork/sigil/transgression) in T) + has_sigil = TRUE + for(var/mob/living/M in range(3, src)) + if(is_servant_of_ratvar(M) && !M.stat) + has_servant = TRUE + if(!has_sigil && !has_servant) + visible_message("[src] strains into a gentle violet color, but quietly fades...") + return L.visible_message("[src] begins to glow a piercing magenta!", "You feel something start to invade your mind...") var/oldcolor = color animate(src, color = "#AF0AAF", time = convert_time, flags = ANIMATION_END_NOW) @@ -127,10 +124,10 @@ glow = new glow_type(get_turf(src)) animate(glow, alpha = 255, time = convert_time) var/I = 0 - while(I < convert_time && !QDELETED(L) && get_turf(L) == get_turf(src)) + while(I < convert_time && get_turf(L) == get_turf(src)) I++ sleep(1) - if(QDELETED(L) || get_turf(L) != get_turf(src)) + if(get_turf(L) != get_turf(src)) if(glow) qdel(glow) animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW) @@ -139,6 +136,9 @@ return if(is_eligible_servant(L)) to_chat(L, "\"You belong to me now.\"") + if(!GLOB.application_scripture_unlocked) + GLOB.application_scripture_unlocked = TRUE + hierophant_message("With the conversion of a new servant the Ark's power grows. Application scriptures are now available.") if(add_servant_of_ratvar(L)) L.log_message("Conversion was done with a [sigil_name].", INDIVIDUAL_ATTACK_LOG) L.Knockdown(50) //Completely defenseless for five seconds - mainly to give them time to read over the information they've just been presented with @@ -160,29 +160,26 @@ visible_message("[src] slowly stops glowing!") -//Sigil of Transmission: Stores power for clockwork machinery, serving as a battery. +//Sigil of Transmission: Serves as an access point for powered structures. /obj/effect/clockwork/sigil/transmission name = "suspicious sigil" desc = "A glowing orange sigil. The air around it feels staticky." - clockwork_desc = "A sigil that serves as power generation and a battery for clockwork structures." + clockwork_desc = "A sigil that serves as power generation and a battery for clockwork structures, linked to all other sigils of its type." icon_state = "sigiltransmission" alpha = 50 color = "#EC8A2D" light_color = "#EC8A2D" resist_string = "glows faintly" sigil_name = "Sigil of Transmission" - component_refund = list(HIEROPHANT_ANSIBLE = 1) affects_servants = TRUE - var/power_charge = 0 //starts with no power - var/drain_range = 14 /obj/effect/clockwork/sigil/transmission/Initialize() . = ..() - update_glow() + update_icon() /obj/effect/clockwork/sigil/transmission/ex_act(severity) if(severity == 3) - modify_charge(-500) + adjust_clockwork_power(500) //Light explosions charge the network! visible_message("[src] flares a brilliant orange!") else ..() @@ -193,70 +190,26 @@ var/structure_number = 0 for(var/obj/structure/destructible/clockwork/powered/P in range(SIGIL_ACCESS_RANGE, src)) structure_number++ - to_chat(user, "It is storing [GLOB.ratvar_awakens ? "INFINITE":"[DisplayPower(power_charge)] of"] power, \ - and [structure_number] Clockwork Structure[structure_number == 1 ? " is":"s are"] in range.") - to_chat(user, "While active, it will gradually drain power from nearby electronics. It is currently [isprocessing ? "active":"disabled"].") + to_chat(user, "It is storing [DisplayPower(get_clockwork_power())] of shared power, \ + and [structure_number] clockwork structure[structure_number == 1 ? " is":"s are"] in range.") if(iscyborg(user)) to_chat(user, "You can recharge from the [sigil_name] by crossing it.") - else if(!GLOB.ratvar_awakens) - to_chat(user, "Hitting the [sigil_name] with brass sheets will convert them to power at a rate of 1 brass sheet to [DisplayPower(POWER_FLOOR)] power.") - if(!GLOB.ratvar_awakens) - to_chat(user, "You can recharge Replica Fabricators from the [sigil_name].") - -/obj/effect/clockwork/sigil/transmission/attackby(obj/item/I, mob/living/user, params) - if(is_servant_of_ratvar(user) && istype(I, /obj/item/stack/tile/brass) && !GLOB.ratvar_awakens) - var/obj/item/stack/tile/brass/B = I - user.visible_message("[user] places [B] on [src], causing it to disintegrate into glowing orange energy!", \ - "You charge the [sigil_name] with [B], providing it with [DisplayPower(B.amount * POWER_FLOOR)] of power.") - modify_charge(-(B.amount * POWER_FLOOR)) - playsound(src, 'sound/effects/light_flicker.ogg', (B.amount * POWER_FLOOR) * 0.01, 1) - qdel(B) - return TRUE - return ..() - -/obj/effect/clockwork/sigil/transmission/attack_ai(mob/user) - if(is_servant_of_ratvar(user)) - attack_hand(user) - -/obj/effect/clockwork/sigil/transmission/attack_hand(mob/user) - if(is_servant_of_ratvar(user)) - visible_message("[user] [isprocessing ? "de":""]activates [src].", "You [isprocessing ? "de":""]activate the [sigil_name].") - if(isprocessing) - STOP_PROCESSING(SSobj, src) - else - START_PROCESSING(SSobj, src) - else - return ..() /obj/effect/clockwork/sigil/transmission/sigil_effects(mob/living/L) if(is_servant_of_ratvar(L)) if(iscyborg(L)) charge_cyborg(L) - else if(power_charge) + else if(get_clockwork_power()) to_chat(L, "You feel a slight, static shock.") -/obj/effect/clockwork/sigil/transmission/process() - var/power_drained = 0 - - for(var/t in spiral_range_turfs(drain_range, src)) - var/turf/T = t - for(var/M in T) - var/atom/movable/A = M - power_drained += A.power_drain(TRUE) - - CHECK_TICK - - modify_charge(-Floor(power_drained, MIN_CLOCKCULT_POWER)) - new /obj/effect/temp_visual/ratvar/sigil/transmission(loc, 1 + (power_drained * 0.0035)) - /obj/effect/clockwork/sigil/transmission/proc/charge_cyborg(mob/living/silicon/robot/cyborg) if(!cyborg_checks(cyborg)) return to_chat(cyborg, "You start to charge from the [sigil_name]...") if(!do_after(cyborg, 50, target = src, extra_checks = CALLBACK(src, .proc/cyborg_checks, cyborg, TRUE))) return - var/giving_power = min(Floor(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), power_charge) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER - if(modify_charge(giving_power)) + var/giving_power = min(Floor(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER + if(adjust_clockwork_power(-giving_power)) cyborg.visible_message("[cyborg] glows a brilliant orange!") var/previous_color = cyborg.color cyborg.color = list("#EC8A2D", "#EC8A2D", "#EC8A2D", rgb(0,0,0)) @@ -269,9 +222,9 @@ if(!silent) to_chat(cyborg, "You have no cell!") return FALSE - if(!power_charge) + if(!get_clockwork_power()) if(!silent) - to_chat(cyborg, "The [sigil_name] has no stored power!") + to_chat(cyborg, "There is no power available across sigils!") return FALSE if(cyborg.cell.charge > cyborg.cell.maxcharge - MIN_CLOCKCULT_POWER) if(!silent) @@ -283,25 +236,15 @@ return FALSE return TRUE -/obj/effect/clockwork/sigil/transmission/proc/modify_charge(amount) - if(GLOB.ratvar_awakens) - update_glow() - return TRUE - if(power_charge - amount < 0) - return FALSE - power_charge -= amount - update_glow() - return TRUE - -/obj/effect/clockwork/sigil/transmission/proc/update_glow() +/obj/effect/clockwork/sigil/transmission/update_icon() if(GLOB.ratvar_awakens) alpha = 255 - else - alpha = min(initial(alpha) + power_charge*0.02, 255) + var/power_charge = get_clockwork_power() + alpha = min(initial(alpha) + power_charge * 0.02, 255) if(!power_charge) set_light(0) else - set_light(max(alpha*0.02, 1.4), max(alpha*0.01, 0.1)) + set_light(max(alpha * 0.02, 1.4), max(alpha * 0.01, 0.1)) //Vitality Matrix: Drains health from non-servants to heal or even revive servants. /obj/effect/clockwork/sigil/vitality @@ -316,7 +259,6 @@ stat_affected = DEAD resist_string = "glows shimmering yellow" sigil_name = "Vitality Matrix" - component_refund = list(VANGUARD_COGWHEEL = 1) var/revive_cost = 150 var/sigil_active = FALSE var/animation_number = 3 //each cycle increments this by 1, at 4 it produces an animation and resets diff --git a/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm b/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm new file mode 100644 index 00000000000..988c00b2f58 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm @@ -0,0 +1,20 @@ +//Marks the point at which "no man's land" begins on Reebe. Servants can't pass beyond this point in any way. +/obj/effect/clockwork/servant_blocker + name = "glowing arrow" + desc = "A faintly glowing image of an arrow on the ground. Convenient!" + icon_state = "servant_blocker" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + density = TRUE + +/obj/effect/clockwork/servant_blocker/Destroy(force) + if(!force) + return + . = ..() + +/obj/effect/clockwork/servant_blocker/CanPass(atom/movable/M, turf/target) + var/list/target_contents = M.GetAllContents() + M + for(var/mob/living/L in target_contents) + if(is_servant_of_ratvar(L) && get_dir(M, src) != dir) //Unless we're on the side the arrow is pointing directly away from, no-go + to_chat(L, "The space beyond here can't be accessed by you or other servants.") + return + return TRUE diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm index 973e753756d..8cb84d43c23 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm @@ -207,7 +207,7 @@ time_duration = round(time_duration * (2 * efficiency), 1) CO.active = TRUE //you'd be active in a second but you should update immediately invoker.visible_message("The air in front of [invoker] ripples before suddenly tearing open!", \ - "With a word, you rip open a [two_way ? "two-way":"one-way"] rift to [input_target_key]. It will last for [time_duration / 10] seconds and has [gateway_uses] use[gateway_uses > 1 ? "s" : ""].") + "With a word, you rip open a [two_way ? "two-way":"one-way"] rift to [input_target_key]. It will last for [DisplayTimeText(time_duration)] and has [gateway_uses] use[gateway_uses > 1 ? "s" : ""].") var/obj/effect/clockwork/spatial_gateway/S1 = new(issrcobelisk ? get_turf(src) : get_step(get_turf(invoker), invoker.dir)) var/obj/effect/clockwork/spatial_gateway/S2 = new(istargetobelisk ? get_turf(target) : get_step(get_turf(target), target.dir)) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm index 5f6d1af61b4..e319df418fd 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm @@ -1,93 +1,3 @@ -//generates a component in the global component cache, either random based on lowest or a specific component -/proc/generate_cache_component(specific_component_id, atom/A) - if(!specific_component_id) - specific_component_id = get_weighted_component_id() - GLOB.clockwork_component_cache[specific_component_id]++ - if(A) - var/component_animation_type = get_component_animation_type(specific_component_id) - new component_animation_type(get_turf(A)) - update_slab_info() - return specific_component_id - -//returns a chosen component id based on the lowest amount of that component in the global cache, the global cache plus the slab if there are caches, or the slab if there are no caches. -/proc/get_weighted_component_id(obj/item/clockwork/slab/storage_slab) - . = list() - if(storage_slab) - if(GLOB.clockwork_caches) - for(var/i in GLOB.clockwork_component_cache) - .[i] = max(MAX_COMPONENTS_BEFORE_RAND - LOWER_PROB_PER_COMPONENT*(GLOB.clockwork_component_cache[i] + storage_slab.stored_components[i]), 1) - else - for(var/i in GLOB.clockwork_component_cache) - .[i] = max(MAX_COMPONENTS_BEFORE_RAND - LOWER_PROB_PER_COMPONENT*storage_slab.stored_components[i], 1) - else - for(var/i in GLOB.clockwork_component_cache) - .[i] = max(MAX_COMPONENTS_BEFORE_RAND - LOWER_PROB_PER_COMPONENT*GLOB.clockwork_component_cache[i], 1) - for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in GLOB.all_clockwork_objects) - if(G.still_needs_components()) - for(var/i in G.required_components) - if(!G.required_components[i]) - . -= i - break - . = pickweight(.) - -//returns a component name from a component id -/proc/get_component_name(id) - switch(id) - if(BELLIGERENT_EYE) - return "Belligerent Eye" - if(VANGUARD_COGWHEEL) - return "Vanguard Cogwheel" - if(GEIS_CAPACITOR) - return "Geis Capacitor" - if(REPLICANT_ALLOY) - return "Replicant Alloy" - if(HIEROPHANT_ANSIBLE) - return "Hierophant Ansible" - else - return null - -//returns a component acronym from a component id -/proc/get_component_acronym(id) - switch(id) - if(BELLIGERENT_EYE) - return "BE" - if(VANGUARD_COGWHEEL) - return "VC" - if(GEIS_CAPACITOR) - return "GC" - if(REPLICANT_ALLOY) - return "RA" - if(HIEROPHANT_ANSIBLE) - return "HA" - else - return null - -//returns a component icon from a component id -/proc/get_component_icon(id) - var/static/list/tgui_component_icons = list( - BELLIGERENT_EYE = icon2base64(icon('icons/obj/tgui_components.dmi', BELLIGERENT_EYE)), - VANGUARD_COGWHEEL = icon2base64(icon('icons/obj/tgui_components.dmi', VANGUARD_COGWHEEL)), - GEIS_CAPACITOR = icon2base64(icon('icons/obj/tgui_components.dmi', GEIS_CAPACITOR)), - REPLICANT_ALLOY = icon2base64(icon('icons/obj/tgui_components.dmi', REPLICANT_ALLOY)), - HIEROPHANT_ANSIBLE = icon2base64(icon('icons/obj/tgui_components.dmi', HIEROPHANT_ANSIBLE))) - return "
"
-
-//returns a component id from a component name
-/proc/get_component_id(name)
- switch(name)
- if("Belligerent Eye")
- return BELLIGERENT_EYE
- if("Vanguard Cogwheel")
- return VANGUARD_COGWHEEL
- if("Geis Capacitor")
- return GEIS_CAPACITOR
- if("Replicant Alloy")
- return REPLICANT_ALLOY
- if("Hierophant Ansible")
- return HIEROPHANT_ANSIBLE
- else
- return null
-
//returns a component spanclass from a component id
/proc/get_component_span(id)
switch(id)
@@ -129,35 +39,3 @@
return "#DAAA18"
else
return "#BE8700"
-
-//returns a type for a floating component animation from a component id
-/proc/get_component_animation_type(id)
- switch(id)
- if(BELLIGERENT_EYE)
- return /obj/effect/temp_visual/ratvar/component
- if(VANGUARD_COGWHEEL)
- return /obj/effect/temp_visual/ratvar/component/cogwheel
- if(GEIS_CAPACITOR)
- return /obj/effect/temp_visual/ratvar/component/capacitor
- if(REPLICANT_ALLOY)
- return /obj/effect/temp_visual/ratvar/component/alloy
- if(HIEROPHANT_ANSIBLE)
- return /obj/effect/temp_visual/ratvar/component/ansible
- else
- return null
-
-//returns a type for a component from a component id
-/proc/get_component_type(id)
- switch(id)
- if(BELLIGERENT_EYE)
- return /obj/item/clockwork/component/belligerent_eye
- if(VANGUARD_COGWHEEL)
- return /obj/item/clockwork/component/vanguard_cogwheel
- if(GEIS_CAPACITOR)
- return /obj/item/clockwork/component/geis_capacitor
- if(REPLICANT_ALLOY)
- return /obj/item/clockwork/component/replicant_alloy
- if(HIEROPHANT_ANSIBLE)
- return /obj/item/clockwork/component/hierophant_ansible
- else
- return null
\ No newline at end of file
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
index a4409cf22c0..a5af47ff054 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
@@ -9,7 +9,7 @@
return FALSE
/atom/proc/consume_visual(obj/item/clockwork/replica_fabricator/fabricator, power_amount)
- if(fabricator.can_use_power(power_amount))
+ if(get_clockwork_power(power_amount))
var/obj/effect/temp_visual/ratvar/beam/itemconsume/B = new /obj/effect/temp_visual/ratvar/beam/itemconsume(get_turf(src))
B.pixel_x = pixel_x
B.pixel_y = pixel_y
@@ -240,7 +240,7 @@
extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE)))
break
obj_integrity = Clamp(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
- fabricator.modify_stored_power(-repair_values["power_required"])
+ adjust_clockwork_power(-repair_values["power_required"])
playsound(src, 'sound/machines/click.ogg', 50, 1)
if(fabricator)
@@ -249,28 +249,6 @@
user.visible_message("[user]'s [fabricator.name] stops covering [src] with glowing orange energy.", \
"You finish repairing [src]. It is now at [obj_integrity]/[max_integrity] integrity.")
-//Hitting a sigil of transmission will try to charge from it.
-/obj/effect/clockwork/sigil/transmission/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)
- . = TRUE
- var/list/charge_values = list()
- if(!fabricator.sigil_charge_checks(charge_values, src, user))
- return
- user.visible_message("[user]'s [fabricator.name] starts draining glowing orange energy from [src]...", \
- "You start recharging your [fabricator.name]...")
- fabricator.recharging = src
- while(fabricator && user && src)
- if(!do_after(user, 10, target = src, extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/sigil_charge_checks, charge_values, src, user, TRUE)))
- break
- modify_charge(charge_values["power_gain"])
- fabricator.modify_stored_power(charge_values["power_gain"])
- playsound(src, 'sound/effects/light_flicker.ogg', charge_values["power_gain"] * 0.1, 1)
-
- if(fabricator)
- fabricator.recharging = null
- if(user)
- user.visible_message("[user]'s [fabricator.name] stops draining glowing orange energy from [src].", \
- "You finish recharging your [fabricator.name]. It now contains [DisplayPower(fabricator.get_power())]/[DisplayPower(fabricator.get_max_power())] power.")
-
//Fabricator mob heal proc, to avoid as much copypaste as possible.
/mob/living/proc/fabricator_heal(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator)
var/list/repair_values = list()
@@ -284,7 +262,7 @@
extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE)))
break
fabricator_heal_tick(repair_values["healing_for_cycle"])
- fabricator.modify_stored_power(-repair_values["power_required"])
+ adjust_clockwork_power(-repair_values["power_required"])
playsound(src, 'sound/machines/click.ogg', 50, 1)
if(fabricator)
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/hierophant_network.dm b/code/game/gamemodes/clock_cult/clock_helpers/hierophant_network.dm
index 81e5783c687..4c1789c50d7 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/hierophant_network.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/hierophant_network.dm
@@ -26,6 +26,7 @@
/datum/action/innate/hierophant
name = "Hierophant Network"
desc = "Allows you to communicate with other Servants."
+ icon_icon = 'icons/mob/actions/actions_clockcult.dmi'
button_icon_state = "hierophant"
background_icon_state = "bg_clock"
check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
@@ -43,6 +44,7 @@
var/input = stripped_input(usr, "Please enter a message to send to other servants.", "Hierophant Network", "")
if(!input || !IsAvailable())
return
-
+ if(ishuman(owner))
+ clockwork_say(owner, "[text2ratvar("Servants, hear my words: [input]")]", TRUE)
log_talk(owner,"CLOCK:[key_name(owner)] : [input]",LOGSAY)
titled_hierophant_message(owner, input, span_for_name, span_for_message, title)
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/power_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/power_helpers.dm
new file mode 100644
index 00000000000..1935eb3e0bc
--- /dev/null
+++ b/code/game/gamemodes/clock_cult/clock_helpers/power_helpers.dm
@@ -0,0 +1,25 @@
+//Helper procs for clockwork power, used by structures and items and that kind of jazz.
+
+/proc/get_clockwork_power(amount) //If no amount is provided, returns the clockwork power; otherwise, returns if there's enough power for that amount.
+ return amount ? GLOB.clockwork_power >= amount : GLOB.clockwork_power
+
+/proc/adjust_clockwork_power(amount) //Adjusts the global clockwork power by this amount (min 0.)
+ if(GLOB.ratvar_approaches)
+ amount *= 0.75 //The herald's beacon reduces power costs by 25% across the board!
+ GLOB.clockwork_power = GLOB.ratvar_awakens ? INFINITY : max(0, GLOB.clockwork_power + amount)
+ for(var/obj/effect/clockwork/sigil/transmission/T in GLOB.all_clockwork_objects)
+ T.update_icon()
+ var/power_overwhelming = GLOB.clockwork_power
+ if(power_overwhelming >= SCRIPT_UNLOCK_THRESHOLD && !GLOB.script_scripture_unlocked)
+ GLOB.script_scripture_unlocked = TRUE
+ hierophant_message("The Ark swells as a key power threshold is reached. Script scriptures are now available.")
+ if(power_overwhelming >= APPLICATION_UNLOCK_THRESHOLD && !GLOB.application_scripture_unlocked)
+ GLOB.application_scripture_unlocked = TRUE
+ hierophant_message("The Ark surges as a key power threshold is reached. Application scriptures are now available.")
+ return TRUE
+
+/proc/can_access_clockwork_power(atom/movable/access_point, amount) //Returns true if the access point has access to clockwork power (and optionally, a number of watts for it)
+ if(amount && !get_clockwork_power(amount)) //No point in trying if we don't have the power anyway
+ return
+ var/list/possible_conduits = view(5, access_point)
+ return locate(/obj/effect/clockwork/sigil/transmission) in possible_conduits || GLOB.ratvar_awakens
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm
index d8281242ef2..c6f3f0f7f3a 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm
@@ -1,39 +1,23 @@
//returns a list of scriptures and if they're unlocked or not
/proc/scripture_unlock_check()
- var/servants = 0
- var/unconverted_ai_exists = get_unconverted_ais()
- for(var/mob/living/M in GLOB.living_mob_list)
- if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M)))
- servants++
- . = list(SCRIPTURE_DRIVER = TRUE, SCRIPTURE_SCRIPT = FALSE, SCRIPTURE_APPLICATION = FALSE, SCRIPTURE_JUDGEMENT = FALSE)
+ . = list(SCRIPTURE_DRIVER = TRUE, SCRIPTURE_SCRIPT = FALSE, SCRIPTURE_APPLICATION = FALSE)
//Drivers: always unlocked
- .[SCRIPTURE_SCRIPT] = (SSticker.scripture_states[SCRIPTURE_SCRIPT] || \
- (servants >= SCRIPT_SERVANT_REQ && GLOB.clockwork_caches >= SCRIPT_CACHE_REQ))
- //Script: SCRIPT_SERVANT_REQ or more non-brain servants and SCRIPT_CACHE_REQ or more clockwork caches
- .[SCRIPTURE_APPLICATION] = (SSticker.scripture_states[SCRIPTURE_APPLICATION] || \
- (servants >= APPLICATION_SERVANT_REQ && GLOB.clockwork_caches >= APPLICATION_CACHE_REQ && GLOB.clockwork_construction_value >= APPLICATION_CV_REQ))
+
+ .[SCRIPTURE_SCRIPT] = GLOB.script_scripture_unlocked
+ //Script: Convert a new servant using a sigil of submission.
+
+ .[SCRIPTURE_APPLICATION] = GLOB.application_scripture_unlocked
//Application: APPLICATION_SERVANT_REQ or more non-brain servants, APPLICATION_CACHE_REQ or more clockwork caches, and at least APPLICATION_CV_REQ CV
- .[SCRIPTURE_JUDGEMENT] = (SSticker.scripture_states[SCRIPTURE_JUDGEMENT] || \
- (servants >= JUDGEMENT_SERVANT_REQ && GLOB.clockwork_caches >= JUDGEMENT_CACHE_REQ && GLOB.clockwork_construction_value >= JUDGEMENT_CV_REQ && !unconverted_ai_exists))
- //Judgement: JUDGEMENT_SERVANT_REQ or more non-brain servants, JUDGEMENT_CACHE_REQ or more clockwork caches, at least JUDGEMENT_CV_REQ CV, and there are no living, non-servant ais
//reports to servants when scripture is locked or unlocked
/proc/scripture_unlock_alert(list/previous_states)
. = scripture_unlock_check()
for(var/i in .)
if(.[i] != previous_states[i])
- hierophant_message("Hierophant Network: [i] Scripture has been [.[i] ? "un":""]locked.") //maybe admins fucked with scripture states?
update_slab_info()
-
-/proc/get_unconverted_ais()
- . = 0
- for(var/ai in GLOB.ai_list)
- var/mob/living/silicon/ai/AI = ai
- if(AI.deployed_shell && is_servant_of_ratvar(AI.deployed_shell))
- continue
- if(is_servant_of_ratvar(AI) || !isturf(AI.loc) || !(AI.z in GLOB.station_z_levels) || AI.stat == DEAD)
- continue
- .++
+ for(var/mob/M in GLOB.player_list)
+ if(is_servant_of_ratvar(M) || isobserver(M))
+ M.playsound_local(M, 'sound/magic/clockwork/scripture_tier_up.ogg', 50, FALSE, pressure_affected = FALSE)
/proc/update_slab_info(obj/item/clockwork/slab/set_slab)
generate_all_scripture()
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm
index 802cfa50786..3c067e0c173 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm
@@ -21,70 +21,58 @@
remove_ranged_ability()
return TRUE
-//For the Geis scripture; binds a target to convert.
-/obj/effect/proc_holder/slab/geis
- ranged_mousepointer = 'icons/effects/geis_target.dmi'
+//For the Hateful Manacles scripture; applies replicant handcuffs to the target.
+/obj/effect/proc_holder/slab/hateful_manacles
-/obj/effect/proc_holder/slab/geis/InterceptClickOn(mob/living/caller, params, atom/target)
+/obj/effect/proc_holder/slab/hateful_manacles/InterceptClickOn(mob/living/caller, params, atom/target)
if(..())
return TRUE
+
var/turf/T = ranged_ability_user.loc
if(!isturf(T))
return TRUE
- var/target_is_binding = istype(target, /obj/structure/destructible/clockwork/geis_binding)
+ if(iscarbon(target) && target.Adjacent(ranged_ability_user))
+ var/mob/living/carbon/L = target
+ if(is_servant_of_ratvar(L))
+ to_chat(ranged_ability_user, "\"They're a servant.\"")
+ return TRUE
+ else if(L.stat)
+ to_chat(ranged_ability_user, "\"There is use in shackling the dead, but for examples.\"")
+ return TRUE
+ else if(L.handcuffed)
+ to_chat(ranged_ability_user, "\"They are already helpless, no?\"")
+ return TRUE
- if((target_is_binding || isliving(target)) && ranged_ability_user.Adjacent(target))
- if(target_is_binding)
- var/obj/structure/destructible/clockwork/geis_binding/GB = target
- GB.repair_and_interrupt()
- for(var/m in GB.buckled_mobs)
- if(m)
- add_logs(ranged_ability_user, m, "rebound with Geis")
- successful = TRUE
+ playsound(loc, 'sound/weapons/handcuffs.ogg', 30, TRUE)
+ ranged_ability_user.visible_message("[ranged_ability_user] begins forming manacles around [L]'s wrists!", \
+ "You begin shaping replicant alloy into manacles around [L]'s wrists...")
+ to_chat(L, "[ranged_ability_user] begins forming manacles around your wrists!")
+ if(do_mob(ranged_ability_user, L, 30))
+ if(!L.handcuffed)
+ L.handcuffed = new/obj/item/restraints/handcuffs/clockwork(L)
+ L.update_handcuffed()
+ to_chat(ranged_ability_user, "You shackle [L].")
+ add_logs(ranged_ability_user, L, "handcuffed")
else
- var/mob/living/L = target
- if(L.null_rod_check())
- to_chat(ranged_ability_user, "\"A void weapon? Really, you expect me to be able to do anything?\"")
- return TRUE
- if(is_servant_of_ratvar(L))
- if(L != ranged_ability_user)
- to_chat(ranged_ability_user, "\"[L.p_they(TRUE)] already serve[L.p_s()] Ratvar. [text2ratvar("Perhaps [ranged_ability_user.p_theyre()] into bondage?")]\"")
- return TRUE
- if(L.stat == DEAD)
- to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] dead, idiot.\"")
- return TRUE
+ to_chat(ranged_ability_user, "You fail to shackle [L].")
- if(istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding)) //if they're already bound, just stun them
- var/obj/structure/destructible/clockwork/geis_binding/GB = L.buckled
- GB.repair_and_interrupt()
- add_logs(ranged_ability_user, L, "rebound with Geis")
- successful = TRUE
- else
- clockwork_say(ranged_ability_user, text2ratvar("Be bound, heathen!"))
- add_logs(ranged_ability_user, L, "bound with Geis")
- playsound(target, 'sound/magic/blink.ogg', 50, TRUE, -4, frequency = 0.5)
- if(slab.speed_multiplier >= 0.5) //excuse my debug...
- ranged_ability_user.notransform = TRUE
- addtimer(CALLBACK(src, .proc/reset_user_notransform, ranged_ability_user), 4) //stop us moving for a little bit so we don't break the binding immediately
- if(L.buckled)
- L.buckled.unbuckle_mob(target, TRUE)
- var/obj/structure/destructible/clockwork/geis_binding/binding = new(get_turf(target))
- binding.setDir(target.dir)
- binding.buckle_mob(target, TRUE)
- ranged_ability_user.start_pulling(binding)
- ranged_ability_user.apply_status_effect(STATUS_EFFECT_GEISTRACKER, binding)
- successful = TRUE
+ successful = TRUE
remove_ranged_ability()
- else
- ..()
return TRUE
-/obj/effect/proc_holder/slab/geis/proc/reset_user_notransform(mob/living/user)
- if(user)
- user.notransform = FALSE
+/obj/item/restraints/handcuffs/clockwork
+ name = "replicant manacles"
+ desc = "Cold, heavy manacles made out of some strange black metal."
+ origin_tech = "materials=2;magnets=5"
+ flags_1 = DROPDEL_1
+
+/obj/item/restraints/handcuffs/clockwork/dropped(mob/user)
+ user.visible_message("[user]'s [name] come apart at the seams!", \
+ "Your [name] break apart as they're removed!")
+ . = ..()
//For the Sentinel's Compromise scripture; heals a target servant.
/obj/effect/proc_holder/slab/compromise
@@ -140,12 +128,83 @@
playsound(targetturf, 'sound/magic/staff_healing.ogg', 50, 1)
if(has_holy_water)
- L.reagents.del_reagent("holywater")
+ L.reagents.remove_reagent("holywater", 1000)
remove_ranged_ability()
return TRUE
+//For the Kindle scripture; stuns and mutes a target non-servant.
+/obj/effect/proc_holder/slab/kindle
+ ranged_mousepointer = 'icons/effects/volt_target.dmi'
+
+/obj/effect/proc_holder/slab/kindle/InterceptClickOn(mob/living/caller, params, atom/target)
+ if(..())
+ return TRUE
+
+ var/turf/T = ranged_ability_user.loc
+ if(!isturf(T))
+ return TRUE
+
+ if(target in view(7, get_turf(ranged_ability_user)))
+
+ successful = TRUE
+
+ var/turf/U = get_turf(target)
+ to_chat(ranged_ability_user, "You release the light of Ratvar!")
+ clockwork_say(ranged_ability_user, text2ratvar("Purge all untruths and honor Engine!"))
+ add_logs(ranged_ability_user, U, "fired at with Kindle")
+ playsound(ranged_ability_user, 'sound/magic/blink.ogg', 50, TRUE, frequency = 0.5)
+ var/obj/item/projectile/kindle/A = new(T)
+ A.original = target
+ A.starting = T
+ A.current = T
+ A.yo = U.y - T.y
+ A.xo = U.x - T.x
+ A.fire()
+
+ remove_ranged_ability()
+
+ return TRUE
+
+/obj/item/projectile/kindle
+ name = "kindled flame"
+ icon_state = "pulse0"
+ nodamage = TRUE
+ damage = 0 //We're just here for the stunning!
+ damage_type = BURN
+ flag = "bomb"
+ range = 3
+ log_override = TRUE
+
+/obj/item/projectile/kindle/Destroy()
+ visible_message("[src] flickers out!")
+ . = ..()
+
+/obj/item/projectile/kindle/on_hit(atom/target, blocked = FALSE)
+ if(isliving(target))
+ var/mob/living/L = target
+ if(is_servant_of_ratvar(L) || L.stat || L.has_status_effect(STATUS_EFFECT_KINDLE))
+ return
+ var/obj/O = L.null_rod_check()
+ playsound(L, 'sound/magic/fireball.ogg', 50, TRUE, frequency = 1.25)
+ if(O)
+ L.visible_message("[L]'s eyes flare with dim light as they stumble!", \
+ "Your [O] glows white-hot against you as it absorbs some sort of power!")
+ L.adjustFireLoss(5)
+ L.Stun(40)
+ playsound(L, 'sound/weapons/sear.ogg', 50, TRUE)
+ else
+ L.visible_message("[L]'s eyes blaze with brilliant light!", \
+ "Your vision suddenly screams with white-hot light!")
+ L.Knockdown(15)
+ L.apply_status_effect(STATUS_EFFECT_KINDLE)
+ L.flash_act(1, 1)
+ if(iscultist(L))
+ L.adjustFireLoss(15)
+ ..()
+
+
//For the cyborg Linked Vanguard scripture, grants you and a nearby ally Vanguard
/obj/effect/proc_holder/slab/vanguard
ranged_mousepointer = 'icons/effects/vanguard_target.dmi'
diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm
index 06b3ac7885d..b1409aae186 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm
@@ -9,6 +9,20 @@
var/list/servant_of_ratvar_messages = list("ayy" = FALSE, "lmao" = TRUE) //Fluff, shown to servants of Ratvar on a low chance, if associated value is TRUE, will automatically apply ratvarian
var/message_span = "heavy_brass"
+/obj/item/clockwork/component/examine(mob/user)
+ . = ..()
+ if(is_servant_of_ratvar(user) || isobserver(user))
+ to_chat(user, "You can activate this in your hand to break it down for power.")
+
+/obj/item/clockwork/component/attack_self(mob/living/user)
+ if(is_servant_of_ratvar(user))
+ user.visible_message("[user] crushes [src] in their hand!", \
+ "You crush [src], capturing its escaping energy for use as power.")
+ playsound(user, 'sound/effects/pop_expl.ogg', 50, TRUE)
+ adjust_clockwork_power(POWER_WALL_TOTAL)
+ user.drop_item()
+ qdel(src)
+
/obj/item/clockwork/component/pickup(mob/living/user)
..()
if(iscultist(user) || (user.mind && user.mind.isholy))
@@ -22,11 +36,6 @@
var/pickedmessage = pick(servant_of_ratvar_messages)
to_chat(user, "")
-/obj/item/clockwork/component/examine(mob/user)
- ..()
- if(is_servant_of_ratvar(user))
- to_chat(user, "")
-
/obj/item/clockwork/component/belligerent_eye
name = "belligerent eye"
desc = "A brass construct with a rotating red center. It's as though it's looking for something to hurt."
@@ -39,7 +48,7 @@
/obj/item/clockwork/component/belligerent_eye/blind_eye
name = "blind eye"
desc = "A heavy brass eye, its red iris fallen dark."
- clockwork_desc = "A smashed ocular warden covered in dents. Serviceable as a substitute for a belligerent eye."
+ clockwork_desc = "A smashed ocular warden covered in dents."
icon_state = "blind_eye"
cultist_message = "The eye flickers at you with intense hate before falling dark."
servant_of_ratvar_messages = list("The eye flickers before falling dark." = FALSE, "You feel watched." = FALSE, "\"...\"" = FALSE)
@@ -48,7 +57,7 @@
/obj/item/clockwork/component/belligerent_eye/lens_gem
name = "lens gem"
desc = "A tiny pinkish gem. It catches the light oddly, almost glowing."
- clockwork_desc = "The gem from an interdiction lens. Serviceable as a substitute for a belligerent eye."
+ clockwork_desc = "The gem from an interdiction lens."
icon_state = "lens_gem"
cultist_message = "The gem turns black and cold for a moment before its normal glow returns."
servant_of_ratvar_messages = list("\"Disgusting failure.\"" = TRUE, "You feel scrutinized." = FALSE, "\"Weaklings.\"" = TRUE, "\"Pathetic defenses.\"" = TRUE)
@@ -69,7 +78,7 @@
/obj/item/clockwork/component/vanguard_cogwheel/onyx_prism
name = "onyx prism"
desc = "An onyx prism with a small aperture. It's very heavy."
- clockwork_desc = "A broken prism from a prolonging prism. Serviceable as a substitute for a vanguard cogwheel."
+ clockwork_desc = "A broken prism from a prolonging prism."
icon_state = "onyx_prism"
cultist_message = "The prism grows painfully hot in your hands."
servant_of_ratvar_messages = list("The prism isn't getting any lighter." = FALSE, "\"So... you haven't failed yet. Have hope, child.\"" = TRUE, \
@@ -98,7 +107,7 @@
/obj/item/clockwork/component/geis_capacitor/antennae
name = "mania motor antennae"
desc = "A pair of dented and bent antennae. They constantly emit a static hiss."
- clockwork_desc = "The antennae from a mania motor. Serviceable as a substitute for a geis capacitor."
+ clockwork_desc = "The antennae from a mania motor."
icon_state = "mania_motor_antennae"
cultist_message = "Your head is filled with a burst of static."
servant_of_ratvar_messages = list("\"Who broke this.\"" = TRUE, "\"Did you break these off YOURSELF?\"" = TRUE, "\"Why did we give this to such simpletons, anyway?\"" = TRUE, \
@@ -117,16 +126,16 @@
/obj/item/clockwork/component/replicant_alloy/smashed_anima_fragment
name = "smashed anima fragment"
desc = "Shattered chunks of metal. Damaged beyond repair and completely unusable."
- clockwork_desc = "The sad remains of an anima fragment. Serviceable as a substitute for replicant alloy."
+ clockwork_desc = "The sad remains of an anima fragment."
icon_state = "smashed_anime_fragment"
cultist_message = "The shards vibrate in your hands for a moment."
- servant_of_ratvar_messages = list("\"...still fight...\"" = FALSE, "\"...where am I...?\"" = FALSE, "\"...put me... slab...\"" = FALSE)
+ servant_of_ratvar_messages = list("\"...still fight...\"" = FALSE, "\"...where am I...?\"" = FALSE, "\"...bring me... back...\"" = FALSE)
w_class = WEIGHT_CLASS_NORMAL
/obj/item/clockwork/component/replicant_alloy/replication_plate
name = "replication plate"
desc = "A flat, heavy disc of metal with a triangular formation on its surface."
- clockwork_desc = "The replication plate from a tinkerer's daemon. Serviceable as a substitute for replicant alloy."
+ clockwork_desc = "The replication plate from a tinkerer's daemon."
icon_state = "replication_plate"
cultist_message = "The plate shudders in your hands, as though trying to get away."
servant_of_ratvar_messages = list("\"Put this in a slab and get back to work.\"" = FALSE, "\"Worse servants than you have held these.\"" = TRUE, \
@@ -146,7 +155,7 @@
/obj/item/clockwork/component/hierophant_ansible/obelisk
name = "obelisk prism"
desc = "A prism that occasionally glows brightly. It seems not-quite there."
- clockwork_desc = "The prism from a clockwork obelisk. Serviceable as a substitute for a hierophant ansible."
+ clockwork_desc = "The prism from a clockwork obelisk."
cultist_message = "The prism flickers wildly in your hands before resuming its normal glow."
servant_of_ratvar_messages = list("You hear the distinctive sound of the Hierophant Network for a moment." = FALSE, "\"Hieroph'ant Br'o'adcas't fail'ure.\"" = TRUE, \
"The obelisk flickers wildly, as if trying to open a gateway." = FALSE, "\"Spa'tial Ga'tewa'y fai'lure.\"" = TRUE)
@@ -182,6 +191,13 @@
desc = "A broken shard of some oddly malleable metal. It occasionally moves and seems to glow."
clockwork_desc = "A broken shard of replicant alloy."
+/obj/item/clockwork/alloy_shards/clockgolem_remains
+ name = "clockwork golem scrap"
+ desc = "A pile of scrap metal. It seems damaged beyond repair."
+ clockwork_desc = "The sad remains of a clockwork golem. It's broken beyond repair."
+ icon_state = "clockgolem_dead"
+ sprite_shift = 0
+
/obj/item/clockwork/alloy_shards/large
w_class = WEIGHT_CLASS_TINY
randomsinglesprite = TRUE
diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_weapons/_call_weapon.dm b/code/game/gamemodes/clock_cult/clock_items/clock_weapons/_call_weapon.dm
new file mode 100644
index 00000000000..afe6aca217b
--- /dev/null
+++ b/code/game/gamemodes/clock_cult/clock_items/clock_weapons/_call_weapon.dm
@@ -0,0 +1,50 @@
+//This is the innate action for "binding" and calling weapons to yourself. These weapons can appear and disappear at will.
+//You can invoke a cooldown period by calling "weapon_reset(cooldown in deciseconds)." By default, this only applies to dismissing weapons.
+/datum/action/innate/call_weapon
+ name = "Call Weapon"
+ desc = "This definitely shouldn't exist."
+ icon_icon = 'icons/mob/actions/actions_clockcult.dmi'
+ button_icon_state = "ratvarian_spear"
+ background_icon_state = "bg_clock"
+ check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
+ buttontooltipstyle = "clockcult"
+ var/cooldown = 0
+ var/obj/item/clockwork/weapon/weapon_type //The type of weapon to create
+ var/obj/item/clockwork/weapon/weapon
+
+/datum/action/innate/call_weapon/IsAvailable()
+ if(!is_servant_of_ratvar(owner))
+ qdel(src)
+ return
+ if(cooldown > world.time)
+ return
+ return ..()
+
+/datum/action/innate/call_weapon/Activate()
+ if(!owner.get_empty_held_indexes())
+ to_chat(usr, "You need an empty hand to call forth your [initial(weapon_type.name)]!")
+ return
+ if(weapon)
+ if(weapon.loc == owner)
+ owner.visible_message("[owner]'s [weapon.name] flickers and disappears!")
+ to_chat(owner, "You dismiss [weapon].")
+ owner.drop_item()
+ QDEL_NULL(weapon)
+ weapon_reset(RATVARIAN_SPEAR_COOLDOWN * 0.5)
+ return
+ else
+ weapon.visible_message("[weapon] suddenly flickers and disappears!")
+ owner.visible_message("A [weapon.name] suddenly flickers into [owner]'s hands!", "You recall [weapon] to you.")
+ else
+ weapon = new weapon_type (get_turf(usr), src)
+ owner.visible_message("A [weapon.name] materializes in [owner]'s hands!", "You call forth your [weapon.name]!")
+ weapon.forceMove(get_turf(owner))
+ owner.put_in_hands(weapon)
+ owner.update_action_buttons_icon()
+ return TRUE
+
+/datum/action/innate/call_weapon/proc/weapon_reset(cooldown_time)
+ cooldown = world.time + cooldown_time
+ addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), cooldown_time)
+ owner.update_action_buttons_icon()
+ QDEL_NULL(weapon)
diff --git a/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm b/code/game/gamemodes/clock_cult/clock_items/clock_weapons/ratvarian_spear.dm
similarity index 72%
rename from code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm
rename to code/game/gamemodes/clock_cult/clock_items/clock_weapons/ratvarian_spear.dm
index c1ea55e16df..d3365e9e200 100644
--- a/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clock_weapons/ratvarian_spear.dm
@@ -1,13 +1,10 @@
//Ratvarian spear: A relatively fragile spear from the Celestial Derelict. Deals extreme damage to silicons and enemy cultists, but doesn't last long when summoned.
-/obj/item/clockwork/ratvarian_spear
+/obj/item/clockwork/weapon/ratvarian_spear
name = "ratvarian spear"
desc = "A razor-sharp spear made of brass. It thrums with barely-contained energy."
clockwork_desc = "A powerful spear of Ratvarian making. It's more effective against enemy cultists and silicons."
- icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "ratvarian_spear"
item_state = "ratvarian_spear"
- lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
force = 15 //Extra damage is dealt to targets in attack()
throwforce = 25
armour_penetration = 10
@@ -16,42 +13,27 @@
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_BULKY
var/bonus_burn = 5
- var/timerid
-/obj/item/clockwork/ratvarian_spear/Destroy()
- deltimer(timerid)
- return ..()
-
-/obj/item/clockwork/ratvarian_spear/ratvar_act()
+/obj/item/clockwork/weapon/ratvarian_spear/ratvar_act()
if(GLOB.ratvar_awakens) //If Ratvar is alive, the spear is extremely powerful
force = 20
bonus_burn = 10
throwforce = 40
armour_penetration = 50
- clockwork_desc = initial(clockwork_desc)
- deltimer(timerid)
else
force = initial(force)
bonus_burn = initial(bonus_burn)
throwforce = initial(throwforce)
armour_penetration = initial(armour_penetration)
- clockwork_desc = "A powerful spear of Ratvarian making. It's more effective against enemy cultists and silicons, though it won't last for long."
- deltimer(timerid)
- timerid = addtimer(CALLBACK(src, .proc/break_spear), RATVARIAN_SPEAR_DURATION, TIMER_STOPPABLE)
-/obj/item/clockwork/ratvarian_spear/cyborg/ratvar_act() //doesn't break!
- ..()
- clockwork_desc = "A powerful spear of Ratvarian making. It's more effective against enemy cultists and silicons."
- deltimer(timerid)
-
-/obj/item/clockwork/ratvarian_spear/examine(mob/user)
+/obj/item/clockwork/weapon/ratvarian_spear/examine(mob/user)
..()
if(is_servant_of_ratvar(user) || isobserver(user))
to_chat(user, "Attacks on living non-Servants will generate [bonus_burn] units of vitality.")
if(!iscyborg(user))
to_chat(user, "Throwing the spear will do massive damage, break the spear, and knock down the target.")
-/obj/item/clockwork/ratvarian_spear/attack(mob/living/target, mob/living/carbon/human/user)
+/obj/item/clockwork/weapon/ratvarian_spear/attack(mob/living/target, mob/living/carbon/human/user)
. = ..()
if(!QDELETED(target) && target.stat != DEAD && !target.null_rod_check() && !is_servant_of_ratvar(target)) //we do bonus damage on attacks unless they're a servant, have a null rod, or are dead
var/bonus_damage = bonus_burn //normally a total of 20 damage, 30 with ratvar
@@ -63,7 +45,7 @@
bonus_damage *= 3 //total 30 damage on cultists, 50 with ratvar
GLOB.clockwork_vitality += target.adjustFireLoss(bonus_damage) //adds the damage done to existing vitality
-/obj/item/clockwork/ratvarian_spear/throw_impact(atom/target)
+/obj/item/clockwork/weapon/ratvarian_spear/throw_impact(atom/target)
var/turf/T = get_turf(target)
if(isliving(target))
var/mob/living/L = target
@@ -83,11 +65,12 @@
else
..()
-/obj/item/clockwork/ratvarian_spear/proc/break_spear(turf/T)
+/obj/item/clockwork/weapon/ratvarian_spear/proc/break_spear(turf/T)
if(src)
if(!T)
T = get_turf(src)
if(T) //make sure we're not in null or something
T.visible_message("[src] [pick("cracks in two and fades away", "snaps in two and dematerializes")]!")
new /obj/effect/temp_visual/ratvar/spearbreak(T)
- qdel(src)
+ action.weapon_reset(RATVARIAN_SPEAR_COOLDOWN)
+
diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm
index d68c87369e0..df83ff4890d 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm
@@ -6,7 +6,8 @@
icon_state = "clockwork_helmet"
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FIRE_PROOF | ACID_PROOF
- armor = list(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
+ flags_inv = HIDEEARS|HIDEHAIR|HIDEFACE
+ armor = list(melee = 50, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
/obj/item/clothing/head/helmet/clockwork/Initialize()
. = ..()
@@ -23,8 +24,13 @@
flags_1 |= STOPSPRESSUREDMAGE_1
max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
+ else if(GLOB.ratvar_approaches)
+ armor = list(melee = 70, bullet = 80, laser = -15, energy = 25, bomb = 70, bio = 0, rad = 0, fire = 100, acid = 100)
+ flags_1 |= STOPSPRESSUREDMAGE_1
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
else
- armor = list(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
+ armor = list(melee = 60, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
flags_1 &= ~STOPSPRESSUREDMAGE_1
max_heat_protection_temperature = initial(max_heat_protection_temperature)
min_cold_protection_temperature = initial(min_cold_protection_temperature)
@@ -61,7 +67,7 @@
cold_protection = CHEST|GROIN|LEGS
heat_protection = CHEST|GROIN|LEGS
resistance_flags = FIRE_PROOF | ACID_PROOF
- armor = list(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
+ armor = list(melee = 60, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/device/mmi/posibrain/soul_vessel)
/obj/item/clothing/suit/armor/clockwork/Initialize()
@@ -79,8 +85,13 @@
flags_1 |= STOPSPRESSUREDMAGE_1
max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
+ else if(GLOB.ratvar_approaches)
+ armor = list(melee = 70, bullet = 80, laser = -15, energy = 25, bomb = 70, bio = 0, rad = 0, fire = 100, acid = 100)
+ flags_1 |= STOPSPRESSUREDMAGE_1
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
else
- armor = list(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
+ armor = list(melee = 60, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
flags_1 &= ~STOPSPRESSUREDMAGE_1
max_heat_protection_temperature = initial(max_heat_protection_temperature)
min_cold_protection_temperature = initial(min_cold_protection_temperature)
diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
index eecfec77802..a9c241b2c3f 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
@@ -1,9 +1,7 @@
/obj/item/clockwork/slab //Clockwork slab: The most important tool in Ratvar's arsenal. Allows scripture recital, tutorials, and generates components.
name = "clockwork slab"
desc = "A strange metal tablet. A clock in the center turns around and around."
- clockwork_desc = "A link between you and the Celestial Derelict. It produces components, contains information, and is your most vital tool as a Servant.\n\
- Use the Hierophant Network action button to discreetly talk with other Servants.\n\
- Clockwork slabs will only make components if held or if inside an item held by a human, and when making a component will prevent all other slabs held from making components.\n\
+ clockwork_desc = "A link between you and the Celestial Derelict. It contains information, recites scripture, and is your most vital tool as a Servant.\n\
Hitting a slab, a Servant with a slab, or a cache will transfer this slab's components into the target, the target's slab, or the global cache, respectively."
icon_state = "dread_ipad"
lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi'
@@ -11,30 +9,21 @@
var/inhand_overlay //If applicable, this overlay will be applied to the slab's inhand
slot_flags = SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
- var/list/stored_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0)
var/busy //If the slab is currently being used by something
- var/production_time = 0
- var/target_component_id //the target component ID to create, if any
var/no_cost = FALSE //If the slab is admin-only and needs no components and has no scripture locks
var/speed_multiplier = 1 //multiples how fast this slab recites scripture
- var/produces_components = TRUE //if it produces components at all
var/selected_scripture = SCRIPTURE_DRIVER
var/recollecting = FALSE //if we're looking at fancy recollection
var/obj/effect/proc_holder/slab/slab_ability //the slab's current bound ability, for certain scripture
- var/list/quickbound = list(/datum/clockwork_scripture/ranged_ability/geis, /datum/clockwork_scripture/create_object/sigil_of_submission, \
- /datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/tinkerers_cache) //quickbound scripture, accessed by index
+ var/list/quickbound = list(/datum/clockwork_scripture/abscond, \
+ /datum/clockwork_scripture/ranged_ability/kindle, /datum/clockwork_scripture/ranged_ability/hateful_manacles) //quickbound scripture, accessed by index
var/maximum_quickbound = 5 //how many quickbound scriptures we can have
var/recollection_category = "Default"
- actions_types = list(/datum/action/item_action/clock/hierophant)
-
-/obj/item/clockwork/slab/starter
- stored_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 1, GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1)
/obj/item/clockwork/slab/internal //an internal motor for mobs running scripture
name = "scripture motor"
quickbound = list()
no_cost = TRUE
- produces_components = FALSE
/obj/item/clockwork/slab/debug
speed_multiplier = 0
@@ -49,33 +38,33 @@
clockwork_desc = "A divine link to the Celestial Derelict, allowing for limited recital of scripture.\n\
Hitting a slab, a Servant with a slab, or a cache will transfer this slab's components into the target, the target's slab, or the global cache, respectively."
quickbound = list(/datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/ranged_ability/linked_vanguard, \
- /datum/clockwork_scripture/create_object/tinkerers_cache)
+ /datum/clockwork_scripture/create_object/stargazer)
maximum_quickbound = 6 //we usually have one or two unique scriptures, so if ratvar is up let us bind one more
actions_types = list()
/obj/item/clockwork/slab/cyborg/engineer //two scriptures, plus a fabricator
- quickbound = list(/datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/sigil_of_transmission)
+ quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/sigil_of_transmission)
/obj/item/clockwork/slab/cyborg/medical //five scriptures, plus a spear
- quickbound = list(/datum/clockwork_scripture/ranged_ability/linked_vanguard, /datum/clockwork_scripture/ranged_ability/sentinels_compromise, \
- /datum/clockwork_scripture/create_object/vitality_matrix, /datum/clockwork_scripture/channeled/mending_mantra, /datum/clockwork_scripture/fellowship_armory)
+ quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/ranged_ability/linked_vanguard, /datum/clockwork_scripture/ranged_ability/sentinels_compromise, \
+ /datum/clockwork_scripture/create_object/vitality_matrix, /datum/clockwork_scripture/channeled/mending_mantra)
/obj/item/clockwork/slab/cyborg/security //twoscriptures, plus a spear
- quickbound = list(/datum/clockwork_scripture/channeled/belligerent, /datum/clockwork_scripture/ranged_ability/judicial_marker)
+ quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/ranged_ability/hateful_manacles, /datum/clockwork_scripture/ranged_ability/judicial_marker)
/obj/item/clockwork/slab/cyborg/peacekeeper //two scriptures, plus a spear
- quickbound = list(/datum/clockwork_scripture/channeled/belligerent, /datum/clockwork_scripture/ranged_ability/judicial_marker)
+ quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/ranged_ability/hateful_manacles, /datum/clockwork_scripture/ranged_ability/judicial_marker)
/obj/item/clockwork/slab/cyborg/janitor //five scriptures, plus a fabricator
- quickbound = list(/datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/sigil_of_transgression, \
- /datum/clockwork_scripture/create_object/ocular_warden, /datum/clockwork_scripture/create_object/mania_motor, /datum/clockwork_scripture/create_object/tinkerers_daemon)
+ quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/sigil_of_transgression, \
+ /datum/clockwork_scripture/create_object/ocular_warden, /datum/clockwork_scripture/create_object/mania_motor, /datum/clockwork_scripture/create_object/stargazer)
/obj/item/clockwork/slab/cyborg/service //five scriptures, plus xray vision
- quickbound = list(/datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/tinkerers_cache, \
- /datum/clockwork_scripture/spatial_gateway, /datum/clockwork_scripture/fellowship_armory, /datum/clockwork_scripture/create_object/clockwork_obelisk)
+ quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/stargazer, \
+ /datum/clockwork_scripture/spatial_gateway, /datum/clockwork_scripture/create_object/clockwork_obelisk)
/obj/item/clockwork/slab/cyborg/miner //two scriptures, plus a spear and xray vision
- quickbound = list(/datum/clockwork_scripture/ranged_ability/linked_vanguard, /datum/clockwork_scripture/spatial_gateway)
+ quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/ranged_ability/linked_vanguard, /datum/clockwork_scripture/spatial_gateway)
/obj/item/clockwork/slab/cyborg/access_display(mob/living/user)
if(!GLOB.ratvar_awakens)
@@ -92,7 +81,9 @@
. = ..()
update_slab_info(src)
START_PROCESSING(SSobj, src)
- production_time = world.time + SLAB_PRODUCTION_TIME
+ if(GLOB.ratvar_approaches)
+ name = "supercharged [name]"
+ speed_multiplier = max(0.1, speed_multiplier - 0.25)
/obj/item/clockwork/slab/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -115,35 +106,12 @@
if(user && !(src in user.held_items) && slab_ability && slab_ability.ranged_ability_user) //if we happen to check and we AREN'T in user's hands, remove whatever ability we have
slab_ability.remove_ranged_ability()
-//Component Generation
+//Power generation
/obj/item/clockwork/slab/process()
- if(!produces_components)
- STOP_PROCESSING(SSobj, src)
- return
- if(production_time > world.time)
- return
- var/servants = 0
- var/production_slowdown = 0
- for(var/mob/living/M in GLOB.living_mob_list)
- if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M)))
- servants++
- if(servants > SCRIPT_SERVANT_REQ)
- servants -= SCRIPT_SERVANT_REQ
- production_slowdown = min(SLAB_SERVANT_SLOWDOWN * servants, SLAB_SLOWDOWN_MAXIMUM) //SLAB_SERVANT_SLOWDOWN additional seconds for each servant above 5, up to SLAB_SLOWDOWN_MAXIMUM
- production_time = world.time + SLAB_PRODUCTION_TIME + production_slowdown
- var/mob/living/L
- L = get_atom_on_turf(src, /mob/living)
- if(istype(L) && (no_cost || can_recite_scripture(L)))
- var/component_to_generate = target_component_id
- if(!component_to_generate)
- component_to_generate = get_weighted_component_id(src) //more likely to generate components that we have less of
- stored_components[component_to_generate]++
- update_slab_info(src)
- for(var/obj/item/clockwork/slab/S in L.GetAllContents()) //prevent slab abuse today
- if(S == src)
- continue
- S.production_time = production_time + 50 //set it to our next production plus five seconds, so that if you hold the same slabs, the same one will always generate
- to_chat(L, "Your slab cl[pick("ank", "ink", "unk", "ang")]s as it produces a component.")
+ if(GLOB.ratvar_approaches && speed_multiplier == initial(speed_multiplier))
+ name = "supercharged [name]"
+ speed_multiplier = max(0.1, speed_multiplier - 0.25)
+ adjust_clockwork_power(0.1) //Slabs serve as very weak power generators on their own (no, not enough to justify spamming them)
/obj/item/clockwork/slab/examine(mob/user)
..()
@@ -154,97 +122,14 @@
continue
var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
to_chat(user, "Quickbind button: [initial(quickbind_slot.name)].")
- if(GLOB.clockwork_caches) //show components on examine
- to_chat(user, "Stored components (with global cache):")
- for(var/i in stored_components)
- to_chat(user, "[get_component_icon(i)] [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: [stored_components[i]] \
- ([stored_components[i] + GLOB.clockwork_component_cache[i]])")
- else
- to_chat(user, "Stored components:")
- for(var/i in stored_components)
- to_chat(user, "[get_component_icon(i)] [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: [stored_components[i]]")
-
-//Component Transferal
-/obj/item/clockwork/slab/attack(mob/living/target, mob/living/carbon/human/user)
- if(is_servant_of_ratvar(user) && is_servant_of_ratvar(target))
- var/obj/item/clockwork/slab/targetslab
- var/highest_component_amount = 0
- for(var/obj/item/clockwork/slab/S in target.GetAllContents())
- if(!istype(S, /obj/item/clockwork/slab/internal))
- var/totalcomponents = 0
- for(var/i in S.stored_components)
- totalcomponents += S.stored_components[i]
- if(!targetslab || totalcomponents > highest_component_amount)
- highest_component_amount = totalcomponents
- targetslab = S
- if(targetslab)
- if(targetslab == src)
- to_chat(user, "\"You can't transfer components into your own slab, idiot.\"")
- else
- for(var/i in stored_components)
- targetslab.stored_components[i] += stored_components[i]
- stored_components[i] = 0
- update_slab_info(targetslab)
- update_slab_info(src)
- user.visible_message("[user] empties [src] into [target]'s [targetslab.name].", \
- "You transfer your slab's components into [target]'s [targetslab.name].")
- else
- to_chat(user, "[target] has no slabs to transfer components to.")
- else
- return ..()
-
-/obj/item/clockwork/slab/attackby(obj/item/I, mob/user, params)
- var/ratvarian = is_servant_of_ratvar(user)
- if(istype(I, /obj/item/clockwork/component) && ratvarian)
- var/obj/item/clockwork/component/C = I
- if(!C.component_id)
- return 0
- user.visible_message("[user] inserts [C] into [src].", "You insert [C] into [src]\
- [GLOB.clockwork_caches ? ", where it is added to the global cache":""].")
- if(GLOB.clockwork_caches)
- GLOB.clockwork_component_cache[C.component_id]++
- update_slab_info()
- else
- stored_components[C.component_id]++
- update_slab_info(src)
- user.drop_item()
- qdel(C)
- return 1
- else if(istype(I, /obj/item/clockwork/slab) && ratvarian)
- var/obj/item/clockwork/slab/S = I
- var/needs_update = FALSE
- for(var/i in stored_components)
- stored_components[i] += S.stored_components[i]
- S.stored_components[i] = 0
- if(S.stored_components[i])
- needs_update = TRUE
- if(needs_update)
- update_slab_info(src)
- update_slab_info(S)
- user.visible_message("[user] empties [src] into [S].", "You transfer your slab's components into [S].")
- else
- return ..()
+ to_chat(user, "Available Power: [DisplayPower(get_clockwork_power())]")
//Slab actions; Hierophant, Quickbind
/obj/item/clockwork/slab/ui_action_click(mob/user, action)
- if(istype(action, /datum/action/item_action/clock/hierophant))
- show_hierophant(user)
- else if(istype(action, /datum/action/item_action/clock/quickbind))
+ if(istype(action, /datum/action/item_action/clock/quickbind))
var/datum/action/item_action/clock/quickbind/Q = action
recite_scripture(quickbound[Q.scripture_index], user, FALSE)
-/obj/item/clockwork/slab/proc/show_hierophant(mob/living/user)
- if(!user.can_speak_vocal())
- to_chat(user, "You cannot speak into the slab!")
- return FALSE
- var/message = stripped_input(user, "Enter a message to send to your fellow Servants.", "Hierophant")
- if(!message || !user || !user.canUseTopic(src) || !user.can_speak_vocal())
- return FALSE
- clockwork_say(user, text2ratvar("Servants, hear my words: [html_decode(message)]"), TRUE)
- log_talk(user,"CLOCK:[key_name(user)] : [message]",LOGSAY)
- titled_hierophant_message(user, message)
- return TRUE
-
//Scripture Recital
/obj/item/clockwork/slab/attack_self(mob/living/user)
if(iscultist(user))
@@ -310,34 +195,10 @@
textlist += "HONOR RATVAR "
textlist += ""
else
- var/servants = 0
- var/production_time = SLAB_PRODUCTION_TIME
- for(var/mob/living/M in GLOB.living_mob_list)
- if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M)))
- servants++
- if(servants > SCRIPT_SERVANT_REQ)
- servants -= SCRIPT_SERVANT_REQ
- production_time += min(SLAB_SERVANT_SLOWDOWN * servants, SLAB_SLOWDOWN_MAXIMUM)
- var/production_text_addon = ""
- if(production_time != SLAB_PRODUCTION_TIME+SLAB_SLOWDOWN_MAXIMUM)
- production_text_addon = ", which increases for each human or silicon Servant above [SCRIPT_SERVANT_REQ]"
- production_time = production_time/600
- var/list/production_text
- if(round(production_time))
- production_text = list("[round(production_time)] minute\s")
- if(production_time != round(production_time))
- production_time -= round(production_time)
- production_time *= 60
- if(!LAZYLEN(production_text))
- production_text = list("[round(production_time, 1)] second\s")
- else
- production_text += " and [round(production_time, 1)] second\s"
- production_text += ""
- production_text += production_text_addon
- production_text = production_text.Join()
-
textlist = list("\ \ + NOTICE: This information is out of date. Read the Ark & You primer in your backpack or read the wiki page for current info.
\ +
\ These pages serve as the archives of Ratvar, the Clockwork Justiciar. This section of your slab has information on being as a Servant, advice for what to do next, and \ pointers for serving the master well. You should recommended that you check this area for help if you get stuck or need guidance on what to do next.
\ \ @@ -402,11 +263,6 @@ dat += "CV: Construction Value. All clockwork structures, floors, and walls increase this number.
" dat += "Vitality: Used for healing effects, produced by Ratvarian spear attacks and Vitality Matrices.
" dat += "Geis: An important scripture used to make normal crew and robots into Servants of Ratvar.
" - dat += "[get_component_icon(BELLIGERENT_EYE)]BE: Belligerent Eye, a component type used in offensive scriptures.
" - dat += "[get_component_icon(VANGUARD_COGWHEEL)]VC: Vanguard Cogwheel, a component type used in defensive scriptures.
" - dat += "[get_component_icon(GEIS_CAPACITOR)]GC: Geis Capacitor, a component type used in mind-related scriptures.
" - dat += "[get_component_icon(REPLICANT_ALLOY)]RA: Replicant Alloy, a component type used in construction scriptures.
" - dat += "[get_component_icon(HIEROPHANT_ANSIBLE)]HA: Hierophant Ansible, a component type used in energy-related scriptures.
" dat += "Ark: The cult's win condition, a huge structure that needs to be defended.
" dat += "Items
" dat += "Slab: A clockwork slab, a Servant's most important tool. You're holding one! Keep it safe and hidden.
" @@ -431,42 +287,12 @@ dat += "Transmission: Drains and stores power for clockwork structures. Feeding it brass sheets will create additional power.
" dat += "-=-=-=-=-=-" if("Components") - var/servants = 0 //Calculate the current production time for slab components - var/production_time = SLAB_PRODUCTION_TIME - for(var/mob/living/M in GLOB.living_mob_list) - if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M))) - servants++ - if(servants > SCRIPT_SERVANT_REQ) - servants -= SCRIPT_SERVANT_REQ - production_time += min(SLAB_SERVANT_SLOWDOWN * servants, SLAB_SLOWDOWN_MAXIMUM) - var/production_text_addon = "" - if(production_time != SLAB_PRODUCTION_TIME+SLAB_SLOWDOWN_MAXIMUM) - production_text_addon = ", which increases for each human or silicon Servant above [SCRIPT_SERVANT_REQ]" - production_time = production_time/600 - var/list/production_text - if(round(production_time)) - production_text = list("[round(production_time)] minute\s") - if(production_time != round(production_time)) - production_time -= round(production_time) - production_time *= 60 - if(!LAZYLEN(production_text)) - production_text = list("[round(production_time, 1)] second\s") - else - production_text += " and [round(production_time, 1)] second\s" - production_text += "" - production_text += production_text_addon - production_text = production_text.Join() dat += "Components & Their Uses
" dat += "Components are your primary resource as a Servant. There are five types of component, with each one being used in different roles:
" - dat += "[get_component_icon(BELLIGERENT_EYE)]BE Belligerent Eyes are aggressive and judgemental, and are used in offensive scripture;
" - dat += "[get_component_icon(VANGUARD_COGWHEEL)]VC Vanguard Cogwheels are defensive and repairing, and are used in defensive scripture;
" - dat += "[get_component_icon(GEIS_CAPACITOR)]GC Geis Capacitors are for conversion and control, and are used in mind-related scripture;
" - dat += "[get_component_icon(REPLICANT_ALLOY)]RA Replicant Alloy is a strong, malleable metal and is used for construction and creation;
" - dat += "[get_component_icon(HIEROPHANT_ANSIBLE)]HA Hierophant Ansibles are for transmission and power, and are used in power and teleportation scripture
" dat += "Although this is a good rule of thumb, their effects become much more nuanced when used together. For instance, a turret might have both belligerent eyes and \ vanguard cogwheels as construction requirements, because it defends its allies by harming its enemies.
" dat += "Components' primary use is fueling scripture (covered in its own section), and they can be created through various ways. This clockwork slab, for instance, \ - will make a random component of every type - or a specific one, if you choose a target component from the interface - every [production_text]. This number will increase \ + will make a random component of every type - or a specific one, if you choose a target component from the interface - every remove me already. This number will increase \ as the amount of Servants in the covenant increase; additionally, slabs can only produce components when held by a Servant, and holding more than one slab will cause both \ of them to halt progress until one of them is removed from their person.
" dat += "Your slab has an internal storage of components, but it isn't meant to be the main one. Instead, there's a global storage of components that can be \ @@ -487,7 +313,7 @@ dat += "It should also be noted that some scripture cannot be recited alone. Especially with more powerful scripture, you may need multiple Servants to recite a piece of \ scripture; both of you will need to stand still until the recital completes. Only human and silicon Servants are valid for scripture recital! Constructs cannot help \ in reciting scripture.
" - dat += "Finally, scripture is separated into four \"tiers\" based on power: Drivers, Scripts, Applications, and Judgement.[prob(1) ? " (The Revenant tier was removed a long time ago. \ + dat += "Finally, scripture is separated into three \"tiers\" based on power: Drivers, Scripts, and Applications.[prob(1) ? " (The Revenant tier was removed a long time ago. \ Get with the times.)" : ""] You can view the requirements to unlock each tier in its scripture list. Once a tier is unlocked, it's unlocked permanently; the cult only needs to fill the \ requirement for unlocking a tier once!
" dat += "-=-=-=-=-=-" @@ -551,7 +377,7 @@ One of the cogscarabs must've misplaced this section, because the game wasn't able to find any info regarding it. Report this to the coders!" return "
[dat.Join()]
" -//Gets the quickbound scripture as a text block." +//Gets the quickbound scripture as a text block. /obj/item/clockwork/slab/proc/get_recollection_quickbinds() var/list/dat = list() dat += "Quickbound Scripture
\ @@ -568,24 +394,7 @@ /obj/item/clockwork/slab/ui_data(mob/user) //we display a lot of data via TGUI var/list/data = list() - data["components"] = stored_components.Copy() - var/list/temp_data = list("") - for(var/i in data["components"]) //display the slab's components - temp_data += "[get_component_icon(i)] [data["components"][i]]" - if(i != HIEROPHANT_ANSIBLE) - temp_data += " " - else - temp_data += " (" - if(GLOB.clockwork_caches) //if we have caches, display what's in the global cache - for(var/i in GLOB.clockwork_component_cache) - temp_data += "[get_component_icon(i)] [data["components"][i] + GLOB.clockwork_component_cache[i]]" - if(i != HIEROPHANT_ANSIBLE) - temp_data += " " - else - temp_data += "NONE" - temp_data += ")" - temp_data = temp_data.Join() - data["components"] = temp_data + data["power"] = "[DisplayPower(get_clockwork_power())] power is available for scripture and other consumers." switch(selected_scripture) //display info based on selected scripture tier if(SCRIPTURE_DRIVER) @@ -594,24 +403,15 @@ if(SSticker.scripture_states[SCRIPTURE_SCRIPT]) data["tier_info"] = "These scriptures are permenantly unlocked." else - data["tier_info"] = "These scriptures require at least [SCRIPT_SERVANT_REQ] Servants and [SCRIPT_CACHE_REQ] Tinkerer's Cache." + data["tier_info"] = "These scriptures will automatically unlock when the Ark is halfway ready or if [DisplayPower(SCRIPT_UNLOCK_THRESHOLD)] of power is reached." if(SCRIPTURE_APPLICATION) if(SSticker.scripture_states[SCRIPTURE_APPLICATION]) data["tier_info"] = "These scriptures are permenantly unlocked." else - data["tier_info"] = "These scriptures require at least [APPLICATION_SERVANT_REQ] Servants, [APPLICATION_CACHE_REQ] Tinkerer's Caches, and [APPLICATION_CV_REQ]CV." - if(SCRIPTURE_JUDGEMENT) - if(SSticker.scripture_states[SCRIPTURE_JUDGEMENT]) - data["tier_info"] = "This scripture is permenantly unlocked." - else - data["tier_info"] = "This scripture requires at least [JUDGEMENT_SERVANT_REQ] Servants, [JUDGEMENT_CACHE_REQ] Tinkerer's Caches, and [JUDGEMENT_CV_REQ]CV.
In addition, there may not be any active non-Servant AIs." + data["tier_info"] = "Unlock these optional scriptures by converting another servant or if [DisplayPower(APPLICATION_UNLOCK_THRESHOLD)] of power is reached.." data["selected"] = selected_scripture - data["target_comp"] = "NONE" - if(target_component_id) //if we have a component to make, display that, too - data["target_comp"] = "[get_component_icon(target_component_id)]" - generate_all_scripture() data["scripture"] = list() @@ -622,7 +422,7 @@ var/list/temp_info = list("name" = "[S.name]", "descname" = "([S.descname])", "tip" = "[S.desc]\n[S.usage_tip]", - "required" = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0), + "required" = "([DisplayPower(S.power_cost)][S.special_power_text ? "+ [replacetext(S.special_power_text, "POWERCOST", "[DisplayPower(S.special_power_cost)]")]" : ""])", "type" = "[S.type]", "quickbind" = S.quickbind) var/found = quickbound.Find(S.type) @@ -630,24 +430,10 @@ temp_info["bound"] = "[found]" if(S.invokers_required > 1) temp_info["invokers"] = "Invokers: [S.invokers_required]" - var/costs_components = FALSE - for(var/i in S.consumed_components) - if(S.consumed_components[i]) - temp_info["required"][i] += S.consumed_components[i] - costs_components = TRUE - if(costs_components) //if we have a component cost, we'll need a : next to the recital button - var/list/really_temp_data = list(": ") - for(var/i in temp_info["required"]) - if(temp_info["required"][i]) - really_temp_data += "[get_component_icon(i)] [temp_info["required"][i]] " - really_temp_data = really_temp_data.Join() - temp_info["required"] = really_temp_data - else //and if we don't, we won't. - temp_info["required"] = "" data["scripture"] += list(temp_info) data["recollection"] = recollecting if(recollecting) - data["recollection_categories"] = list(\ + data["recollection_categories"] = GLOB.ratvar_awakens ? list() : list(\ list("name" = "Getting Started", "desc" = "First-time servant? Read this first."), \ list("name" = "Basics", "desc" = "A primer on how to play as a servant."), \ list("name" = "Terminology", "desc" = "Common acronyms, words, and terms."), \ @@ -657,8 +443,8 @@ list("name" = "Conversion", "desc" = "Converting the crew, cyborgs, and very walls to your cause."), \ ) data["rec_text"] = recollection() - data["rec_section"] = get_recollection_text(recollection_category) - data["rec_binds"] = get_recollection_quickbinds() + data["rec_section"] = GLOB.ratvar_awakens ? "" : get_recollection_text(recollection_category) + data["rec_binds"] = GLOB.ratvar_awakens ? "" : get_recollection_quickbinds() return data /obj/item/clockwork/slab/ui_act(action, params) @@ -669,16 +455,6 @@ INVOKE_ASYNC(src, .proc/recite_scripture, text2path(params["category"]), usr, FALSE) if("select") selected_scripture = params["category"] - if("component") - var/list/components = list("Random Components") - for(var/i in GLOB.clockwork_component_cache) - var/cache_components = 0 - if(GLOB.clockwork_caches) - cache_components = GLOB.clockwork_component_cache[i] - components["[get_component_name(i)] [(cache_components + stored_components[i])]"] = i - var/input_component = input("Choose a component type.", "Target Component") as null|anything in components - if(input_component && !..()) - target_component_id = components[input_component] if("bind") var/datum/clockwork_scripture/path = text2path(params["category"]) //we need a path and not a string var/found_index = quickbound.Find(path) @@ -723,14 +499,7 @@ Q.scripture_index = i var/datum/clockwork_scripture/quickbind_slot = GLOB.all_scripture[quickbound[i]] Q.name = "[quickbind_slot.name] ([Q.scripture_index])" - var/list/temp_desc = list() - for(var/c in quickbind_slot.consumed_components) //show how much the bound scripture costs - if(quickbind_slot.consumed_components[c]) - temp_desc += "[get_component_icon(c)] [quickbind_slot.consumed_components[c]] " - if(LAZYLEN(temp_desc)) - temp_desc += "
" - temp_desc += "[quickbind_slot.quickbind_desc]" - Q.desc = temp_desc.Join() + Q.desc = quickbind_slot.quickbind_desc Q.button_icon_state = quickbind_slot.name Q.UpdateButtonIcon() if(isliving(loc)) diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_weaponry.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_weaponry.dm new file mode 100644 index 00000000000..f2174030a65 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_weaponry.dm @@ -0,0 +1,15 @@ +//This is the base type for clockwork melee weapons. +/obj/item/clockwork/weapon + name = "clockwork weapon" + desc = "Weaponized brass. Whould've thunk it?" + clockwork_desc = "This shouldn't exist. Report it to a coder." + icon = 'icons/obj/clockwork_objects.dmi' + lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi' + righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi' + var/datum/action/innate/call_weapon/action //Some melee weapons use an action that lets you return and dismiss them + +/obj/item/clockwork/weapon/Initialize(mapload, new_action) + . = ..() + if(new_action) + action = new_action + action.weapon = src diff --git a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm new file mode 100644 index 00000000000..11349cb013d --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm @@ -0,0 +1,69 @@ +//Construct shells that can be activated by ghosts. +/obj/item/clockwork/construct_chassis + name = "construct chassis" + desc = "A shell formed out of brass, presumably for housing machinery." + clockwork_desc = "A construct chassis. It can be activated at any time by a willing ghost." + var/construct_name = "basic construct" + var/construct_desc = "There is no construct for this chassis. Report this to a coder." + icon_state = "anime_fragment" + resistance_flags = FIRE_PROOF | ACID_PROOF + w_class = WEIGHT_CLASS_HUGE + var/creation_message = "The chassis shudders and hums to life!" + var/construct_type //The construct this shell will create + +/obj/item/clockwork/construct_chassis/Initialize() + . = ..() + var/area/A = get_area(src) + if(A && construct_type) + notify_ghosts("A [construct_name] chassis has been created in [A.name]!", 'sound/magic/clockwork/fellowship_armory.ogg', source = src, action = NOTIFY_ORBIT, flashwindow = FALSE) + GLOB.poi_list += src + +/obj/item/clockwork/construct_chassis/Destroy() + GLOB.poi_list -= src + . = ..() + +/obj/item/clockwork/construct_chassis/examine(mob/user) + clockwork_desc = "[clockwork_desc]
[construct_desc]" + ..() + clockwork_desc = initial(clockwork_desc) + +/obj/item/clockwork/construct_chassis/attack_hand(mob/living/user) + if(w_class >= WEIGHT_CLASS_HUGE) + to_chat(user, "[src] is too cumbersome to carry! Drag it around instead!") + return + . = ..() + +/obj/item/clockwork/construct_chassis/attack_ghost(mob/user) + if(alert(user, "Become a [construct_name]? You can no longer be cloned!", construct_name, "Yes", "Cancel") == "Cancel") + return + if(QDELETED(src)) + to_chat(user, "You were too late! Better luck next time.") + return + visible_message(creation_message) + var/mob/living/construct = new construct_type(get_turf(src)) + construct.key = user.key + qdel(user) + qdel(src) + + +//Marauder armor, used to create clockwork marauders - sturdy frontline combatants that can deflect projectiles. +/obj/item/clockwork/construct_chassis/clockwork_marauder + name = "marauder armor" + desc = "A pile of sleek and well-polished brass armor. A small red gemstone sits in its faceplate." + icon_state = "marauder_armor" + construct_name = "clockwork marauder" + construct_desc = "It will become a clockwork marauder, a well-rounded frontline combatant." + creation_message = "Crimson fire begins to rage in the armor as it rises into the air with its arnaments!" + construct_type = /mob/living/simple_animal/hostile/clockwork/marauder + + +//Cogscarab shell, used to create cogcarabs - fragile but zippy little drones that build and maintain the base. +/obj/item/clockwork/construct_chassis/cogscarab + name = "cogscarab shell" + desc = "A small, complex shell that resembles a repair drone, but much larger and made out of brass." + icon_state = "cogscarab_shell" + construct_name = "cogscarab" + construct_desc = "It will become a cogscarab, a small and fragile drone that builds, repairs, and maintains." + creation_message = "The cogscarab clicks and whirrs as it hops up and springs to life!" + construct_type = /mob/living/simple_animal/drone/cogscarab + w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/gamemodes/clock_cult/clock_items/integration_cog.dm b/code/game/gamemodes/clock_cult/clock_items/integration_cog.dm new file mode 100644 index 00000000000..214345a71f4 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_items/integration_cog.dm @@ -0,0 +1,38 @@ +#define COG_MAX_SIPHON_THRESHOLD 0.25 //The cog will not siphon power if the APC's cell is at this % of power + +//Can be used on an open APC to replace its guts with clockwork variants, and begin passively siphoning power from it +/obj/item/clockwork/integration_cog + name = "integration cog" + desc = "A small cogwheel that fits in the palm of your hand." + clockwork_desc = "A small cogwheel that can be inserted into an open APC to siphon power from it passively.
\ + It can be used on a locked APC to open its cover!
\ + Siphons 5 W of power per second while in an APC." + icon_state = "wall_gear" + w_class = WEIGHT_CLASS_TINY + flags_1 = NOBLUDGEON_1 + var/obj/machinery/power/apc/apc + +/obj/item/clockwork/integration_cog/Initialize() + . = ..() + transform *= 0.5 //little cog! + +/obj/item/clockwork/integration_cog/Destroy() + STOP_PROCESSING(SSfastprocess, src) + . = ..() + +/obj/item/clockwork/integration_cog/process() + if(!apc) + if(istype(loc, /obj/machinery/power/apc)) + apc = loc + else + STOP_PROCESSING(SSfastprocess, src) + else + var/obj/item/stock_parts/cell/cell = apc.cell + if(cell && (cell.charge / cell.maxcharge > COG_MAX_SIPHON_THRESHOLD)) + cell.use(1) + adjust_clockwork_power(1) //Power is shared, so only do it once; this runs very quickly so it's about 1W/second + if(prob(1)) + playsound(apc, 'sound/machines/clockcult/steam_whoosh.ogg', 10, TRUE) + new/obj/effect/temp_visual/steam(get_turf(apc), pick(GLOB.cardinals)) + +#undef COG_MAX_SIPHON_THRESHOLD diff --git a/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm b/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm index fb210625a2b..51ffdd9e10c 100644 --- a/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm +++ b/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm @@ -170,7 +170,7 @@ if(!QDELETED(B)) B.duration = world.time + 30 C.Knockdown(5) //knocks down for half a second if affected - sleep(16) + sleep(!GLOB.ratvar_approaches ? 16 : 10) name = "judicial blast" layer = ABOVE_ALL_MOB_LAYER flick("judicial_explosion", src) diff --git a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm index bd356982b5b..ae001c03e5b 100644 --- a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm +++ b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm @@ -9,17 +9,9 @@ w_class = WEIGHT_CLASS_NORMAL force = 5 flags_1 = NOBLUDGEON_1 - var/stored_power = 0 //Requires power to function - var/max_power = CLOCKCULT_POWER_UNIT * 10 + var/speed_multiplier = 1 //The speed ratio the fabricator operates at var/uses_power = TRUE var/repairing = null //what we're currently repairing, if anything - var/obj/effect/clockwork/sigil/transmission/recharging = null //the sigil we're charging from, if any - var/speed_multiplier = 1 //how fast this fabricator works - var/charge_rate = MIN_CLOCKCULT_POWER //how much power we gain every two seconds - var/charge_delay = 2 //how many proccess ticks remain before we can start to charge - -/obj/item/clockwork/replica_fabricator/preloaded - stored_power = POWER_WALL_MINUS_FLOOR+POWER_WALL_TOTAL /obj/item/clockwork/replica_fabricator/scarab name = "scarab fabricator" @@ -27,7 +19,6 @@ item_state = "nothing" w_class = WEIGHT_CLASS_TINY speed_multiplier = 0.5 - charge_rate = MIN_CLOCKCULT_POWER * 2 var/debug = FALSE /obj/item/clockwork/replica_fabricator/scarab/fabricate(atom/target, mob/living/user) @@ -42,75 +33,7 @@ /obj/item/clockwork/replica_fabricator/cyborg name = "cyborg fabricator" - clockwork_desc = "A cyborg's internal fabricator. It is capable of using the cyborg's power in addition to stored power." - -/obj/item/clockwork/replica_fabricator/cyborg/get_power() //returns power and cyborg's power - var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) - var/borg_power = 0 - var/current_charge = 0 - if(istype(R) && R.cell) - current_charge = R.cell.charge - while(current_charge > MIN_CLOCKCULT_POWER) - current_charge -= MIN_CLOCKCULT_POWER - borg_power += MIN_CLOCKCULT_POWER - return ..() + borg_power - -/obj/item/clockwork/replica_fabricator/cyborg/get_max_power() - var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) - var/cell_maxcharge = 0 - if(istype(R) && R.cell) - cell_maxcharge = R.cell.maxcharge - return ..() + cell_maxcharge - -/obj/item/clockwork/replica_fabricator/cyborg/can_use_power(amount) - if(amount != RATVAR_POWER_CHECK) - var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) - var/current_charge = 0 - if(istype(R) && R.cell) - current_charge = R.cell.charge - while(amount > 0 && stored_power - amount < 0) //amount is greater than 0 and stored power minus the amount is still less than 0 - current_charge -= MIN_CLOCKCULT_POWER - amount -= MIN_CLOCKCULT_POWER - if(current_charge < 0) - return FALSE - . = ..() - -/obj/item/clockwork/replica_fabricator/cyborg/modify_stored_power(amount) - var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) - if(istype(R) && R.cell && amount) - if(amount < 0) - while(amount < 0 && stored_power + amount < 0) //amount is less than 0 and stored alloy plus the amount is less than 0 - R.cell.use(MIN_CLOCKCULT_POWER) - amount += MIN_CLOCKCULT_POWER - else - while(amount > 0 && R.cell.charge + MIN_CLOCKCULT_POWER < R.cell.maxcharge) //amount is greater than 0 and cell charge plus MIN_CLOCKCULT_POWER is less than maximum cell charge - R.cell.give(MIN_CLOCKCULT_POWER) - amount -= MIN_CLOCKCULT_POWER - . = ..() - -/obj/item/clockwork/replica_fabricator/Initialize() - . = ..() - START_PROCESSING(SSobj, src) - -/obj/item/clockwork/replica_fabricator/Destroy() - STOP_PROCESSING(SSobj, src) - return ..() - -/obj/item/clockwork/replica_fabricator/process() - if(!charge_rate) - return - var/mob/living/L = get_atom_on_turf(src, /mob/living) - if(istype(L) && is_servant_of_ratvar(L)) - if(charge_delay) - charge_delay-- - return - modify_stored_power(charge_rate) - for(var/obj/item/clockwork/replica_fabricator/S in L.GetAllContents()) //no multiple fabricators - if(S == src) - continue - S.charge_delay = 2 - else - charge_delay = 2 + clockwork_desc = "A cyborg's internal fabricator." /obj/item/clockwork/replica_fabricator/ratvar_act() if(GLOB.ratvar_awakens) @@ -129,45 +52,24 @@ to_chat(user, "It can consume floor tiles, rods, metal, and plasteel for power at rates of 2:[DisplayPower(POWER_ROD)], 1:[DisplayPower(POWER_ROD)], 1:[DisplayPower(POWER_METAL)], \ and 1:[DisplayPower(POWER_PLASTEEL)], respectively.") to_chat(user, "It can also consume brass sheets for power at a rate of 1:[DisplayPower(POWER_FLOOR)].") - to_chat(user, "It is storing [DisplayPower(get_power())]/[DisplayPower(get_max_power())] of power[charge_rate ? ", and is gaining [DisplayPower(charge_rate*0.5)] of power per second":""].") to_chat(user, "Use it in-hand to produce 5 brass sheets at a cost of [DisplayPower(POWER_WALL_TOTAL)] power.") + to_chat(user, "It has access to [DisplayPower(get_clockwork_power())] of power.") /obj/item/clockwork/replica_fabricator/attack_self(mob/living/user) if(is_servant_of_ratvar(user)) if(uses_power) - if(!can_use_power(POWER_WALL_TOTAL)) + if(!get_clockwork_power(POWER_WALL_TOTAL)) to_chat(user, "[src] requires [DisplayPower(POWER_WALL_TOTAL)] of power to produce brass sheets!") return - modify_stored_power(-POWER_WALL_TOTAL) + adjust_clockwork_power(-POWER_WALL_TOTAL) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) new/obj/item/stack/tile/brass(user.loc, 5) - to_chat(user, "You use [stored_power ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now stores [DisplayPower(get_power())]/[DisplayPower(get_max_power())] of power.") + to_chat(user, "You use [get_clockwork_power() ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now has access to [DisplayPower(get_clockwork_power())] of power.") /obj/item/clockwork/replica_fabricator/pre_attackby(atom/target, mob/living/user, params) if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/storage)) return TRUE return fabricate(target, user) - -/obj/item/clockwork/replica_fabricator/proc/get_power() - return stored_power - -/obj/item/clockwork/replica_fabricator/proc/get_max_power() - return max_power - -/obj/item/clockwork/replica_fabricator/proc/modify_stored_power(amount) - stored_power = Clamp(stored_power + amount, 0, max_power) - return TRUE - -/obj/item/clockwork/replica_fabricator/proc/can_use_power(amount) - if(amount == RATVAR_POWER_CHECK) - if(GLOB.ratvar_awakens || !uses_power) - return TRUE - else - return FALSE - if(stored_power - amount < 0) - return FALSE - if(stored_power - amount > max_power) - return FALSE return TRUE //A note here; return values are for if we CAN BE PUT ON A TABLE, not IF WE ARE SUCCESSFUL, unless no_table_check is TRUE @@ -178,10 +80,6 @@ if(!silent) to_chat(user, "You are currently repairing [repairing] with [src]!") return FALSE - if(recharging) - if(!silent) - to_chat(user, "You are currently recharging [src] from the [recharging.sigil_name]!") - return FALSE var/list/fabrication_values = target.fabrication_vals(user, src, silent) //relevant values for fabricating stuff, given as an associated list if(!islist(fabrication_values)) if(fabrication_values != TRUE) //if we get true, fail, but don't send a message for whatever reason @@ -192,7 +90,7 @@ if(!no_table_check) return TRUE return FALSE - if(can_use_power(RATVAR_POWER_CHECK)) + if(get_clockwork_power(RATVAR_POWER_CHECK)) fabrication_values["power_cost"] = 0 var/turf/Y = get_turf(user) @@ -252,7 +150,7 @@ A.setDir(fabrication_values["spawn_dir"]) if(!fabrication_values["no_target_deletion"]) //for some cases where fabrication_vals() modifies the object but doesn't want it deleted qdel(target) - modify_stored_power(-fabrication_values["power_cost"]) + adjust_clockwork_power(-fabrication_values["power_cost"]) if(no_table_check) return TRUE return FALSE @@ -265,25 +163,18 @@ /obj/item/clockwork/replica_fabricator/proc/fabricate_checks(list/fabrication_values, atom/target, expected_type, mob/user, silent) //checked constantly while fabricating if(!islist(fabrication_values) || QDELETED(target) || QDELETED(user)) return FALSE - if(repairing || recharging) + if(repairing) return FALSE if(target.type != expected_type) return FALSE - if(can_use_power(RATVAR_POWER_CHECK)) + if(get_clockwork_power(RATVAR_POWER_CHECK)) fabrication_values["power_cost"] = 0 - if(!can_use_power(fabrication_values["power_cost"])) - if(stored_power - fabrication_values["power_cost"] < 0) + if(!get_clockwork_power(fabrication_values["power_cost"])) + if(get_clockwork_power() - fabrication_values["power_cost"] < 0) if(!silent) var/atom/A = fabrication_values["new_obj_type"] if(A) to_chat(user, "You need [DisplayPower(fabrication_values["power_cost"])] power to fabricate \a [initial(A.name)] from [target]!") - else if(stored_power - fabrication_values["power_cost"] > max_power) - if(!silent) - var/atom/A = fabrication_values["new_obj_type"] - if(A) - to_chat(user, "Your [name] contains too much power to fabricate \a [initial(A.name)] from [target]!") - else - to_chat(user, "Your [name] contains too much power to consume [target]!") return FALSE return TRUE @@ -321,26 +212,9 @@ return FALSE repair_values["healing_for_cycle"] = min(repair_values["amount_to_heal"], FABRICATOR_REPAIR_PER_TICK) //modify the healing for this cycle repair_values["power_required"] = round(repair_values["healing_for_cycle"]*MIN_CLOCKCULT_POWER, MIN_CLOCKCULT_POWER) //and get the power cost from that - if(!can_use_power(RATVAR_POWER_CHECK) && !can_use_power(repair_values["power_required"])) + if(!get_clockwork_power(RATVAR_POWER_CHECK) && !get_clockwork_power(repair_values["power_required"])) if(!silent) to_chat(user, "You need at least [DisplayPower(repair_values["power_required"])] power to start repairin[target == user ? "g yourself" : "g [target]"], and at least \ [DisplayPower(repair_values["amount_to_heal"]*MIN_CLOCKCULT_POWER, MIN_CLOCKCULT_POWER)] to fully repair [target == user ? "yourself" : "[target.p_them()]"]!") return FALSE return TRUE - -//The sigil charge check proc. -/obj/item/clockwork/replica_fabricator/proc/sigil_charge_checks(list/charge_values, obj/effect/clockwork/sigil/transmission/sigil, mob/user, silent) - if(!islist(charge_values) || QDELETED(sigil) || QDELETED(user)) - return FALSE - if(can_use_power(RATVAR_POWER_CHECK)) - return FALSE - charge_values["power_gain"] = Clamp(sigil.power_charge, 0, POWER_WALL_MINUS_FLOOR) - if(!charge_values["power_gain"]) - if(!silent) - to_chat(user, "The [sigil.sigil_name] contains no power!") - return FALSE - if(stored_power + charge_values["power_gain"] > max_power) - if(!silent) - to_chat(user, "Your [name] contains too much power to charge from the [sigil.sigil_name]!") - return FALSE - return TRUE diff --git a/code/game/gamemodes/clock_cult/clock_items/soul_vessel.dm b/code/game/gamemodes/clock_cult/clock_items/soul_vessel.dm index 0ee6d45f7d6..ca80d6f0828 100644 --- a/code/game/gamemodes/clock_cult/clock_items/soul_vessel.dm +++ b/code/game/gamemodes/clock_cult/clock_items/soul_vessel.dm @@ -23,6 +23,7 @@ autoping = FALSE resistance_flags = FIRE_PROOF | ACID_PROOF force_replace_ai_name = TRUE + overrides_aicore_laws = TRUE /obj/item/device/mmi/posibrain/soul_vessel/Initialize() . = ..() diff --git a/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm b/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm index 6d17fe4e74f..fc734ac4265 100644 --- a/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm +++ b/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm @@ -83,7 +83,7 @@ return set_vision_vars(TRUE) if(is_servant_of_ratvar(user)) - to_chat(user, "As you put on the spectacles, all is revealed to you.[GLOB.ratvar_awakens ? "" : " Your eyes begin to itch - you cannot do this for long."]") + to_chat(user, "As you put on the spectacles, all is revealed to you.[GLOB.ratvar_awakens || GLOB.ratvar_approaches ? "" : " Your eyes begin to itch - you cannot do this for long."]") var/datum/status_effect/wraith_spectacles/WS = user.has_status_effect(STATUS_EFFECT_WRAITHSPECS) if(WS) WS.apply_eye_damage(user) @@ -138,7 +138,7 @@ var/mob/living/carbon/human/H = owner var/glasses_right = istype(H.glasses, /obj/item/clothing/glasses/wraith_spectacles) var/obj/item/clothing/glasses/wraith_spectacles/WS = H.glasses - if(glasses_right && !WS.up && !GLOB.ratvar_awakens) + if(glasses_right && !WS.up && !GLOB.ratvar_awakens && !GLOB.ratvar_approaches) apply_eye_damage(H) else if(GLOB.ratvar_awakens) @@ -148,15 +148,15 @@ eye_damage_done = 0 else if(prob(50) && eye_damage_done) H.adjust_eye_damage(-1) - eye_damage_done-- + eye_damage_done = max(0, eye_damage_done - 1) if(!eye_damage_done) qdel(src) /datum/status_effect/wraith_spectacles/proc/apply_eye_damage(mob/living/carbon/human/H) if(H.disabilities & BLIND) return - H.adjust_eye_damage(1) - eye_damage_done++ + H.adjust_eye_damage(0.5) + eye_damage_done += 0.5 if(eye_damage_done >= 20) H.adjust_blurriness(2) if(eye_damage_done >= nearsight_breakpoint) diff --git a/code/game/gamemodes/clock_cult/clock_mobs.dm b/code/game/gamemodes/clock_cult/clock_mobs.dm index abeb183ab01..37933514f81 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs.dm @@ -20,6 +20,11 @@ light_color = "#E42742" death_sound = 'sound/magic/clockwork/anima_fragment_death.ogg' var/playstyle_string = "You are a bug, yell at whoever spawned you!" + var/empower_string = "You have nothing to empower, yell at the coders!" //Shown to the mob when the herald beacon activates + +/mob/living/simple_animal/hostile/clockwork/Initialize() + . = ..() + update_values() /mob/living/simple_animal/hostile/clockwork/get_spans() return ..() | SPAN_ROBOT @@ -28,6 +33,8 @@ ..() add_servant_of_ratvar(src, TRUE) to_chat(src, playstyle_string) + if(GLOB.ratvar_approaches) + to_chat(src, empower_string) /mob/living/simple_animal/hostile/clockwork/ratvar_act() fully_heal(TRUE) @@ -50,3 +57,5 @@ msg += "*---------*" to_chat(user, msg) + +/mob/living/simple_animal/hostile/clockwork/proc/update_values() //This is called by certain things to check GLOB.ratvar_awakens and GLOB.ratvar_approaches diff --git a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm index abbc86089d7..a0396fdec2d 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm @@ -1,11 +1,12 @@ -//Clockwork marauder: Slow but with high damage, resides inside of a servant. Created via the Memory Allocation scripture. +//Clockwork marauder: A well-rounded frontline construct. Only one can exist for every two human servants. /mob/living/simple_animal/hostile/clockwork/marauder name = "clockwork marauder" - desc = "A stalwart apparition of a soldier, blazing with crimson flames. It's armed with a gladius and shield." + desc = "The stalwart apparition of a soldier, blazing with crimson flames. It's armed with a gladius and shield." icon_state = "clockwork_marauder" - health = 300 - maxHealth = 300 - speed = 1 + health = 150 + maxHealth = 150 + force_threshold = 8 + speed = 0 obj_damage = 40 melee_damage_lower = 12 melee_damage_upper = 12 @@ -14,145 +15,40 @@ weather_immunities = list("lava") movement_type = FLYING loot = list(/obj/item/clockwork/component/geis_capacitor/fallen_armor) - var/true_name = "Meme Master 69" //Required to call forth the marauder - var/global/list/possible_true_names = list("Servant", "Warden", "Serf", "Page", "Usher", "Knave", "Vassal", "Escort") - var/mob/living/host //The mob that the marauder is living inside of - var/recovering = FALSE //If the marauder is recovering from recalling - var/blockchance = 17 //chance to block attacks entirely - var/counterchance = 30 //chance to counterattack after blocking - var/static/list/damage_heal_order = list(OXY, BURN, BRUTE, TOX) //we heal our host's damage in this order light_range = 2 light_power = 1.1 - playstyle_string = "You are a clockwork marauder, a living extension of Sevtug's will. As a marauder, you are somewhat slow, but may block attacks, \ - and have a chance to also counter blocked melee attacks for extra damage, in addition to being immune to extreme temperatures and pressures. \ - Your primary goal is to serve the creature that you are now a part of. You can use :b to communicate silently with your master, \ - but can only exit if your master calls your true name or if they are exceptionally damaged. \ - \n\n\ - Stay near your host to protect and heal them; being too far from your host will rapidly cause you massive damage. Recall to your host if you are too weak and believe you cannot continue \ - fighting safely. As a final note, you should probably avoid harming any fellow servants of Ratvar." + playstyle_string = "You are a clockwork marauder, a well-rounded frontline construct of Ratvar. Although you have no \ + unique abilities, you're a fearsome fighter in one-on-one combat, and your shield protects from projectiles!
Obey the Servants and do as they \ + tell you. Your primary goal is to defend the Ark from destruction; they are your allies in this, and should be protected from harm." + empower_string = "The Anima Bulwark's power flows through you! Your weapon will strike harder, your armor is sturdier, and your shield is considerably more \ + likely to deflect shots." + var/deflect_chance = 40 //Chance to deflect any given projectile (non-damaging energy projectiles are always deflected) -/mob/living/simple_animal/hostile/clockwork/marauder/Initialize() - . = ..() - true_name = pick(possible_true_names) - -/mob/living/simple_animal/hostile/clockwork/marauder/Life() - ..() - if(is_in_host()) - if(!is_servant_of_ratvar(host)) - emerge_from_host(FALSE, TRUE) - unbind_from_host() - return - if(!GLOB.ratvar_awakens && host.stat == DEAD) - death() - return - if(GLOB.ratvar_awakens) - adjustHealth(-50) - else - adjustHealth(-10) - if(!recovering) - heal_host() //also heal our host if inside of them and we aren't recovering - else if(health == maxHealth) - to_chat(src, "Your strength has returned. You can once again come forward!") - to_chat(host, "Your marauder is now strong enough to come forward again!") - recovering = FALSE - else - if(GLOB.ratvar_awakens) //If Ratvar is alive, marauders don't need a host and are downright impossible to kill - adjustHealth(-5) - heal_host() - else if(host) - if(!is_servant_of_ratvar(host)) - unbind_from_host() - return - if(host.stat == DEAD) - adjustHealth(50) - to_chat(src, "Your host is dead!") - return - if(z && host.z && z == host.z) - switch(get_dist(get_turf(src), get_turf(host))) - if(2) - adjustHealth(-1) - if(3) - //EQUILIBRIUM - if(4) - adjustHealth(1) - if(5) - adjustHealth(3) - if(6) - adjustHealth(6) - if(7) - adjustHealth(9) - if(8 to INFINITY) - adjustHealth(15) - to_chat(src, "You're too far from your host and rapidly taking damage!") - else //right next to or on top of host - adjustHealth(-2) - heal_host() //gradually heal host if nearby and host is very weak - else //well then, you're not even in the same zlevel - adjustHealth(15) - to_chat(src, "You're too far from your host and rapidly taking damage!") +/mob/living/simple_animal/hostile/clockwork/marauder/update_values() + if(GLOB.ratvar_awakens) //Massive attack damage bonuses and health increase, because Ratvar + health = 300 + maxHealth = 300 + melee_damage_upper = 25 + melee_damage_lower = 25 + attacktext = "devastates" + speed = -1 + obj_damage = 100 + else if(GLOB.ratvar_approaches) //Hefty health bonus and slight attack damage increase + health = 200 + maxHealth = 200 + melee_damage_upper = 15 + melee_damage_lower = 15 + attacktext = "carves" + obj_damage = 50 /mob/living/simple_animal/hostile/clockwork/marauder/death(gibbed) - emerge_from_host(FALSE, TRUE) - unbind_from_host() - visible_message("[src]'s equipment clatters lifelessly to the ground as the red flames within dissipate.", \ - "Your equipment falls away. You feel a moment of confusion before your fragile form is annihilated.") + visible_message("[src]'s equipment clatters lifelessly to the ground as the red flames within dissipate.", \ + "Dented and scratched, your armor falls away, and your fragile form breaks apart without its protection.") . = ..() -/mob/living/simple_animal/hostile/clockwork/marauder/Stat() - ..() - if(statpanel("Status")) - stat(null, "Current True Name: [true_name]") - stat(null, "Host: [host ? host : "NONE"]") - if(host) - var/resulthealth = round((host.health / host.maxHealth) * 100, 0.5) - if(iscarbon(host)) - resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - host.health) / abs(HEALTH_THRESHOLD_DEAD - host.maxHealth)) * 100) - stat(null, "Host Health: [resulthealth]%") - if(GLOB.ratvar_awakens) - stat(null, "You are [recovering ? "un" : ""]able to deploy!") - else - if(resulthealth > MARAUDER_EMERGE_THRESHOLD) - stat(null, "You are [recovering ? "unable to deploy" : "able to deploy on hearing your True Name"]!") - else - stat(null, "You are [recovering ? "unable to deploy" : "able to deploy to protect your host"]!") - stat(null, "You do [melee_damage_upper] damage on melee attacks.") - /mob/living/simple_animal/hostile/clockwork/marauder/Process_Spacemove(movement_dir = 0) - return 1 - -/mob/living/simple_animal/hostile/clockwork/marauder/proc/bind_to_host(mob/living/new_host) - if(!new_host) - return FALSE - host = new_host - var/datum/action/innate/summon_marauder/SM = new() - SM.linked_marauder = src - SM.Grant(host) - var/datum/action/innate/linked_minds/LM = new() - LM.linked_marauder = src - LM.Grant(host) return TRUE -/mob/living/simple_animal/hostile/clockwork/marauder/proc/unbind_from_host() - if(host) - for(var/datum/action/innate/summon_marauder/SM in host.actions) - qdel(SM) - for(var/datum/action/innate/linked_minds/LM in host.actions) - qdel(LM) - host = null - return TRUE - return FALSE - -//DAMAGE and FATIGUE -/mob/living/simple_animal/hostile/clockwork/marauder/proc/heal_host() - if(!host) - return - var/resulthealth = round((host.health / host.maxHealth) * 100, 0.5) - if(iscarbon(host)) - resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - host.health) / abs(HEALTH_THRESHOLD_DEAD - host.maxHealth)) * 100) - if(GLOB.ratvar_awakens || resulthealth <= MARAUDER_EMERGE_THRESHOLD) - new /obj/effect/temp_visual/heal(host.loc, "#AF0AAF") - host.heal_ordered_damage(4, damage_heal_order) - /mob/living/simple_animal/hostile/clockwork/marauder/adjustHealth(amount, updating_health = TRUE, forced = FALSE) if(amount > 0) for(var/mob/living/L in view(2, src)) @@ -161,269 +57,28 @@ amount *= 4 //if a wielded null rod is nearby, it takes four times the health damage break . = ..() - if(src && updating_health) - update_health_hud() - update_stats() -/mob/living/simple_animal/hostile/clockwork/marauder/update_health_hud() - if(hud_used && hud_used.healths) - if(istype(hud_used, /datum/hud/marauder)) - var/datum/hud/marauder/M = hud_used - var/resulthealth - if(host) - if(iscarbon(host)) - resulthealth = "[round((abs(HEALTH_THRESHOLD_DEAD - host.health) / abs(HEALTH_THRESHOLD_DEAD - host.maxHealth)) * 100)]%" - else - resulthealth = "[round((host.health / host.maxHealth) * 100, 0.5)]%" - else - resulthealth = "NONE" - M.hosthealth.maptext = "
HOST
[resulthealth]
"
- hud_used.healths.maptext = "[resulthealth]
[round((health / maxHealth) * 100, 0.5)]%"
+/mob/living/simple_animal/hostile/clockwork/marauder/bullet_act(obj/item/projectile/P)
+ if(deflect_projectile(P))
+ return
+ return ..()
-/mob/living/simple_animal/hostile/clockwork/marauder/proc/update_stats()
+/mob/living/simple_animal/hostile/clockwork/marauder/proc/deflect_projectile(obj/item/projectile/P)
+ var/final_deflection_chance = deflect_chance
+ var/energy_projectile = istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)
+ if(P.nodamage || P.damage_type == STAMINA)
+ final_deflection_chance = 100
+ else if(!energy_projectile) //Flat 40% chance against energy projectiles; ballistic projectiles are 40% - (damage of projectile)%, min. 10%
+ final_deflection_chance = max(10, deflect_chance - P.damage)
if(GLOB.ratvar_awakens)
- speed = 0
- melee_damage_lower = 20
- melee_damage_upper = 20
- attacktext = "devastates"
- else
- var/healthpercent = (health/maxHealth) * 100
- switch(healthpercent)
- if(100 to 70) //Bonuses to speed and damage at high health
- speed = 0
- melee_damage_lower = 16
- melee_damage_upper = 16
- attacktext = "viciously slashes"
- if(70 to 40)
- speed = initial(speed)
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- attacktext = initial(attacktext)
- if(40 to 30) //Damage decrease, but not speed
- speed = initial(speed)
- melee_damage_lower = 10
- melee_damage_upper = 10
- attacktext = "lightly slashes"
- if(30 to 20) //Speed decrease
- speed = 2
- melee_damage_lower = 8
- melee_damage_upper = 8
- attacktext = "lightly slashes"
- if(20 to 10) //Massive speed decrease and weak melee attacks
- speed = 3
- melee_damage_lower = 6
- melee_damage_upper = 6
- attacktext = "weakly slashes"
- if(10 to 0) //We are super weak and going to die
- speed = 4
- melee_damage_lower = 4
- melee_damage_upper = 4
- attacktext = "taps"
-
-//ATTACKING, BLOCKING, and COUNTERING
-
-/mob/living/simple_animal/hostile/clockwork/marauder/AttackingTarget()
- if(is_in_host())
- return FALSE
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/bullet_act(obj/item/projectile/Proj)
- if(blockOrCounter(null, Proj))
- return
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/hitby(atom/movable/AM, skipcatch, hitpush, blocked)
- if(blockOrCounter(null, AM))
- return
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/attack_animal(mob/living/simple_animal/M)
- if(istype(M, /mob/living/simple_animal/hostile/clockwork/marauder) || !blockOrCounter(M, M)) //we don't want infinite blockcounter loops if fighting another marauder
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/attack_paw(mob/living/carbon/monkey/M)
- if(!blockOrCounter(M, M))
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(!blockOrCounter(M, M))
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/attack_slime(mob/living/simple_animal/slime/M)
- if(!blockOrCounter(M, M))
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/attack_hand(mob/living/carbon/human/M)
- if(!blockOrCounter(M, M))
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/nullrod) || !blockOrCounter(user, I))
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/proc/blockOrCounter(mob/target, atom/textobject)
- if(GLOB.ratvar_awakens) //if ratvar has woken, we block nearly everything at a very high chance
- blockchance = 90
- counterchance = 90
- if(prob(blockchance))
+ final_deflection_chance = 100
+ else if(GLOB.ratvar_approaches)
+ final_deflection_chance = min(100, final_deflection_chance + 20) //20% bonus to deflection if the servants heralded Ratvar
+ if(prob(final_deflection_chance))
+ visible_message("[src] deflects [P] with their shield!", \
+ "You block [P] with your shield!")
+ if(energy_projectile)
+ playsound(src, 'sound/weapons/effects/searwall.ogg', 50, TRUE)
+ else
+ playsound(src, "ricochet", 50, TRUE)
. = TRUE
- if(target)
- target.do_attack_animation(src)
- target.changeNext_move(CLICK_CD_MELEE)
- blockchance = initial(blockchance)
- playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 30, 1, 0, 1) //clang
- visible_message("[src] blocks [target && isitem(textobject) ? "[target]'s [textobject.name]":"\the [textobject]"]!", \
- "You block [target && isitem(textobject) ? "[target]'s [textobject.name]":"\the [textobject]"]!")
- if(target && Adjacent(target))
- if(prob(counterchance))
- counterchance = initial(counterchance)
- var/previousattacktext = attacktext
- attacktext = "counters"
- UnarmedAttack(target)
- attacktext = previousattacktext
- else
- counterchance = min(counterchance + initial(counterchance), 100)
- else
- blockchance = min(blockchance + initial(blockchance), 100)
- if(GLOB.ratvar_awakens)
- blockchance = 90
- counterchance = 90
-
-//COMMUNICATION and EMERGENCE
-
-/mob/living/simple_animal/hostile/clockwork/marauder/handle_inherent_channels(message, message_mode)
- if(host && (is_in_host() || message_mode == MODE_BINARY))
- marauder_comms(message)
- return TRUE
- return ..()
-
-/mob/living/simple_animal/hostile/clockwork/marauder/proc/marauder_comms(message)
- var/name_part = "[src] ([true_name])"
- message = "\"[message]\"" //Processed output
- to_chat(src, "[name_part]: [message]")
- to_chat(host, "[name_part]: [message]")
- for(var/M in GLOB.mob_list)
- if(isobserver(M))
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [name_part] (to [findtextEx(host.name, host.real_name) ? "[host.name]" : "[host.real_name] (as [host.name])"]): [message] ")
- return TRUE
-
-/mob/living/simple_animal/hostile/clockwork/marauder/proc/return_to_host()
- if(is_in_host())
- return FALSE
- if(!host)
- to_chat(src, "You don't have a host!")
- return FALSE
- var/resulthealth = round((host.health / host.maxHealth) * 100, 0.5)
- if(iscarbon(host))
- resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - host.health) / abs(HEALTH_THRESHOLD_DEAD - host.maxHealth)) * 100)
- host.visible_message("[host]'s skin flashes crimson!", "You feel [true_name]'s consciousness settle in your mind.")
- visible_message("[src] suddenly disappears!", "You return to [host].")
- forceMove(host)
- if(resulthealth > MARAUDER_EMERGE_THRESHOLD && health != maxHealth)
- recovering = TRUE
- to_chat(src, "You have weakened and will need to recover before manifesting again!")
- to_chat(host, "[true_name] has weakened and will need to recover before manifesting again!")
- return TRUE
-
-/mob/living/simple_animal/hostile/clockwork/marauder/proc/try_emerge()
- if(!host)
- to_chat(src, "You don't have a host!")
- return FALSE
- if(!GLOB.ratvar_awakens)
- var/resulthealth = round((host.health / host.maxHealth) * 100, 0.5)
- if(iscarbon(host))
- resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - host.health) / abs(HEALTH_THRESHOLD_DEAD - host.maxHealth)) * 100)
- if(host.stat != DEAD && resulthealth > MARAUDER_EMERGE_THRESHOLD) //if above 20 health, fails
- to_chat(src, "Your host must be at [MARAUDER_EMERGE_THRESHOLD]% or less health to emerge like this!")
- return FALSE
- return emerge_from_host(FALSE)
-
-/mob/living/simple_animal/hostile/clockwork/marauder/proc/emerge_from_host(hostchosen, force) //Notice that this is a proc rather than a verb - marauders can NOT exit at will, but they CAN return
- if(!is_in_host())
- return FALSE
- if(!force && recovering)
- if(hostchosen)
- to_chat(host, "[true_name] is too weak to come forth!")
- else
- to_chat(host, "[true_name] tries to emerge to protect you, but it's too weak!")
- to_chat(src, "You try to come forth, but you're too weak!")
- return FALSE
- if(!force)
- if(hostchosen) //marauder approved
- to_chat(host, "Your words echo with power as [true_name] emerges from your body!")
- else
- to_chat(host, "[true_name] emerges from your body to protect you!")
- forceMove(host.loc)
- visible_message("[host]'s skin glows red as [name] emerges from their body!", "You exit the safety of [host]'s body!")
- return TRUE
-
-/mob/living/simple_animal/hostile/clockwork/marauder/get_alt_name()
- return " ([text2ratvar(true_name)])"
-
-/mob/living/simple_animal/hostile/clockwork/marauder/proc/is_in_host() //Checks if the marauder is inside of their host
- return host && loc == host
-
-//HOST ACTIONS
-
-//Summon Marauder action: Calls forth or recalls your marauder
-/datum/action/innate/summon_marauder
- name = "Force Marauder to Emerge/Recall"
- desc = "Allows you to force your clockwork marauder to emerge or recall as required."
- button_icon_state = "clockwork_marauder"
- background_icon_state = "bg_clock"
- check_flags = AB_CHECK_CONSCIOUS
- buttontooltipstyle = "clockcult"
- var/mob/living/simple_animal/hostile/clockwork/marauder/linked_marauder
- var/static/list/defend_phrases = list("Defend me", "Come forth", "Assist me", "Protect me", "Give aid", "Help me")
- var/static/list/return_phrases = list("Return", "Return to me", "Your job is done", "You have served", "Come back", "Retreat")
-
-/datum/action/innate/summon_marauder/IsAvailable()
- if(!linked_marauder)
- return FALSE
- if(isliving(owner))
- var/mob/living/L = owner
- if(!L.can_speak_vocal() || L.stat)
- return FALSE
- return ..()
-
-/datum/action/innate/summon_marauder/Activate()
- if(linked_marauder.is_in_host())
- clockwork_say(owner, text2ratvar("[pick(defend_phrases)], [linked_marauder.true_name]!"))
- linked_marauder.emerge_from_host(TRUE)
- else
- clockwork_say(owner, text2ratvar("[pick(return_phrases)], [linked_marauder.true_name]!"))
- linked_marauder.return_to_host()
- return TRUE
-
-//Linked Minds action: talks to your marauder
-/datum/action/innate/linked_minds
- name = "Linked Minds"
- desc = "Allows you to silently communicate with your marauder."
- button_icon_state = "linked_minds"
- background_icon_state = "bg_clock"
- check_flags = AB_CHECK_CONSCIOUS
- buttontooltipstyle = "clockcult"
- var/mob/living/simple_animal/hostile/clockwork/marauder/linked_marauder
-
-/datum/action/innate/linked_minds/IsAvailable()
- if(!linked_marauder)
- return FALSE
- return ..()
-
-/datum/action/innate/linked_minds/Activate()
- var/message = stripped_input(owner, "Enter a message to tell your marauder.", "Telepathy")
- if(!owner || !message)
- return FALSE
- if(!linked_marauder)
- to_chat(owner, "Your marauder seems to have been destroyed!")
- return FALSE
- var/name_part = "Servant [findtextEx(owner.name, owner.real_name) ? "[owner.name]" : "[owner.real_name] (as [owner.name])"]"
- message = "\"[message]\"" //Processed output
- to_chat(owner, "[name_part]: [message]")
- to_chat(linked_marauder, "[name_part]: [message]")
- for(var/M in GLOB.mob_list)
- if(isobserver(M))
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [name_part] (to [linked_marauder] ([linked_marauder.true_name])): [message]")
- return TRUE
diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm
index 806d08dffb3..6edaede8df0 100644
--- a/code/game/gamemodes/clock_cult/clock_scripture.dm
+++ b/code/game/gamemodes/clock_cult/clock_scripture.dm
@@ -5,8 +5,6 @@ Pieces of scripture require certain follower counts, contruction value, and acti
Drivers: Unlocked by default
Scripts: 5 servants and a cache
Applications: 8 servants, 3 caches, and 100 CV
-Revenant: 10 servants, 4 caches, and 200 CV
-Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or destroyed
*/
/datum/clockwork_scripture
@@ -15,7 +13,9 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
var/desc = "Ancient Ratvarian lore. This piece seems particularly mundane."
var/list/invocations = list() //Spoken over time in the ancient language of Ratvar. See clock_unsorted.dm for more details on the language and how to make it.
var/channel_time = 10 //In deciseconds, how long a ritual takes to chant
- var/list/consumed_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0) //Components consumed
+ var/power_cost = 5 //In watts, how much a scripture takes to invoke
+ var/special_power_text //If the scripture can use additional power to have a unique function, use this; put POWERCOST here to display the special power cost.
+ var/special_power_cost //This should be a define in __DEFINES/clockcult.dm, such as ABSCOND_ABDUCTION_COST
var/obj/item/clockwork/slab/slab //The parent clockwork slab
var/mob/living/invoker //The slab's holder
var/whispered = FALSE //If the invocation is whispered rather than spoken aloud
@@ -29,11 +29,6 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
var/primary_component
var/sort_priority = 1 //what position the scripture should have in a list of scripture. Should be based off of component costs/reqs, but you can't initial() lists.
-//components the scripture used from a slab
- var/list/used_slab_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0)
-//components the scripture used from the global cache
- var/list/used_cache_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0)
-
//messages for offstation scripture recital, courtesy ratvar's generals(and neovgre)
var/static/list/neovgre_penalty = list("Go to the station.", "Useless.", "Don't waste time.", "Pathetic.", "Wasteful.")
var/static/list/inathneq_penalty = list("Child, this is too far out!", "The barrier isn't thin enough for for me to help!", "Please, go to the station so I can assist you.", \
@@ -57,34 +52,14 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
if(slab.busy)
to_chat(invoker, "[slab] refuses to work, displaying the message: \"[slab.busy]!\"")
return FALSE
- if(invoker.has_status_effect(STATUS_EFFECT_GEISTRACKER))
- to_chat(invoker, "[slab] refuses to work, displaying the message: \"Sustaining Geis!\"")
- return FALSE
slab.busy = "Invocation ([name]) in progress"
if(GLOB.ratvar_awakens)
channel_time *= 0.5 //if ratvar has awoken, half channel time and no cost
else if(!slab.no_cost)
- for(var/i in consumed_components)
- if(consumed_components[i])
- for(var/j in 1 to consumed_components[i])
- if(slab.stored_components[i])
- slab.stored_components[i]--
- used_slab_components[i]++
- else
- GLOB.clockwork_component_cache[i]--
- used_cache_components[i]++
- update_slab_info()
+ adjust_clockwork_power(-power_cost)
channel_time *= slab.speed_multiplier
if(!recital() || !check_special_requirements() || !scripture_effects()) //if we fail any of these, refund components used
- for(var/i in used_slab_components)
- if(used_slab_components[i])
- if(slab)
- slab.stored_components[i] += consumed_components[i]
- else //if we can't find a slab add to the global cache
- GLOB.clockwork_component_cache[i] += consumed_components[i]
- for(var/i in used_cache_components)
- if(used_cache_components[i])
- GLOB.clockwork_component_cache[i] += consumed_components[i]
+ adjust_clockwork_power(power_cost)
update_slab_info()
else
successful = TRUE
@@ -92,6 +67,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
SSblackbox.add_details("clockcult_scripture_recited", name)
if(slab)
slab.busy = null
+ post_recital()
qdel(src)
return successful
@@ -103,23 +79,13 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
return FALSE
return TRUE
-/datum/clockwork_scripture/proc/has_requirements() //if we have the components and invokers to do it
+/datum/clockwork_scripture/proc/has_requirements() //if we have the power and invokers to do it
var/checked_penalty = FALSE
if(!GLOB.ratvar_awakens && !slab.no_cost)
checked_penalty = check_offstation_penalty()
- var/component_printout = "You lack the components to recite this piece of scripture!"
- var/failed = FALSE
- for(var/i in consumed_components)
- var/cache_components = GLOB.clockwork_caches ? GLOB.clockwork_component_cache[i] : 0
- var/total_components = slab.stored_components[i] + cache_components
- if(consumed_components[i] && total_components < consumed_components[i])
- component_printout += "\nYou have [total_components]/[consumed_components[i]] \
- [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]."
- failed = TRUE
- if(failed)
- component_printout += ""
- to_chat(invoker, component_printout)
- return FALSE
+ if(!get_clockwork_power(power_cost))
+ to_chat(invoker, "There isn't enough power to recite this scripture! ([DisplayPower(get_clockwork_power())]/[DisplayPower(power_cost)])")
+ return
if(multiple_invokers_used && !multiple_invokers_optional && !GLOB.ratvar_awakens && !slab.no_cost)
var/nearby_servants = 0
for(var/mob/living/L in range(1, get_turf(invoker)))
@@ -158,13 +124,10 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
/datum/clockwork_scripture/proc/check_offstation_penalty()
var/turf/T = get_turf(invoker)
- if(!T || (!(T.z in GLOB.station_z_levels) && T.z != ZLEVEL_CENTCOM && T.z != ZLEVEL_MINING && T.z != ZLEVEL_LAVALAND))
+ if(!T || (!(T.z in GLOB.station_z_levels) && T.z != ZLEVEL_CENTCOM && T.z != ZLEVEL_MINING && T.z != ZLEVEL_LAVALAND && T.z != ZLEVEL_CITYOFCOGS))
channel_time *= 2
- for(var/i in consumed_components)
- if(consumed_components[i])
- consumed_components[i] *= 2
+ power_cost *= 2
return TRUE
- return FALSE
/datum/clockwork_scripture/proc/check_special_requirements() //Special requirements for scriptures, checked multiple times during invocation
return TRUE
@@ -185,6 +148,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
for(var/invocation in invocations)
if(!do_after(invoker, channel_time / invocations.len, target = invoker, extra_checks = CALLBACK(src, .proc/check_special_requirements)))
slab.busy = null
+ scripture_fail()
return FALSE
if(multiple_invokers_used)
for(var/mob/living/L in range(1, get_turf(invoker)))
@@ -197,6 +161,11 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
/datum/clockwork_scripture/proc/scripture_effects() //The actual effects of the recital after its conclusion
+/datum/clockwork_scripture/proc/scripture_fail() //Called if the scripture fails to invoke.
+
+
+/datum/clockwork_scripture/proc/post_recital() //Called after the scripture is recited
+
//Channeled scripture begins instantly but runs constantly
/datum/clockwork_scripture/channeled
var/list/chant_invocations = list("AYY LMAO")
@@ -228,6 +197,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
//Creates an object at the invoker's feet
/datum/clockwork_scripture/create_object
var/object_path = /obj/item/clockwork //The path of the object created
+ var/put_object_in_hands = TRUE
var/creator_message = "You create a meme." //Shown to the invoker
var/observer_message
var/one_per_tile = FALSE
@@ -256,10 +226,51 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
to_chat(invoker, creator_message)
var/obj/O = new object_path (get_turf(invoker))
O.ratvar_act() //update the new object so it gets buffed if ratvar is alive
- if(isitem(O))
+ if(isitem(O) && put_object_in_hands)
invoker.put_in_hands(O)
return TRUE
+
+//Used specifically to create construct shells.
+/datum/clockwork_scripture/create_object/construct
+ put_object_in_hands = FALSE
+ var/construct_type //The type of construct that the scripture is made to create, even if not directly
+ var/construct_limit = 1 //How many constructs of this type can exist
+ var/combat_construct = FALSE //If this construct is meant for fighting and shouldn't be at the base before the assault phase
+ var/confirmed = FALSE //If we've confirmed that we want to make this construct outside of the station Z
+
+/datum/clockwork_scripture/create_object/construct/check_special_requirements()
+ update_construct_limit()
+ var/constructs = get_constructs()
+ if(constructs >= construct_limit)
+ to_chat(invoker, "There are too many constructs of this type ([constructs])! You may only have [round(construct_limit)] at once.")
+ return
+ var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
+ if(G && !G.active && combat_construct && invoker.z == ZLEVEL_CITYOFCOGS && !confirmed) //Putting marauders on the base during the prep phase is a bad idea mmkay
+ if(alert(invoker, "This is a combat construct, and you cannot easily get it to the station. Are you sure you want to make one here?", "Construct Alert", "Yes", "Cancel") == "Cancel")
+ return
+ if(!is_servant_of_ratvar(invoker) || !invoker.canUseTopic(slab))
+ return
+ confirmed = TRUE
+ return TRUE
+
+/datum/clockwork_scripture/create_object/construct/post_recital()
+ creation_update()
+ confirmed = FALSE
+
+/datum/clockwork_scripture/create_object/construct/proc/get_constructs()
+ var/constructs = 0
+ for(var/V in GLOB.all_clockwork_mobs)
+ if(istype(V, construct_type))
+ constructs++
+ for(var/V in GLOB.all_clockwork_objects)
+ if(istype(V, object_path)) //nice try
+ constructs++
+ return constructs
+
+/datum/clockwork_scripture/create_object/construct/proc/update_construct_limit() //Change this on a per-scripture basis, for dynamic limits
+
+
//Uses a ranged slab ability, returning only when the ability no longer exists(ie, when interrupted) or finishes.
/datum/clockwork_scripture/ranged_ability
var/slab_overlay
diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm
index 2930088ca2b..d7aa2777ca2 100644
--- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm
+++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm
@@ -2,173 +2,35 @@
// APPLICATIONS //
//////////////////
-//Fellowship Armory: Arms the invoker and nearby servants with Ratvarian armor.
-/datum/clockwork_scripture/fellowship_armory
- descname = "Area Servant Armor"
- name = "Fellowship Armory"
- desc = "Equips the invoker and all visible Servants with Ratvarian armor. This armor provides high melee resistance but a weakness to lasers. \
- It grows faster to invoke with more adjacent Servants."
- invocations = list("Shield us...", "...with the...", "... fragments of Engine!")
- channel_time = 100
- consumed_components = list(VANGUARD_COGWHEEL = 4, REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 2)
- usage_tip = "This scripture will replace all weaker armor worn by affected Servants."
- tier = SCRIPTURE_APPLICATION
- multiple_invokers_used = TRUE
- multiple_invokers_optional = TRUE
- primary_component = VANGUARD_COGWHEEL
- sort_priority = 2
- quickbind = TRUE
- quickbind_desc = "Attempts to armor all nearby Servants with powerful Ratvarian armor."
- var/static/list/ratvarian_armor_typecache = typecacheof(list(
- /obj/item/clothing/suit/armor/clockwork,
- /obj/item/clothing/head/helmet/clockwork,
- /obj/item/clothing/gloves/clockwork,
- /obj/item/clothing/shoes/clockwork)) //don't replace this ever
- var/static/list/better_armor_typecache = typecacheof(list(
- /obj/item/clothing/suit/space,
- /obj/item/clothing/head/helmet/space,
- /obj/item/clothing/shoes/magboots)) //replace this only if ratvar is up
-/datum/clockwork_scripture/fellowship_armory/run_scripture()
- for(var/mob/living/L in orange(1, invoker))
- if(can_recite_scripture(L))
- channel_time = max(channel_time - 10, 0)
- return ..()
-
-/datum/clockwork_scripture/fellowship_armory/scripture_effects()
- var/affected = 0
- for(var/mob/living/L in view(7, get_turf(invoker)))
- if(L.stat == DEAD || !is_servant_of_ratvar(L))
- continue
- var/do_message = 0
- var/obj/item/I = L.get_item_by_slot(slot_wear_suit)
- if(remove_item_if_better(I, L))
- do_message += L.equip_to_slot_or_del(new/obj/item/clothing/suit/armor/clockwork(null), slot_wear_suit)
- I = L.get_item_by_slot(slot_head)
- if(remove_item_if_better(I, L))
- do_message += L.equip_to_slot_or_del(new/obj/item/clothing/head/helmet/clockwork(null), slot_head)
- I = L.get_item_by_slot(slot_gloves)
- if(remove_item_if_better(I, L))
- do_message += L.equip_to_slot_or_del(new/obj/item/clothing/gloves/clockwork(null), slot_gloves)
- I = L.get_item_by_slot(slot_shoes)
- if(remove_item_if_better(I, L))
- do_message += L.equip_to_slot_or_del(new/obj/item/clothing/shoes/clockwork(null), slot_shoes)
- if(do_message)
- L.visible_message("Strange armor appears on [L]!", "A bright shimmer runs down your body, equipping you with Ratvarian armor.")
- playsound(L, 'sound/magic/clockwork/fellowship_armory.ogg', 15*do_message, 1) //get sound loudness based on how much we equipped
- affected++
- return affected
-
-/datum/clockwork_scripture/fellowship_armory/proc/remove_item_if_better(obj/item/I, mob/user)
- if(!I)
- return TRUE
- if(is_type_in_typecache(I, ratvarian_armor_typecache))
- return FALSE
- if(!GLOB.ratvar_awakens && is_type_in_typecache(I, better_armor_typecache))
- return FALSE
- return user.dropItemToGround(I)
-
-//Memory Allocation: Finds a willing ghost and makes them into a clockwork marauders for the invoker.
-/datum/clockwork_scripture/memory_allocation
- descname = "Guardian"
- name = "Memory Allocation"
- desc = "Allocates part of your consciousness to a Clockwork Marauder, a vigilant fighter that lives within you, able to be \
- called forth by Speaking its True Name or if you become exceptionally low on health.
\ - If it remains close to you, you will gradually regain health up to a low amount, but it will die if it goes too far from you." - invocations = list("Fright's will...", "...call forth...") - channel_time = 100 - consumed_components = list(BELLIGERENT_EYE = 2, VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 4) - usage_tip = "Marauders are useful as personal bodyguards and frontline warriors." - tier = SCRIPTURE_APPLICATION - primary_component = GEIS_CAPACITOR - sort_priority = 3 - -/datum/clockwork_scripture/memory_allocation/check_special_requirements() - for(var/mob/living/simple_animal/hostile/clockwork/marauder/M in GLOB.all_clockwork_mobs) - if(M.host == invoker) - to_chat(invoker, "You can only house one marauder at a time!") - return FALSE - return TRUE - -/datum/clockwork_scripture/memory_allocation/scripture_effects() - return create_marauder() - -/datum/clockwork_scripture/memory_allocation/proc/create_marauder() - invoker.visible_message("A purple tendril appears from [invoker]'s [slab.name] and impales itself in [invoker.p_their()] forehead!", \ - "A tendril flies from [slab] into your forehead. You begin waiting while it painfully rearranges your thought pattern...") - invoker.notransform = TRUE //Vulnerable during the process - slab.busy = "Thought Modification in progress" - if(!do_after(invoker, 50, target = invoker)) - invoker.visible_message("The tendril, covered in blood, retracts from [invoker]'s head and back into the [slab.name]!", \ - "Total agony overcomes you as the tendril is forced out early!") - invoker.notransform = FALSE - invoker.Knockdown(100) - invoker.apply_damage(10, BRUTE, "head") - slab.busy = null - return FALSE - clockwork_say(invoker, text2ratvar("...the mind made...")) - invoker.notransform = FALSE - slab.busy = "Marauder Selection in progress" - if(!check_special_requirements()) - return FALSE - to_chat(invoker, "The tendril shivers slightly as it selects a marauder...") - var/list/marauder_candidates = pollGhostCandidates("Do you want to play as the clockwork marauder of [invoker.real_name]?", ROLE_SERVANT_OF_RATVAR, null, FALSE, 50, POLL_IGNORE_CLOCKWORK_MARAUDER) - if(!check_special_requirements()) - return FALSE - if(!marauder_candidates.len) - invoker.visible_message("The tendril retracts from [invoker]'s head, sealing the entry wound as it does so!", \ - "The tendril was unsuccessful! Perhaps you should try again another time.") - return FALSE - clockwork_say(invoker, text2ratvar("...sword and shield!")) - var/mob/dead/observer/theghost = pick(marauder_candidates) - var/mob/living/simple_animal/hostile/clockwork/marauder/M = new(invoker) - M.key = theghost.key - M.bind_to_host(invoker) - invoker.visible_message("The tendril retracts from [invoker]'s head, sealing the entry wound as it does so!", \ - "[M.true_name], a clockwork marauder, has taken up residence in your mind. Communicate with it via the \"Linked Minds\" action button.") - return TRUE - - -//Sigil of Transmission: Creates a sigil of transmission that can drain and store power for clockwork structures. -/datum/clockwork_scripture/create_object/sigil_of_transmission - descname = "Structure Power Generator & Battery" - name = "Sigil of Transmission" - desc = "Places a sigil that can drain and will store energy to power clockwork structures." - invocations = list("Divinity...", "...power our creations!") - channel_time = 70 - consumed_components = list(VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 2, HIEROPHANT_ANSIBLE = 4) - whispered = TRUE - object_path = /obj/effect/clockwork/sigil/transmission - creator_message = "A sigil silently appears below you. It will automatically power clockwork structures near it and will drain power when activated." - usage_tip = "Cyborgs can charge from this sigil by remaining over it for 5 seconds." +//Clockwork Marauder: Creates a construct shell for a clockwork marauder, a well-rounded frontline fighter. +/datum/clockwork_scripture/create_object/construct/clockwork_marauder + descname = "Well-Rounded Combat Construct" + name = "Clockwork Marauder" + desc = "Creates a shell for a clockwork marauder, a balanced frontline construct." + invocations = list("Arise, avatar of Arbiter!", "Defend the Ark with vengeful zeal.") + channel_time = 50 + power_cost = 1000 + creator_message = "Your slab disgorges several chunks of replicant alloy that form into a suit of thrumming armor." + usage_tip = "The marauder's shield can effectively deflect energy-based projectiles." tier = SCRIPTURE_APPLICATION one_per_tile = TRUE - primary_component = HIEROPHANT_ANSIBLE - sort_priority = 5 + primary_component = BELLIGERENT_EYE + sort_priority = 1 quickbind = TRUE - quickbind_desc = "Creates a Sigil of Transmission, which can drain and will store power for clockwork structures." + quickbind_desc = "Creates a clockwork marauder, used for frontline combat." + object_path = /obj/item/clockwork/construct_chassis/clockwork_marauder + construct_type = /mob/living/simple_animal/hostile/clockwork/marauder + combat_construct = TRUE - -//Prolonging Prism: Creates a prism that will delay the shuttle at a power cost -/datum/clockwork_scripture/create_object/prolonging_prism - descname = "Powered Structure, Delay Emergency Shuttles" - name = "Prolonging Prism" - desc = "Creates a mechanized prism which will delay the arrival of an emergency shuttle by 2 minutes at a massive power cost." - invocations = list("May this prism...", "...grant us time to enact his will!") - channel_time = 80 - consumed_components = list(VANGUARD_COGWHEEL = 5, GEIS_CAPACITOR = 2, REPLICANT_ALLOY = 2) - object_path = /obj/structure/destructible/clockwork/powered/prolonging_prism - creator_message = "You form a prolonging prism, which will delay the arrival of an emergency shuttle at a massive power cost." - observer_message = "An onyx prism forms in midair and sprouts tendrils to support itself!" - invokers_required = 2 - multiple_invokers_used = TRUE - usage_tip = "The power cost to delay a shuttle increases based on the number of times activated." - tier = SCRIPTURE_APPLICATION - one_per_tile = TRUE - primary_component = VANGUARD_COGWHEEL - sort_priority = 7 - quickbind = TRUE - quickbind_desc = "Creates a Prolonging Prism, which will delay the arrival of an emergency shuttle by 2 minutes at a massive power cost." +/datum/clockwork_scripture/create_object/construct/clockwork_marauder/update_construct_limit() + var/human_servants = 0 + for(var/V in SSticker.mode.servants_of_ratvar) + var/datum/mind/M = V + if(ishuman(M.current)) + human_servants++ + construct_limit = human_servants / 4 //1 per 4 human servants, and a maximum of 3 marauders + construct_limit = Clamp(construct_limit, 1, 3) /datum/clockwork_scripture/create_object/prolonging_prism/check_special_requirements() if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) @@ -188,7 +50,7 @@ desc = "Creates a mania motor which causes minor damage and a variety of negative mental effects in nearby non-Servant humans, potentially up to and including conversion." invocations = list("May this transmitter...", "...break the will of all who oppose us!") channel_time = 80 - consumed_components = list(GEIS_CAPACITOR = 5, REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 2) + power_cost = 750 object_path = /obj/structure/destructible/clockwork/powered/mania_motor creator_message = "You form a mania motor, which causes minor damage and negative mental effects in non-Servants." observer_message = "A two-pronged machine rises from the ground!" @@ -198,31 +60,29 @@ tier = SCRIPTURE_APPLICATION one_per_tile = TRUE primary_component = GEIS_CAPACITOR - sort_priority = 8 + sort_priority = 2 quickbind = TRUE quickbind_desc = "Creates a Mania Motor, which causes minor damage and negative mental effects in non-Servants." -//Tinkerer's Daemon: Creates an efficient machine that rapidly produces components at a power cost. -/datum/clockwork_scripture/create_object/tinkerers_daemon - descname = "Powered Structure, Component Generator" - name = "Tinkerer's Daemon" - desc = "Creates a tinkerer's daemon which can rapidly collect components. It will only function if it has sufficient power, active daemons are outnumbered by Servants by a ratio of 5:1, \ - and there is at least one existing cache." - invocations = list("May this generator...", "...collect Engine parts that yet hold greatness!") - channel_time = 80 - consumed_components = list(BELLIGERENT_EYE = 2, GEIS_CAPACITOR = 2, REPLICANT_ALLOY = 5) - object_path = /obj/structure/destructible/clockwork/powered/tinkerers_daemon - creator_message = "You form a tinkerer's daemon which can rapidly collect components at a power cost." - invokers_required = 2 - multiple_invokers_used = TRUE - usage_tip = "Vital to your success!" +//Sigil of Transmission: Creates a sigil of transmission that can drain and store power for clockwork structures. +/datum/clockwork_scripture/create_object/sigil_of_transmission + descname = "Structure Power Generator & Battery" + name = "Sigil of Transmission" + desc = "Places a sigil that can drain and will store energy to power clockwork structures." + invocations = list("Divinity...", "...power our creations!") + channel_time = 70 + power_cost = 200 + whispered = TRUE + object_path = /obj/effect/clockwork/sigil/transmission + creator_message = "A sigil silently appears below you. It will automatically power clockwork structures near it and will drain power when activated." + usage_tip = "Cyborgs can charge from this sigil by remaining over it for 5 seconds." tier = SCRIPTURE_APPLICATION one_per_tile = TRUE - primary_component = REPLICANT_ALLOY - sort_priority = 9 + primary_component = HIEROPHANT_ANSIBLE + sort_priority = 3 quickbind = TRUE - quickbind_desc = "Creates a Tinkerer's Daemon, which can rapidly collect components for power." + quickbind_desc = "Creates a Sigil of Transmission, which can drain and will store power for clockwork structures." //Clockwork Obelisk: Creates a powerful obelisk that can be used to broadcast messages or open a gateway to any servant or clockwork obelisk at a power cost. @@ -232,7 +92,7 @@ desc = "Creates a clockwork obelisk that can broadcast messages over the Hierophant Network or open a Spatial Gateway to any living Servant or clockwork obelisk." invocations = list("May this obelisk...", "...take us to all places!") channel_time = 80 - consumed_components = list(BELLIGERENT_EYE = 2, VANGUARD_COGWHEEL = 2, HIEROPHANT_ANSIBLE = 5) + power_cost = 300 object_path = /obj/structure/destructible/clockwork/powered/clockwork_obelisk creator_message = "You form a clockwork obelisk which can broadcast messages or produce Spatial Gateways." observer_message = "A brass obelisk appears hanging in midair!" @@ -242,6 +102,6 @@ tier = SCRIPTURE_APPLICATION one_per_tile = TRUE primary_component = HIEROPHANT_ANSIBLE - sort_priority = 10 + sort_priority = 4 quickbind = TRUE quickbind_desc = "Creates a Clockwork Obelisk, which can send messages or open Spatial Gateways with power." diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm index fa61e3ca316..19dee4e347a 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm @@ -2,47 +2,47 @@ // DRIVERS // ///////////// -//Belligerent: Channeled for up to fifteen times over thirty seconds. Forces non-servants that can hear the chant to walk, doing minor damage. Nar-Sian cultists are burned. -/datum/clockwork_scripture/channeled/belligerent - descname = "Channeled, Area Slowdown" - name = "Belligerent" - desc = "Forces all nearby non-servants to walk rather than run, doing minor damage. Chanted every two seconds for up to thirty seconds." - chant_invocations = list("Punish their blindness!", "Take time, make slow!") - chant_amount = 15 - chant_interval = 20 - channel_time = 20 - usage_tip = "Useful for crowd control in a populated area and disrupting mass movement." +//Hateful Manacles: Applies restraints from melee over several seconds. The restraints function like handcuffs and break on removal. +/datum/clockwork_scripture/ranged_ability/hateful_manacles + descname = "Handcuffs" + name = "Hateful Manacles" + desc = "Forms replicant manacles around a target's wrists that function like handcuffs." + invocations = list("Shackle the heretic!", "Break them in body and spirit!") + channel_time = 15 + power_cost = 25 + whispered = TRUE + usage_tip = "The manacles are about as strong as zipties, and break when removed." tier = SCRIPTURE_DRIVER primary_component = BELLIGERENT_EYE sort_priority = 1 + ranged_type = /obj/effect/proc_holder/slab/hateful_manacles + slab_overlay = "hateful_manacles" + ranged_message = "You charge the clockwork slab with divine energy.\n\ + Left-click a target within melee range to shackle!\n\ + Click your slab to cancel." + timeout_time = 200 quickbind = TRUE - quickbind_desc = "Forces nearby non-Servants to walk, doing minor damage with each chant.
Maximum 15 chants." - -/datum/clockwork_scripture/channeled/belligerent/chant_effects(chant_number) - for(var/mob/living/carbon/C in hearers(7, invoker)) - C.apply_status_effect(STATUS_EFFECT_BELLIGERENT) - new /obj/effect/temp_visual/ratvar/belligerent(get_turf(invoker)) - return TRUE + quickbind_desc = "Applies handcuffs to a struck target." -//Judicial Visor: Creates a judicial visor, which can smite an area. -/datum/clockwork_scripture/create_object/judicial_visor - descname = "Delayed Area Knockdown Glasses" - name = "Judicial Visor" - desc = "Creates a visor that can smite an area, applying Belligerent and briefly stunning. The smote area will explode after 3 seconds." - invocations = list("Grant me the flames of Engine!") - channel_time = 10 - consumed_components = list(BELLIGERENT_EYE = 1) +//Sigil of Transgression: Creates a sigil of transgression, which briefly stuns and applies Belligerent to the first non-servant to cross it. +/datum/clockwork_scripture/create_object/sigil_of_transgression + descname = "Trap, Stunning" + name = "Sigil of Transgression" + desc = "Wards a tile with a sigil, which will briefly stun the next non-Servant to cross it and apply Belligerent to them." + invocations = list("Divinity, smite...", "...those who tresspass here!") + channel_time = 50 + power_cost = 50 whispered = TRUE - object_path = /obj/item/clothing/glasses/judicial_visor - creator_message = "You form a judicial visor, which is capable of smiting a small area." - usage_tip = "The visor has a thirty-second cooldown once used." + object_path = /obj/effect/clockwork/sigil/transgression + creator_message = "A sigil silently appears below you. The next non-Servant to cross it will be smitten." + usage_tip = "The sigil does not silence its victim, and is generally used to soften potential converts or would-be invaders." tier = SCRIPTURE_DRIVER - space_allowed = TRUE + one_per_tile = TRUE primary_component = BELLIGERENT_EYE sort_priority = 2 quickbind = TRUE - quickbind_desc = "Creates a Judicial Visor, which can smite an area, applying Belligerent and briefly stunning." + quickbind_desc = "Creates a Sigil of Transgression, which will briefly stun and slow the next non-Servant to cross it." //Vanguard: Provides twenty seconds of stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker. @@ -53,6 +53,7 @@ Excessive absorption will cause unconsciousness." invocations = list("Shield me...", "...from darkness!") channel_time = 30 + power_cost = 25 usage_tip = "You cannot reactivate Vanguard while still shielded by it." tier = SCRIPTURE_DRIVER primary_component = VANGUARD_COGWHEEL @@ -84,7 +85,7 @@ desc = "Charges your slab with healing power, allowing you to convert all of a target Servant's brute, burn, and oxygen damage to half as much toxin damage." invocations = list("Mend the wounds of...", "...my inferior flesh.") channel_time = 30 - consumed_components = list(VANGUARD_COGWHEEL = 1) + power_cost = 100 usage_tip = "The Compromise is very fast to invoke, and will remove holy water from the target Servant." tier = SCRIPTURE_DRIVER primary_component = VANGUARD_COGWHEEL @@ -98,38 +99,77 @@ Click your slab to cancel." -//Geis: Grants a short-range binding attack that allows you to mute and drag around a target in a very obvious manner. -/datum/clockwork_scripture/ranged_ability/geis - descname = "Melee Mute & Stun" - name = "Geis" - desc = "Charges your slab with divine energy, allowing you to bind and pull a struck heretic." - invocations = list("Divinity, grant me strength...", "...to bind the heathen!") +//Abscond: Used to return to Reebe. +/datum/clockwork_scripture/abscond + descname = "Return to Reebe" + name = "Abscond" + desc = "Yanks you through space, returning you to home base." + invocations = list("As we bid farewell, and return to the stars...", "...we shall find our way home.") whispered = TRUE - channel_time = 20 - usage_tip = "You CANNOT TAKE ANY NON-PULL ACTIONS while the target is bound, so Sigils of Submission should be placed before use." + channel_time = 50 + power_cost = 5 + special_power_text = "POWERCOST to bring pulled creature" + special_power_cost = ABSCOND_ABDUCTION_COST + usage_tip = "This can't be used while on Reebe, for obvious reasons." tier = SCRIPTURE_DRIVER primary_component = GEIS_CAPACITOR sort_priority = 5 quickbind = TRUE - quickbind_desc = "Allows you to bind and mute an adjacent target non-Servant.
Click your slab to disable." - slab_overlay = "geis" - ranged_type = /obj/effect/proc_holder/slab/geis - ranged_message = "You charge the clockwork slab with divine energy.\n\ - Left-click a target within melee range to bind!\n\ - Click your slab to cancel." - timeout_time = 100 + quickbind_desc = "Returns you to Reebe." -/datum/clockwork_scripture/ranged_ability/geis/run_scripture() - var/servants = 0 - if(!GLOB.ratvar_awakens) - for(var/mob/living/M in GLOB.living_mob_list) - if(can_recite_scripture(M, TRUE)) - servants++ - if(servants > SCRIPT_SERVANT_REQ) - whispered = FALSE - servants -= SCRIPT_SERVANT_REQ - channel_time = min(channel_time + servants*3, 50) - return ..() +/datum/clockwork_scripture/abscond/check_special_requirements() + if(invoker.z == ZLEVEL_CITYOFCOGS) + to_chat(invoker, "You're already at Reebe.") + return + return TRUE + +/datum/clockwork_scripture/abscond/recital() + animate(invoker.client, color = "#AF0AAF", time = 50) + . = ..() + +/datum/clockwork_scripture/abscond/scripture_effects() + var/take_pulling = invoker.pulling && isliving(invoker.pulling) && get_clockwork_power(ABSCOND_ABDUCTION_COST) + var/turf/T = get_turf(pick(GLOB.servant_spawns)) + invoker.visible_message("[invoker] flickers and phases out of existence!", \ + "You feel a dizzying sense of vertigo as you're yanked back to Reebe!") + T.visible_message("[invoker] flickers and phases into existence!") + playsound(invoker, 'sound/magic/magic_missile.ogg', 50, TRUE) + playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE) + do_sparks(5, TRUE, invoker) + do_sparks(5, TRUE, T) + if(take_pulling) + adjust_clockwork_power(-special_power_cost) + invoker.pulling.forceMove(T) + invoker.forceMove(T) + if(invoker.client) + animate(invoker.client, color = initial(invoker.client.color), time = 25) + +/datum/clockwork_scripture/abscond/scripture_fail() + if(invoker && invoker.client) + animate(invoker.client, color = initial(invoker.client.color), time = 10) + + +//Kindle: Charges the slab with blazing energy. It can be released to stun and silence a target. +/datum/clockwork_scripture/ranged_ability/kindle + descname = "Short-Range Single-Target Stun" + name = "Kindle" + desc = "Charges your slab with divine energy, allowing you to overwhelm a target with Ratvar's light." + invocations = list("Divinity, show them your light!") + whispered = TRUE + channel_time = 30 + power_cost = 125 + usage_tip = "The light can be used from up to two tiles away. Damage taken will GREATLY REDUCE the stun's duration." + tier = SCRIPTURE_DRIVER + primary_component = GEIS_CAPACITOR + sort_priority = 6 + slab_overlay = "volt" + ranged_type = /obj/effect/proc_holder/slab/kindle + ranged_message = "You charge the clockwork slab with divine energy.\n\ + Left-click a target within melee range to stun!\n\ + Click your slab to cancel." + timeout_time = 150 + quickbind = TRUE + quickbind_desc = "Stuns and mutes a target from a short range." //Sigil of Submission: Creates a sigil of submission, which converts one heretic above it after a delay. @@ -139,7 +179,7 @@ desc = "Places a luminous sigil that will convert any non-Servants that remain on it for 8 seconds." invocations = list("Divinity, enlighten...", "...those who trespass here!") channel_time = 60 - consumed_components = list(GEIS_CAPACITOR = 1) + power_cost = 125 whispered = TRUE object_path = /obj/effect/clockwork/sigil/submission creator_message = "A luminous sigil appears below you. Any non-Servants to cross it will be converted after 8 seconds if they do not move." @@ -159,6 +199,7 @@ desc = "Creates a new clockwork slab." invocations = list("Metal, become greater!") channel_time = 10 + power_cost = 25 whispered = TRUE object_path = /obj/item/clockwork/slab creator_message = "You copy a piece of replicant alloy and command it into a new slab." @@ -171,37 +212,44 @@ quickbind_desc = "Creates a new Clockwork Slab." -//Tinkerer's Cache: Creates a tinkerer's cache, allowing global component storage. -/datum/clockwork_scripture/create_object/tinkerers_cache - descname = "Necessary Structure, Shares Components" - name = "Tinkerer's Cache" - desc = "Forms a cache that can store an infinite amount of components. All caches are linked and will provide components to slabs. \ - Striking a cache with a slab will transfer that slab's components to the global cache." - invocations = list("Constructing...", "...a cache!") +//Stargazer: Creates a stargazer, a cheap power generator that utilizes starlight. +/datum/clockwork_scripture/create_object/stargazer + descname = "Necessary Structure, Generates Power From Starlight" + name = "Stargazer" + desc = "Forms a weak structure that generates power every second while within three tiles of starlight." + invocations = list("Capture their inferior light for us!") channel_time = 50 - consumed_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 0) - object_path = /obj/structure/destructible/clockwork/cache - creator_message = "You form a tinkerer's cache, which is capable of storing components, which will automatically be used by slabs." - observer_message = "A hollow brass spire rises and begins to blaze!" - usage_tip = "Slabs will draw components from the global cache after the slab's own repositories, making caches extremely useful." + power_cost = 50 + object_path = /obj/structure/destructible/clockwork/stargazer + creator_message = "You form a stargazer, which will generate power near starlight." + observer_message = "A large lantern-shaped machine forms!" + usage_tip = "For obvious reasons, make sure to place this near a window or somewhere else that can see space!" tier = SCRIPTURE_DRIVER one_per_tile = TRUE primary_component = REPLICANT_ALLOY sort_priority = 8 quickbind = TRUE - quickbind_desc = "Creates a Tinkerer's Cache, which stores components globally for slab access." - var/static/prev_cost = 0 + quickbind_desc = "Creates a stargazer, which generates power when near starlight." -/datum/clockwork_scripture/create_object/tinkerers_cache/creation_update() - var/cache_cost_increase = min(round(GLOB.clockwork_caches*0.4), 10) - if(cache_cost_increase != prev_cost) - prev_cost = cache_cost_increase - consumed_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 0) - for(var/i in consumed_components) - if(i != REPLICANT_ALLOY) - consumed_components[i] += cache_cost_increase - return TRUE - return FALSE + +//Integration Cog: Creates an integration cog that can be inserted into APCs to passively siphon power. +/datum/clockwork_scripture/create_object/integration_cog + descname = "APC Power Siphoner" + name = "Integration Cog" + desc = "Fabricates an integration cog, which can be used on an open APC to replace its innards and passively siphon its power." + invocations = list("Take that which sustains them!") + channel_time = 10 + power_cost = 10 + whispered = TRUE + object_path = /obj/item/clockwork/integration_cog + creator_message = "You form an integration cog, which can be inserted into an open APC to passively siphon power." + usage_tip = "Tampering isn't visible unless the APC is opened." + tier = SCRIPTURE_DRIVER + space_allowed = TRUE + primary_component = HIEROPHANT_ANSIBLE + sort_priority = 9 + quickbind = TRUE + quickbind_desc = "Creates an integration cog, which can be used to siphon power from an open APC." //Wraith Spectacles: Creates a pair of wraith spectacles, which grant xray vision but damage vision slowly. @@ -211,6 +259,7 @@ desc = "Fabricates a pair of glasses which grant true sight but cause gradual vision loss." invocations = list("Show the truth of this world to me!") channel_time = 10 + power_cost = 50 whispered = TRUE object_path = /obj/item/clothing/glasses/wraith_spectacles creator_message = "You form a pair of wraith spectacles, which grant true sight but cause gradual vision loss." @@ -218,26 +267,6 @@ tier = SCRIPTURE_DRIVER space_allowed = TRUE primary_component = HIEROPHANT_ANSIBLE - sort_priority = 9 - quickbind = TRUE - quickbind_desc = "Creates a pair of Wraith Spectacles, which grant true sight but cause gradual vision loss." - - -//Sigil of Transgression: Creates a sigil of transgression, which stuns the first nonservant to cross it. -/datum/clockwork_scripture/create_object/sigil_of_transgression - descname = "Trap, Stunning" - name = "Sigil of Transgression" - desc = "Wards a tile with a sigil, which will stun the next non-Servant to cross it." - invocations = list("Divinity, smite...", "...those who tresspass here!") - channel_time = 50 - consumed_components = list(HIEROPHANT_ANSIBLE = 1) - whispered = TRUE - object_path = /obj/effect/clockwork/sigil/transgression - creator_message = "A sigil silently appears below you. The next non-Servant to cross it will be stunned." - usage_tip = "The sigil, while fairly powerful in its stun, does not induce muteness in its victim." - tier = SCRIPTURE_DRIVER - one_per_tile = TRUE - primary_component = HIEROPHANT_ANSIBLE sort_priority = 10 quickbind = TRUE - quickbind_desc = "Creates a Sigil of Transgression, which will stun the next non-Servant to cross it." + quickbind_desc = "Creates a pair of Wraith Spectacles, which grant true sight but cause gradual vision loss." diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm deleted file mode 100644 index c7daef14507..00000000000 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm +++ /dev/null @@ -1,42 +0,0 @@ -/////////////// -// JUDGEMENT // -/////////////// - -//Ark of the Clockwork Justiciar: Creates a Gateway to the Celestial Derelict, summoning ratvar. -/datum/clockwork_scripture/create_object/ark_of_the_clockwork_justiciar - descname = "Structure, Win Condition" - name = "Ark of the Clockwork Justiciar" - desc = "Tears apart a rift in spacetime to Reebe, the Celestial Derelict, using a massive amount of components.\n\ - This gateway will, after some time, call forth Ratvar from his exile and massively empower all scriptures and tools." - invocations = list("ARMORER! FRIGHT! AMPERAGE! VANGUARD! I CALL UPON YOU!!", \ - "THE TIME HAS COME FOR OUR MASTER TO BREAK THE CHAINS OF EXILE!!", \ - "LEND US YOUR AID! ENGINE COMES!!") - channel_time = 150 - consumed_components = list(BELLIGERENT_EYE = ARK_SUMMON_COST, VANGUARD_COGWHEEL = ARK_SUMMON_COST, GEIS_CAPACITOR = ARK_SUMMON_COST, REPLICANT_ALLOY = ARK_SUMMON_COST, HIEROPHANT_ANSIBLE = ARK_SUMMON_COST) - invokers_required = 6 - multiple_invokers_used = TRUE - object_path = /obj/structure/destructible/clockwork/massive/celestial_gateway - creator_message = null - usage_tip = "The gateway is completely vulnerable to attack during its five-minute duration. It will periodically give indication of its general position to everyone on the station \ - as well as being loud enough to be heard throughout the entire sector. Defend it with your life!" - tier = SCRIPTURE_JUDGEMENT - sort_priority = 1 - -/datum/clockwork_scripture/create_object/ark_of_the_clockwork_justiciar/check_special_requirements() - if(!slab.no_cost) - if(GLOB.ratvar_awakens) - to_chat(invoker, "\"I am already here, idiot.\"") - return FALSE - for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in GLOB.all_clockwork_objects) - var/area/gate_area = get_area(G) - to_chat(invoker, "There is already an Ark at [gate_area.map_name]!") - return FALSE - var/area/A = get_area(invoker) - var/turf/T = get_turf(invoker) - if(!T || !(T.z in GLOB.station_z_levels) || istype(A, /area/shuttle) || !A.blob_allowed) - to_chat(invoker, "You must be on the station to activate the Ark!") - return FALSE - if(GLOB.clockwork_gateway_activated) - to_chat(invoker, "Ratvar's recent banishment renders him too weak to be wrung forth from Reebe!") - return FALSE - return ..() diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index 0e42af3a656..16a6f3ffd7a 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -7,9 +7,9 @@ descname = "Structure, Turret" name = "Ocular Warden" desc = "Forms an automatic short-range turret which will automatically attack nearby unrestrained non-Servants that can see it." - invocations = list("Guardians...", "...of the Engine...", "...defend us!") - channel_time = 120 - consumed_components = list(BELLIGERENT_EYE = 2, REPLICANT_ALLOY = 1) + invocations = list("Guardians of Engine...", "...judge those who would harm us!") + channel_time = 100 + power_cost = 250 object_path = /obj/structure/destructible/clockwork/ocular_warden creator_message = "You form an ocular warden, which will automatically attack nearby unrestrained non-Servants that can see it." observer_message = "A brass eye takes shape and slowly rises into the air, its red iris glaring!" @@ -29,15 +29,35 @@ return ..() +//Judicial Visor: Creates a judicial visor, which can smite an area. +/datum/clockwork_scripture/create_object/judicial_visor + descname = "Delayed Area Knockdown Glasses" + name = "Judicial Visor" + desc = "Creates a visor that can smite an area, applying Belligerent and briefly stunning. The smote area will explode after 3 seconds." + invocations = list("Grant me the flames of Engine!") + channel_time = 10 + power_cost = 400 + whispered = TRUE + object_path = /obj/item/clothing/glasses/judicial_visor + creator_message = "You form a judicial visor, which is capable of smiting a small area." + usage_tip = "The visor has a thirty-second cooldown once used." + tier = SCRIPTURE_SCRIPT + space_allowed = TRUE + primary_component = BELLIGERENT_EYE + sort_priority = 2 + quickbind = TRUE + quickbind_desc = "Creates a Judicial Visor, which can smite an area, applying Belligerent and briefly stunning." + + //Vitality Matrix: Creates a sigil which will drain health from nonservants and can use that health to heal or even revive servants. /datum/clockwork_scripture/create_object/vitality_matrix descname = "Trap, Damage to Healing" name = "Vitality Matrix" desc = "Places a sigil that drains life from any living non-Servants that cross it, producing Vitality. Servants that cross it, however, will be healed using existing Vitality. \ Dead Servants can be revived by this sigil at a cost of 150 Vitality." - invocations = list("Divinity...", "...steal their life...", "...for these shells!") + invocations = list("Divinity, siphon their essence...", "...for this shell to consume.") channel_time = 60 - consumed_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 2) + power_cost = 1000 whispered = TRUE object_path = /obj/effect/clockwork/sigil/vitality creator_message = "A vitality matrix appears below you. It will drain life from non-Servants and heal Servants that cross it." @@ -58,7 +78,7 @@ chant_invocations = list("Mend our dents!", "Heal our scratches!", "Repair our gears!") chant_amount = 10 chant_interval = 20 - consumed_components = list(VANGUARD_COGWHEEL = 2, REPLICANT_ALLOY = 1) + power_cost = 1000 usage_tip = "This is a very effective way to rapidly reinforce a base after an attack." tier = SCRIPTURE_SCRIPT primary_component = VANGUARD_COGWHEEL @@ -169,76 +189,115 @@ desc = "Forms a device that, when used on certain objects, replaces them with their Ratvarian equivalents. It requires power to function." invocations = list("With this device...", "...his presence shall be made known.") channel_time = 20 - consumed_components = list(GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 2) + power_cost = 250 whispered = TRUE - object_path = /obj/item/clockwork/replica_fabricator/preloaded + object_path = /obj/item/clockwork/replica_fabricator creator_message = "You form a replica fabricator." usage_tip = "Clockwork Walls cause nearby Tinkerer's Caches to generate components passively, making this a vital tool. Clockwork Floors heal toxin damage in Servants standing on them." tier = SCRIPTURE_SCRIPT space_allowed = TRUE primary_component = REPLICANT_ALLOY - sort_priority = 7 + sort_priority = 5 quickbind = TRUE quickbind_desc = "Creates a Replica Fabricator, which can convert various objects to Ratvarian variants." -//Function Call: Grants the invoker the ability to call forth a Ratvarian spear that deals significant damage to silicons. -/datum/clockwork_scripture/function_call - descname = "Permanent Summonable Spear" - name = "Function Call" - desc = "Grants the invoker the ability to call forth a powerful Ratvarian spear every 3 minutes, with it lasting 3 minutes. The spear's attacks will generate Vitality, used for healing." - invocations = list("Grant me...", "...the might of brass!") +//Clockwork Arnaments: Grants the invoker the ability to call forth a Ratvarian spear and clockwork armor. +/datum/clockwork_scripture/clockwork_arnaments + descname = "Summonable Armor and Weapons" + name = "Clockwork Arnaments" + desc = "Allows the invoker to summon clockwork armor and a Ratvarian spear at will. The spear's attacks will generate Vitality, used for healing." + invocations = list("Grant me arnaments...", "...from the forge of Armorer!") channel_time = 20 - consumed_components = list(REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 1) + power_cost = 250 whispered = TRUE - usage_tip = "Throwing the spear at a mob will do massive damage and knock them down, but break the spear." + usage_tip = "Throwing the spear at a mob will do massive damage and knock them down, but break the spear. You will need to wait for 30 seconds before resummoning it." tier = SCRIPTURE_SCRIPT primary_component = REPLICANT_ALLOY - sort_priority = 8 + sort_priority = 6 + quickbind = TRUE + quickbind_desc = "Permanently binds clockwork armor and a Ratvarian spear to you." -/datum/clockwork_scripture/function_call/check_special_requirements() - for(var/datum/action/innate/function_call/F in invoker.actions) +/datum/clockwork_scripture/clockwork_arnaments/check_special_requirements() + for(var/datum/action/innate/clockwork_arnaments/F in invoker.actions) to_chat(invoker, "You have already bound a Ratvarian spear to yourself!") return FALSE return invoker.can_hold_items() -/datum/clockwork_scripture/function_call/scripture_effects() +/datum/clockwork_scripture/clockwork_arnaments/scripture_effects() invoker.visible_message("A shimmer of yellow light infuses [invoker]!", \ - "You bind a Ratvarian spear to yourself. Use the \"Function Call\" action button to call it forth.") - var/datum/action/innate/function_call/F = new() - F.Grant(invoker) + "You bind clockwork equipment to yourself. Use Clockwork Arnaments and Call Spear to summon them.") + var/datum/action/innate/call_weapon/ratvarian_spear/S = new() + S.Grant(invoker) + var/datum/action/innate/clockwork_arnaments/A = new() + A.Grant(invoker) return TRUE -//Function Call action: Calls forth a Ratvarian spear once every 3 minutes. -/datum/action/innate/function_call - name = "Function Call" - desc = "Allows you to summon a Ratvarian spear to fight enemies." - button_icon_state = "ratvarian_spear" +//Clockwork Arnaments: Equips a set of clockwork armor. Three-minute cooldown. +/datum/action/innate/clockwork_arnaments + name = "Clockwork Arnaments" + desc = "Outfits you in a full set of Ratvarian armor." + icon_icon = 'icons/mob/actions/actions_clockcult.dmi' + button_icon_state = "clockwork_armor" background_icon_state = "bg_clock" check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS buttontooltipstyle = "clockcult" var/cooldown = 0 - var/base_cooldown = RATVARIAN_SPEAR_DURATION + var/static/list/ratvarian_armor_typecache = typecacheof(list( + /obj/item/clothing/suit/armor/clockwork, + /obj/item/clothing/head/helmet/clockwork, + /obj/item/clothing/gloves/clockwork, + /obj/item/clothing/shoes/clockwork)) //don't replace this ever + var/static/list/better_armor_typecache = typecacheof(list( + /obj/item/clothing/suit/space, + /obj/item/clothing/head/helmet/space, + /obj/item/clothing/shoes/magboots)) //replace this only if ratvar is up -/datum/action/innate/function_call/IsAvailable() - if(!is_servant_of_ratvar(owner) || cooldown > world.time) - return FALSE +/datum/action/innate/clockwork_arnaments/IsAvailable() + if(!is_servant_of_ratvar(owner)) + qdel(src) + return + if(cooldown > world.time) + return return ..() -/datum/action/innate/function_call/Activate() - if(!owner.get_empty_held_indexes()) - to_chat(usr, "You need an empty hand to call forth your spear!") - return FALSE - owner.visible_message("A strange spear materializes in [owner]'s hands!", "You call forth your spear!") - var/obj/item/clockwork/ratvarian_spear/R = new(get_turf(usr)) - owner.put_in_hands(R) - if(!GLOB.ratvar_awakens) - to_chat(owner, "Your spear begins to break down in this plane of existence. You can't use it for long!") - cooldown = base_cooldown + world.time +/datum/action/innate/clockwork_arnaments/Activate() + var/do_message = 0 + var/obj/item/I = owner.get_item_by_slot(slot_wear_suit) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/suit/armor/clockwork(null), slot_wear_suit) + I = owner.get_item_by_slot(slot_head) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/head/helmet/clockwork(null), slot_head) + I = owner.get_item_by_slot(slot_gloves) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/gloves/clockwork(null), slot_gloves) + I = owner.get_item_by_slot(slot_shoes) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/shoes/clockwork(null), slot_shoes) + if(do_message) + owner.visible_message("Strange armor appears on [owner]!", "A bright shimmer runs down your body, equipping you with Ratvarian armor.") + playsound(owner, 'sound/magic/clockwork/fellowship_armory.ogg', 15 * do_message, TRUE) //get sound loudness based on how much we equipped + cooldown = CLOCKWORK_ARMOR_COOLDOWN + world.time owner.update_action_buttons_icon() - addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), base_cooldown) + addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), CLOCKWORK_ARMOR_COOLDOWN) return TRUE +/datum/action/innate/clockwork_arnaments/proc/remove_item_if_better(obj/item/I, mob/user) + if(!I) + return TRUE + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + return FALSE + if(!GLOB.ratvar_awakens && is_type_in_typecache(I, better_armor_typecache)) + return FALSE + return user.dropItemToGround(I) + +//Call Spear: Calls forth a powerful Ratvarian spear. +/datum/action/innate/call_weapon/ratvarian_spear + name = "Call Spear" + desc = "Calls a Ratvarian spear into your hands to fight your enemies." + weapon_type = /obj/item/clockwork/weapon/ratvarian_spear + //Spatial Gateway: Allows the invoker to teleport themselves and any nearby allies to a conscious servant or clockwork obelisk. /datum/clockwork_scripture/spatial_gateway @@ -248,7 +307,7 @@ Each servant assisting in the invocation adds one additional use and four additional seconds to the gateway's uses and duration." invocations = list("Spatial Gateway...", "...activate!") channel_time = 80 - consumed_components = list(VANGUARD_COGWHEEL = 1, HIEROPHANT_ANSIBLE = 2) + power_cost = 400 multiple_invokers_used = TRUE multiple_invokers_optional = TRUE usage_tip = "This gateway is strictly one-way and will only allow things through the invoker's portal." @@ -285,3 +344,4 @@ portal_uses = max(portal_uses, 100) //Very powerful if Ratvar has been summoned duration = max(duration, 100) return slab.procure_gateway(invoker, duration, portal_uses) + diff --git a/code/game/gamemodes/clock_cult/clock_structure.dm b/code/game/gamemodes/clock_cult/clock_structure.dm index 1da30536050..6c3f3a0c0b6 100644 --- a/code/game/gamemodes/clock_cult/clock_structure.dm +++ b/code/game/gamemodes/clock_cult/clock_structure.dm @@ -77,14 +77,10 @@ return FALSE return ..() -/obj/structure/destructible/clockwork/proc/get_efficiency_mod(increasing) +/obj/structure/destructible/clockwork/proc/get_efficiency_mod() if(GLOB.ratvar_awakens) - if(increasing) - return 0.5 return 2 . = max(sqrt(obj_integrity/max(max_integrity, 1)), 0.5) - if(increasing) - . *= min(max_integrity/max(obj_integrity, 1), 4) . = round(., 0.01) /obj/structure/destructible/clockwork/attack_ai(mob/user) @@ -116,7 +112,7 @@ else icon_state = unanchored_icon if(do_damage) - playsound(src, break_sound, 10 * get_efficiency_mod(TRUE), 1) + playsound(src, break_sound, 10 * (40 * (1 - get_efficiency_mod())), 1) take_damage(round(max_integrity * 0.25, 1), BRUTE) to_chat(user, "As you unsecure [src] from the floor, you see cracks appear in its surface!") @@ -158,10 +154,10 @@ /obj/structure/destructible/clockwork/powered/examine(mob/user) ..() if(is_servant_of_ratvar(user) || isobserver(user)) - var/powered = total_accessable_power() - var/sigil_number = LAZYLEN(check_apc_and_sigils()) - to_chat(user, "It has access to [powered == INFINITY ? "INFINITE":"[DisplayPower(powered)] of"] power, \ - and [sigil_number] Sigil[sigil_number == 1 ? "":"s"] of Transmission [sigil_number == 1 ? "is":"are"] in range.") + if(!can_access_clockwork_power(src)) + to_chat(user, "It has no access to the power network! Create a sigil of transmission nearby.") + else + to_chat(user, "It has access to [DisplayPower(get_clockwork_power())] of power.") /obj/structure/destructible/clockwork/powered/Destroy() SSfastprocess.processing -= src @@ -169,7 +165,7 @@ return ..() /obj/structure/destructible/clockwork/powered/process() - var/powered = total_accessable_power() + var/powered = can_access_clockwork_power(src) return powered == PROCESS_KILL ? 25 : powered //make sure we don't accidentally return the arbitrary PROCESS_KILL define /obj/structure/destructible/clockwork/powered/can_be_unfasten_wrench(mob/user, silent) @@ -210,102 +206,12 @@ if(forced_disable(TRUE)) new /obj/effect/temp_visual/emp(loc) -/obj/structure/destructible/clockwork/powered/proc/total_accessable_power() //how much power we have and can use - if(!needs_power || GLOB.ratvar_awakens) - return INFINITY //oh yeah we've got power why'd you ask - - var/power = 0 - power += accessable_apc_power() - power += accessable_sigil_power() - return power - -/obj/structure/destructible/clockwork/powered/proc/accessable_apc_power() - var/power = 0 - var/area/A = get_area(src) - var/area/targetAPCA - for(var/obj/machinery/power/apc/APC in GLOB.apcs_list) - var/area/APCA = get_area(APC) - if(APCA == A) - target_apc = APC - if(target_apc) - targetAPCA = get_area(target_apc) - if(targetAPCA != A) - target_apc = null - else if(target_apc.cell) - var/apccharge = target_apc.cell.charge - if(apccharge >= MIN_CLOCKCULT_POWER) - power += apccharge - return power - -/obj/structure/destructible/clockwork/powered/proc/accessable_sigil_power() - var/power = 0 - for(var/obj/effect/clockwork/sigil/transmission/T in range(SIGIL_ACCESS_RANGE, src)) - power += T.power_charge - return power - - /obj/structure/destructible/clockwork/powered/proc/try_use_power(amount) //try to use an amount of power - if(!needs_power || GLOB.ratvar_awakens) - return 1 - if(amount <= 0) - return FALSE - var/power = total_accessable_power() - if(!power || power < amount) - return FALSE + if(!needs_power || GLOB.ratvar_awakens || !amount) + return TRUE + if(!can_access_clockwork_power(src, amount)) + return return use_power(amount) /obj/structure/destructible/clockwork/powered/proc/use_power(amount) //we've made sure we had power, so now we use it - var/sigilpower = accessable_sigil_power() - var/list/sigils_in_range = list() - for(var/obj/effect/clockwork/sigil/transmission/T in range(SIGIL_ACCESS_RANGE, src)) - sigils_in_range += T - while(sigilpower && amount >= MIN_CLOCKCULT_POWER) - for(var/S in sigils_in_range) - var/obj/effect/clockwork/sigil/transmission/T = S - if(amount >= MIN_CLOCKCULT_POWER && T.modify_charge(MIN_CLOCKCULT_POWER)) - sigilpower -= MIN_CLOCKCULT_POWER - amount -= MIN_CLOCKCULT_POWER - var/apcpower = accessable_apc_power() - while(apcpower >= MIN_CLOCKCULT_POWER && amount >= MIN_CLOCKCULT_POWER) - if(target_apc.cell.use(MIN_CLOCKCULT_POWER)) - apcpower -= MIN_CLOCKCULT_POWER - amount -= MIN_CLOCKCULT_POWER - target_apc.charging = 1 - target_apc.chargemode = TRUE - target_apc.update() - target_apc.update_icon() - target_apc.updateUsrDialog() - else - apcpower = 0 - if(amount) - return FALSE - else - return TRUE - -/obj/structure/destructible/clockwork/powered/proc/return_power(amount) //returns a given amount of power to all nearby sigils or if there are no sigils, to the APC - if(amount <= 0) - return FALSE - var/list/sigils_in_range = check_apc_and_sigils() - if(!istype(sigils_in_range)) - return FALSE - if(sigils_in_range.len) - while(amount >= MIN_CLOCKCULT_POWER) - for(var/S in sigils_in_range) - var/obj/effect/clockwork/sigil/transmission/T = S - if(amount >= MIN_CLOCKCULT_POWER && T.modify_charge(-MIN_CLOCKCULT_POWER)) - amount -= MIN_CLOCKCULT_POWER - if(target_apc && target_apc.cell && target_apc.cell.give(amount)) - target_apc.charging = 1 - target_apc.chargemode = TRUE - target_apc.update() - target_apc.update_icon() - target_apc.updateUsrDialog() - return TRUE - -/obj/structure/destructible/clockwork/powered/proc/check_apc_and_sigils() //checks for sigils and an APC, returning FALSE if it finds neither, and a list of sigils otherwise - . = list() - for(var/obj/effect/clockwork/sigil/transmission/T in range(SIGIL_ACCESS_RANGE, src)) - . += T - var/list/L = . - if(!L.len && (!target_apc || !target_apc.cell)) - return FALSE + return adjust_clockwork_power(-amount) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index b684b854c13..2d66739b4ed 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -1,18 +1,24 @@ +#define ARK_GRACE_PERIOD 300 //In seconds, how long the crew has before the Ark truly "begins" + //The gateway to Reebe, from which Ratvar emerges. /obj/structure/destructible/clockwork/massive/celestial_gateway - name = "ark of the Clockwork Justicar" - desc = "A massive, thrumming rip in spacetime." - clockwork_desc = "A portal to the Celestial Derelict. Massive and intimidating, it is the only thing that can both transport Ratvar and withstand the massive amount of energy he emits." + name = "\improper Ark of the Clockwork Justicar" + desc = "A massive, hulking amalgamation of parts. It seems to be maintaining a very unstable bluespace anomaly." + clockwork_desc = "Nezbere's magnum opus: a hulking clockwork machine capable of combining bluespace and steam power to summon Ratvar. Once activated, \ + its instability will cause one-way bluespace rifts to open across the station to the City of Cogs, so be prepared to defend it at all costs." max_integrity = 500 mouse_opacity = MOUSE_OPACITY_OPAQUE icon = 'icons/effects/clockwork_effects.dmi' icon_state = "nothing" - density = FALSE - invisibility = INVISIBILITY_MAXIMUM - resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE | FREEZE_PROOF + density = TRUE + resistance_flags = FIRE_PROOF | ACID_PROOF | FREEZE_PROOF can_be_repaired = FALSE immune_to_servant_attacks = TRUE + var/active = FALSE var/progress_in_seconds = 0 //Once this reaches GATEWAY_RATVAR_ARRIVAL, it's game over + var/grace_period = ARK_GRACE_PERIOD //This exists to allow the crew to gear up and prepare for the invasion + var/initial_activation_delay = -1 //How many seconds the Ark will have initially taken to activate + var/seconds_until_activation = -1 //How many seconds until the Ark activates; if it should never activate, set this to -1 var/purpose_fulfilled = FALSE var/first_sound_played = FALSE var/second_sound_played = FALSE @@ -20,31 +26,41 @@ var/fourth_sound_played = FALSE var/obj/effect/clockwork/overlay/gateway_glow/glow var/obj/effect/countdown/clockworkgate/countdown - var/list/required_components = list(BELLIGERENT_EYE = ARK_CONSUME_COST, VANGUARD_COGWHEEL = ARK_CONSUME_COST, GEIS_CAPACITOR = ARK_CONSUME_COST, REPLICANT_ALLOY = ARK_CONSUME_COST, HIEROPHANT_ANSIBLE = ARK_CONSUME_COST) /obj/structure/destructible/clockwork/massive/celestial_gateway/Initialize() . = ..() - INVOKE_ASYNC(src, .proc/spawn_animation) + glow = new(get_turf(src)) + if(!GLOB.ark_of_the_clockwork_justiciar) + GLOB.ark_of_the_clockwork_justiciar = src + START_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/cry_havoc() + visible_message("[src] shudders and roars to life, its parts beginning to whirr and screech!") + hierophant_message("The Ark is activating! Get back to the base!") + for(var/mob/M in GLOB.player_list) + if(is_servant_of_ratvar(M) || isobserver(M) || M.z == z) + M.playsound_local(M, 'sound/magic/clockwork/ark_activation_sequence.ogg', 30, FALSE, pressure_affected = FALSE) + addtimer(CALLBACK(src, .proc/let_slip_the_dogs), 300) + +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/let_slip_the_dogs() + spawn_animation() + first_sound_played = TRUE + active = TRUE + priority_announce("Massive [Gibberish("bluespace", 100)] anomaly detected on all frequencies. All crew are directed to \ + @!$, [text2ratvar("PURGE ALL UNTRUTHS")] <&. the anomalies and destroy their source to prevent further damage to corporate property. This is \ + not a drill.[grace_period ? " Estimated time of appearance: [grace_period] seconds. Use this time to prepare." : ""]", \ + "Central Command Higher Dimensional Affairs", 'sound/magic/clockwork/ark_activation.ogg') + set_security_level("delta") + for(var/V in SSticker.mode.servants_of_ratvar) + var/datum/mind/M = V + if(ishuman(M.current)) + M.current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)) + +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/open_portal(turf/T) + new/obj/effect/clockwork/city_of_cogs_rift(T) /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/spawn_animation() var/turf/T = get_turf(src) - new/obj/effect/clockwork/general_marker/inathneq(T) - hierophant_message("\"[text2ratvar("Engine, come forth and show your servants your mercy")]!\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 30, 0) - sleep(10) - new/obj/effect/clockwork/general_marker/sevtug(T) - hierophant_message("\"[text2ratvar("Engine, come forth and show this station your decorating skills")]!\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 45, 0) - sleep(10) - new/obj/effect/clockwork/general_marker/nezbere(T) - hierophant_message("\"[text2ratvar("Engine, come forth and shine your light across this realm")]!!\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 60, 0) - sleep(10) - new/obj/effect/clockwork/general_marker/nzcrentr(T) - hierophant_message("\"[text2ratvar("Engine, come forth")].\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 75, 0) - sleep(10) - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 100, 0) var/list/open_turfs = list() for(var/turf/open/OT in orange(1, T)) if(!is_blocked_turf(OT, TRUE)) @@ -52,33 +68,36 @@ if(open_turfs.len) for(var/mob/living/L in T) L.forceMove(pick(open_turfs)) - resistance_flags &= ~INDESTRUCTIBLE - density = TRUE - invisibility = 0 - glow = new(get_turf(src)) - countdown = new(src) - countdown.start() - var/area/gate_area = get_area(src) - hierophant_message("An Ark of the Clockwork Justicar has been created in [gate_area.map_name]!", FALSE, src) + hierophant_message("The Ark has activated! [grace_period ? "You have [round(grace_period / 60)] minutes until the crew invades! " : ""]Defend it at all costs!", FALSE, src) + sound_to_playing_players(volume = 10, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', TRUE)) + seconds_until_activation = 0 SSshuttle.registerHostileEnvironment(src) - START_PROCESSING(SSprocessing, src) /obj/structure/destructible/clockwork/massive/celestial_gateway/Destroy() STOP_PROCESSING(SSprocessing, src) - if(!purpose_fulfilled) - var/area/gate_area = get_area(src) - hierophant_message("An Ark of the Clockwork Justicar has fallen at [gate_area.map_name]!") - sound_to_playing_players(channel = CHANNEL_JUSTICAR_ARK, S = sound(null, 0)) - var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED SSshuttle.clearHostileEnvironment(src) - if(!was_stranded && !purpose_fulfilled) - priority_announce("Massive energy anomaly no longer on short-range scanners.","Anomaly Alert") + if(!purpose_fulfilled && istype(SSticker.mode, /datum/game_mode/clockwork_cult)) + hierophant_message("The Ark has fallen!") + sound_to_playing_players(null, channel = CHANNEL_JUSTICAR_ARK) + SSticker.force_ending = TRUE //rip if(glow) qdel(glow) glow = null if(countdown) qdel(countdown) countdown = null + for(var/mob/L in GLOB.player_list) + if(L.z == z) + L.forceMove(get_turf(pick(GLOB.generic_event_spawns))) + L.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static) + L.clear_fullscreen("flash", 30) + if(isliving(L)) + var/mob/living/LI = L + LI.Stun(50) + for(var/obj/effect/clockwork/city_of_cogs_rift/R in GLOB.all_clockwork_objects) + qdel(R) + if(GLOB.ark_of_the_clockwork_justiciar == src) + GLOB.ark_of_the_clockwork_justiciar = null . = ..() /obj/structure/destructible/clockwork/massive/celestial_gateway/deconstruct(disassembled = TRUE) @@ -87,12 +106,13 @@ resistance_flags |= INDESTRUCTIBLE countdown.stop() visible_message("[src] begins to pulse uncontrollably... you might want to run!") - sound_to_playing_players(volume = 50, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_disrupted.ogg', 0)) + sound_to_playing_players(volume = 50, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_disrupted.ogg')) make_glow() glow.icon_state = "clockwork_gateway_disrupted" resistance_flags |= INDESTRUCTIBLE sleep(27) explosion(src, 1, 3, 8, 8) + sound_to_playing_players('sound/effects/explosion_distant.ogg', volume = 50) qdel(src) /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/make_glow() @@ -104,46 +124,11 @@ var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down take_damage(damage, BRUTE, "bomb", 0) -/obj/structure/destructible/clockwork/massive/celestial_gateway/attackby(obj/item/I, mob/living/user, params) //add components directly to the ark - if(!is_servant_of_ratvar(user) || !still_needs_components()) - return ..() - if(istype(I, /obj/item/clockwork/component)) - var/obj/item/clockwork/component/C = I - if(required_components[C.component_id]) - required_components[C.component_id]-- - to_chat(user, "You add [C] to [src].") - user.drop_item() - qdel(C) - else - to_chat(user, "[src] has enough [get_component_name(C.component_id)][C.component_id != REPLICANT_ALLOY ? "s":""].") - return 1 - else if(istype(I, /obj/item/clockwork/slab)) - var/obj/item/clockwork/slab/S = I - var/used_components = FALSE - var/used_all = TRUE - for(var/i in S.stored_components) - if(required_components[i]) - var/to_use = min(S.stored_components[i], required_components[i]) - required_components[i] -= to_use - S.stored_components[i] -= to_use - if(to_use) - used_components = TRUE - if(S.stored_components[i]) - used_all = FALSE - if(used_components) - update_slab_info(S) - user.visible_message("[user][used_all ? "":" partially"] empties [S] into [src].", \ - "You offload [used_all ? "all":"some"] of your slab's components into [src].") - return 1 - else - return ..() - -/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/still_needs_components() - for(var/i in required_components) - if(required_components[i]) - return TRUE - /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_text(s_on_time) + if(seconds_until_activation) + return "[seconds_until_activation][s_on_time ? "S" : ""]" + if(grace_period) + return "[grace_period][s_on_time ? "S" : ""]" . = "IMMINENT" if(!obj_integrity) . = "DETONATING" @@ -155,97 +140,87 @@ ..() icon_state = initial(icon_state) if(is_servant_of_ratvar(user) || isobserver(user)) - if(still_needs_components()) - to_chat(user, "Components required until activation:") - for(var/i in required_components) - if(required_components[i]) - to_chat(user, "[get_component_icon(i)] [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: \ - [required_components[i]]") + if(!active) + to_chat(user, "Seconds until the Ark's activation: [get_arrival_text(TRUE)]") + else + if(grace_period) + to_chat(user, "Crew grace period time remaining: [get_arrival_text(TRUE)]") + else + to_chat(user, "Seconds until Ratvar's arrival: [get_arrival_text(TRUE)]") + switch(progress_in_seconds) + if(-INFINITY to GATEWAY_REEBE_FOUND) + to_chat(user, "The Ark is feeding power into the bluespace field.") + if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) + to_chat(user, "The field is ripping open a copy of itself in Ratvar's prison.") + if(GATEWAY_RATVAR_COMING to INFINITY) + to_chat(user, "With the bluespace field established, Ratvar is preparing to come through!") + else + if(!active) + to_chat(user, "Whatever it is, it doesn't seem to be active.") else - to_chat(user, "Seconds until Ratvar's arrival: [get_arrival_text(TRUE)]") switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) - to_chat(user, "It's still opening.") + to_chat(user, "You see a swirling bluespace anomaly steadily growing in intensity.") if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) - to_chat(user, "It's reached the Celestial Derelict and is drawing power from it.") + to_chat(user, "The anomaly is stable, and you can see flashes of something from it.") if(GATEWAY_RATVAR_COMING to INFINITY) - to_chat(user, "Ratvar is coming through the gateway!") - else - switch(progress_in_seconds) - if(-INFINITY to GATEWAY_REEBE_FOUND) - to_chat(user, "It's a swirling mass of blackness.") - if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) - to_chat(user, "It seems to be leading somewhere.") - if(GATEWAY_RATVAR_COMING to INFINITY) - to_chat(user, "Something is coming through!") + to_chat(user, "The anomaly is stable! Something is coming through!") /obj/structure/destructible/clockwork/massive/celestial_gateway/process() + if(seconds_until_activation == -1) //we never do anything + return + adjust_clockwork_power(2.5) //Provides weak power generation on its own + if(seconds_until_activation) + if(!countdown) + countdown = new(src) + countdown.start() + seconds_until_activation-- + if(!GLOB.script_scripture_unlocked && initial_activation_delay * 0.5 > seconds_until_activation) + GLOB.script_scripture_unlocked = TRUE + hierophant_message("The Ark is halfway prepared. Script scripture is now available!") + if(!seconds_until_activation) + cry_havoc() + seconds_until_activation = -1 //we'll set this after cry_havoc() + return if(!first_sound_played || prob(7)) - for(var/M in GLOB.player_list) + for(var/mob/M in GLOB.player_list) if(M && !isnewplayer(M)) - to_chat(M, "You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...") + if(M.z == z) + to_chat(M, "You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...") + else + to_chat(M, "You hear otherworldly sounds from all around you...") if(!obj_integrity) - return 0 - var/convert_dist = 1 + (round(Floor(progress_in_seconds, 15) * 0.067)) - for(var/t in RANGE_TURFS(convert_dist, loc)) - var/turf/T = t - if(!T) - continue - if(get_dist(T, src) < 2) - if(iswallturf(T)) - var/turf/closed/wall/W = T - W.dismantle_wall() - else if(t && (isclosedturf(T) || !is_blocked_turf(T))) - T.ChangeTurf(/turf/open/floor/clockwork) - var/dist = cheap_hypotenuse(T.x, T.y, x, y) - if(dist < convert_dist) - T.ratvar_act(FALSE, TRUE, 3) + return + for(var/turf/closed/wall/W in RANGE_TURFS(2, src)) + W.dismantle_wall() for(var/obj/O in orange(1, src)) if(!O.pulledby && !istype(O, /obj/effect) && O.density) if(!step_away(O, src, 2) || get_dist(O, src) < 2) O.take_damage(50, BURN, "bomb") O.update_icon() - if(still_needs_components()) - if(!first_sound_played) - priority_announce("Massive energy anomaly detected on short-range scanners. Attempting to triangulate location...", "Anomaly Alert") - sound_to_playing_players(volume = 10, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', 1)) - first_sound_played = TRUE - make_glow() - glow.icon_state = "clockwork_gateway_components" - var/used_components = FALSE - for(var/i in required_components) - if(required_components[i]) - var/to_use = min(GLOB.clockwork_component_cache[i], required_components[i]) - required_components[i] -= to_use - GLOB.clockwork_component_cache[i] -= to_use - if(to_use) - used_components = TRUE - if(used_components) - update_slab_info() - if(still_needs_components()) - return + if(grace_period) + grace_period-- + return progress_in_seconds += GATEWAY_SUMMON_RATE switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) if(!second_sound_played) - new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow) - sound_to_playing_players(volume = 30, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', 1)) + for(var/V in GLOB.generic_event_spawns) + addtimer(CALLBACK(src, .proc/open_portal, get_turf(V)), rand(100, 600)) + sound_to_playing_players('sound/magic/clockwork/invoke_general.ogg', 30, FALSE) + sound_to_playing_players(volume = 30, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', TRUE)) second_sound_played = TRUE make_glow() glow.icon_state = "clockwork_gateway_charging" if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) if(!third_sound_played) - var/area/gate_area = get_area(src) - priority_announce("Location of massive energy anomaly has been triangulated. Location: [gate_area.map_name].", "Anomaly Alert") - new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow) - sound_to_playing_players(volume = 35, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_active.ogg', 1)) + sound_to_playing_players(volume = 35, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_active.ogg', TRUE)) third_sound_played = TRUE make_glow() glow.icon_state = "clockwork_gateway_active" if(GATEWAY_RATVAR_COMING to GATEWAY_RATVAR_ARRIVAL) if(!fourth_sound_played) - new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow) - sound_to_playing_players(volume = 40, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_closing.ogg', 1)) + sound_to_playing_players(volume = 40, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_closing.ogg', TRUE)) fourth_sound_played = TRUE make_glow() glow.icon_state = "clockwork_gateway_closing" @@ -255,38 +230,25 @@ resistance_flags |= INDESTRUCTIBLE purpose_fulfilled = TRUE make_glow() - animate(glow, transform = matrix() * 3, time = 125) - sound_to_playing_players('sound/effects/ratvar_rises.ogg', channel = CHANNEL_JUSTICAR_ARK) //End the sounds + animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125) + sound_to_playing_players(volume = 100, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/ratvar_rises.ogg')) //End the sounds sleep(125) - var/turf/startpoint = get_turf(src) make_glow() - glow.transform = matrix() * 4.5 - animate(glow, transform = matrix() * 0.1, time = 10) - QDEL_IN(src, 10) + animate(glow, transform = matrix() * 3, alpha = 0, time = 5) + var/turf/startpoint = get_turf(src) + QDEL_IN(src, 3) + sleep(3) GLOB.clockwork_gateway_activated = TRUE - new/obj/structure/destructible/clockwork/massive/ratvar(startpoint) - send_to_playing_players("\"[text2ratvar("See Engine's mercy")]!\"\n\ - \"[text2ratvar("Observe Engine's design skills")]!\"\n\"[text2ratvar("Behold Engine's light")]!!\"\n\ - \"[text2ratvar("Gaze upon Engine's power")].\"") - sound_to_playing_players('sound/effects/empulse.ogg') - var/x0 = startpoint.x - var/y0 = startpoint.y - for(var/I in spiral_range_turfs(255, startpoint)) - var/turf/T = I - if(!T) - continue - var/dist = cheap_hypotenuse(T.x, T.y, x0, y0) - if(dist < 100) - dist = TRUE - else - dist = FALSE - T.ratvar_act(dist, TRUE) - CHECK_TICK + var/obj/structure/destructible/clockwork/massive/ratvar/R = new(startpoint) + var/turf/T = locate(round(world.maxx * 0.5, 1), round(world.maxy * 0.5, 1), ZLEVEL_STATION_PRIMARY) //approximate center of the station + R.forceMove(T) + + //the actual appearance of the Ark of the Clockwork Justicar; an object so the edges of the gate can be clicked through. /obj/effect/clockwork/overlay/gateway_glow icon = 'icons/effects/96x96.dmi' - icon_state = "clockwork_gateway_charging" + icon_state = "clockwork_gateway_components" pixel_x = -32 pixel_y = -32 layer = BELOW_OPEN_DOOR_LAYER diff --git a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm index de6b058b783..51d42611d20 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm @@ -42,7 +42,7 @@ return affected /obj/structure/destructible/clockwork/powered/clockwork_obelisk/attack_hand(mob/living/user) - if(!is_servant_of_ratvar(user) || total_accessable_power() < hierophant_cost || !anchored) + if(!is_servant_of_ratvar(user) || !can_access_clockwork_power(src, hierophant_cost) || !anchored) to_chat(user, "You place your hand on [src], but it doesn't react.") return var/choice = alert(user,"You place your hand on [src]...",,"Hierophant Broadcast","Spatial Gateway","Cancel") @@ -87,7 +87,7 @@ active = TRUE clockwork_say(user, text2ratvar("Spatial Gateway, activate!")) return - return_power(gateway_cost) //if we didn't return above, ie, successfully create a gateway, we give the power back + adjust_clockwork_power(gateway_cost) //if we didn't return above, ie, successfully create a gateway, we give the power back /obj/structure/destructible/clockwork/powered/clockwork_obelisk/process() if(!anchored) diff --git a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm deleted file mode 100644 index 029fd552e20..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm +++ /dev/null @@ -1,174 +0,0 @@ -//Used by the Geis scripture to hold its target in place -/obj/structure/destructible/clockwork/geis_binding - name = "glowing ring" - desc = "A flickering, glowing purple ring around a target." - clockwork_desc = "A binding ring around a target, preventing them from taking action." - max_integrity = 20 - light_range = 2 - light_power = 0.8 - light_color = "#AF0AAF" - anchored = FALSE - density = FALSE - immune_to_servant_attacks = TRUE - icon = 'icons/effects/clockwork_effects.dmi' - icon_state = "geisbinding_full" - break_message = null - break_sound = 'sound/magic/repulse.ogg' - debris = list() - can_buckle = TRUE - buckle_lying = 0 - var/mob_layer = MOB_LAYER - var/last_mob_health = 0 - var/apply_time = 0 - -/obj/structure/destructible/clockwork/geis_binding/Initialize(mapload, obj/item/clockwork/slab/the_slab) - . = ..() - START_PROCESSING(SSprocessing, src) - -/obj/structure/destructible/clockwork/geis_binding/Destroy() - STOP_PROCESSING(SSprocessing, src) - return ..() - -/obj/structure/destructible/clockwork/geis_binding/examine(mob/user) - icon_state = "geisbinding_full" - ..() - icon_state = "geisbinding" - -/obj/structure/destructible/clockwork/geis_binding/process() - var/tick_damage = 1 - if(locate(/obj/effect/clockwork/sigil/submission) in loc) - tick_damage *= 0.5 - if(LAZYLEN(buckled_mobs)) - for(var/V in buckled_mobs) - var/mob/living/L = V - if(is_servant_of_ratvar(L)) //servants are freed automatically - take_damage(obj_integrity) - return - if(last_mob_health > L.health) - tick_damage += last_mob_health - L.health - last_mob_health = L.health - if(L.layer != mob_layer) - mob_layer = L.layer - layer = mob_layer - 0.01 - cut_overlays() - add_overlay(mutable_appearance('icons/effects/clockwork_effects.dmi', "geisbinding_top", mob_layer + 0.01)) - break - take_damage(tick_damage, sound_effect = FALSE) - playsound(src, 'sound/effects/empulse.ogg', tick_damage * 40, TRUE, -4) - -/obj/structure/destructible/clockwork/geis_binding/attack_hand(mob/living/user) - return - -/obj/structure/destructible/clockwork/geis_binding/attackby(obj/item/I, mob/user, params) - if(is_servant_of_ratvar(user) && istype(I, /obj/item/clockwork/slab)) - user.visible_message("[user] starts to dispel [src]...", "You start to dispel [src]...") - if(do_after(user, 30, target = src)) - user.visible_message("[user] dispels [src]!", "You dispel [src]!") - take_damage(obj_integrity) - return 1 - return ..() - -/obj/structure/destructible/clockwork/geis_binding/emp_act(severity) - new /obj/effect/temp_visual/emp(loc) - qdel(src) - -/obj/structure/destructible/clockwork/geis_binding/post_buckle_mob(mob/living/M) - ..() - if(M.buckled == src) - desc = "A flickering, glowing purple ring around [M]." - clockwork_desc = "A binding ring around [M], preventing [M.p_them()] from taking action." - icon_state = "geisbinding" - mob_layer = M.layer - layer = mob_layer - 0.01 - add_overlay(mutable_appearance('icons/effects/clockwork_effects.dmi', "geisbinding_top", mob_layer + 0.01)) - last_mob_health = M.health - apply_time = world.time - for(var/obj/item/I in M.held_items) - M.dropItemToGround(I) - for(var/i in M.get_empty_held_indexes()) - var/obj/item/geis_binding/B = new(M) - M.put_in_hands(B, i) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(!C.handcuffed) - C.handcuffed = new /obj/item/restraints/handcuffs/energy/clock(C) - M.regenerate_icons() - M.visible_message("A [name] appears around [M]!", "A [name] appears around you!") - repair_and_interrupt() - else - var/obj/effect/temp_visual/ratvar/geis_binding/G = new /obj/effect/temp_visual/ratvar/geis_binding(M.loc) - var/obj/effect/temp_visual/ratvar/geis_binding/T = new /obj/effect/temp_visual/ratvar/geis_binding/top(M.loc) - G.layer = mob_layer - 0.01 - T.layer = mob_layer + 0.01 - G.alpha = alpha - T.alpha = alpha - animate(G, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT) - animate(T, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT) - M.visible_message("[src] snaps into glowing pieces and dissipates!") - M.AdjustStun(-130 + (apply_time - world.time), 1, 1) //remove exactly as much stun as was applied - if(iscarbon(M)) - var/mob/living/carbon/C = M - C.silent = max(C.silent - 7, 0) - for(var/obj/item/geis_binding/GB in M.held_items) - M.dropItemToGround(GB, TRUE) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(istype(C.handcuffed, /obj/item/restraints/handcuffs/energy/clock)) - QDEL_NULL(C.handcuffed) - C.update_handcuffed() - -/obj/structure/destructible/clockwork/geis_binding/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - playsound(src, 'sound/effects/empulse.ogg', 50, 1) - -/obj/structure/destructible/clockwork/geis_binding/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) - . = ..() - if(.) - update_icon() - -/obj/structure/destructible/clockwork/geis_binding/update_icon() - alpha = min(255 * ((obj_integrity/max_integrity) + 0.2) , 255) - -/obj/structure/destructible/clockwork/geis_binding/proc/repair_and_interrupt() - obj_integrity = max_integrity - update_icon() - for(var/m in buckled_mobs) - var/mob/living/L = m - if(L) - L.Stun(130, 1, 1) //basically here to act as a mute for borgs - if(iscarbon(L)) - var/mob/living/carbon/C = L - C.silent += 7 - visible_message("[src] flares brightly!") - var/obj/effect/temp_visual/ratvar/geis_binding/G1 = new /obj/effect/temp_visual/ratvar/geis_binding(loc) - var/obj/effect/temp_visual/ratvar/geis_binding/G2 = new /obj/effect/temp_visual/ratvar/geis_binding(loc) - var/obj/effect/temp_visual/ratvar/geis_binding/T1 = new /obj/effect/temp_visual/ratvar/geis_binding/top(loc) - var/obj/effect/temp_visual/ratvar/geis_binding/T2 = new /obj/effect/temp_visual/ratvar/geis_binding/top(loc) - G1.layer = mob_layer - 0.01 - G2.layer = mob_layer - 0.01 - T1.layer = mob_layer + 0.01 - T2.layer = mob_layer + 0.01 - animate(G1, pixel_y = pixel_y + 9, alpha = 0, time = 8, easing = EASE_IN) - animate(G2, pixel_y = pixel_y - 9, alpha = 0, time = 8, easing = EASE_IN) - animate(T1, pixel_y = pixel_y + 9, alpha = 0, time = 8, easing = EASE_IN) - animate(T2, pixel_y = pixel_y - 9, alpha = 0, time = 8, easing = EASE_IN) - -/obj/structure/destructible/clockwork/geis_binding/user_unbuckle_mob(mob/living/buckled_mob, mob/user) - if(buckled_mob != user) - return ..() - -/obj/item/geis_binding - name = "glowing ring" - desc = "A flickering ring preventing you from holding items." - icon = 'icons/effects/clockwork_effects.dmi' - icon_state = "geisbinding_full" - flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1 - -/obj/item/geis_binding/pre_attackby(atom/target, mob/living/user, params) - return FALSE - -/obj/item/restraints/handcuffs/energy/clock - name = "glowing rings" - desc = "Flickering rings preventing you from holding items." - icon = 'icons/effects/clockwork_effects.dmi' - icon_state = "geisbinding_full" - flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1 diff --git a/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm b/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm new file mode 100644 index 00000000000..5e43749ac56 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm @@ -0,0 +1,109 @@ +//Used to "declare war" against the station. The servants' equipment will be permanently supercharged, and the Ark given extra time to prepare. +//This will send an announcement to the station, meaning that they will be warned very early in advance about the impending attack. +/obj/structure/destructible/clockwork/heralds_beacon + name = "herald's beacon" + desc = "An imposing spire formed of brass, with a thrumming gemstone at its peak." + clockwork_desc = "A massively-powerful beacon. If enough servants decide to activate it, it will send an incredibly large energy pulse to the Ark, \ + permanently empowering many clockwork objects and reducing all power costs by 50%, but alerting the crew to your presence. It doesn't have enough \ + energy to sustain itself for long, and if not activated within five minutes, it will permanently shut down." + icon_state = "interdiction_lens" + break_message = "The beacon crackles with power before collapsing into pieces!" + max_integrity = 250 + light_color = "#EF078E" + var/time_remaining = 300 //Amount of seconds left to vote on whether or not to activate the beacon + var/list/voters //People who have voted to activate the beacon + var/votes_needed = 0 //How many votes are needed to activate the beacon + var/available = FALSE //If the beacon can be used + +/obj/structure/destructible/clockwork/heralds_beacon/Initialize() + . = ..() + voters = list() + START_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/heralds_beacon/Destroy() + STOP_PROCESSING(SSprocessing, src) + . = ..() + +/obj/structure/destructible/clockwork/heralds_beacon/process() + if(!available) + if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) + available = TRUE + else + return + if(!SSticker.mode.servants_of_ratvar.len) + return + if(!votes_needed) + var/servants = SSticker.mode.servants_of_ratvar.len + if(servants) + votes_needed = round(servants * 0.66) + time_remaining-- + if(!time_remaining) + hierophant_message("[src] has lost its power, and can no longer be activated.") + for(var/mob/M in GLOB.player_list) + if(isobserver(M) || is_servant_of_ratvar(M)) + M.playsound_local(M, 'sound/magic/blind.ogg', 50, FALSE) + available = FALSE + icon_state = "interdiction_lens_unwrenched" + STOP_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/heralds_beacon/examine(mob/user) + ..() + if(isobserver(user) || is_servant_of_ratvar(user)) + if(!available) + if(!GLOB.ratvar_approaches) + to_chat(user, "It can no longer be activated.") + else + to_chat(user, "It has been activated!") + else + to_chat(user, "There are [time_remaining] second[time_remaining != 1 ? "s" : ""] remaining to vote.") + to_chat(user, "There are [voters.len]/[votes_needed] votes to activate the beacon!") + +/obj/structure/destructible/clockwork/heralds_beacon/attack_hand(mob/living/user) + if(!is_servant_of_ratvar(user)) + to_chat(user, "You can tell how powerful [src] is; you know better than to touch it.") + return + if(!available) + to_chat(user, "You can no longer vote with [src].") + return + var/voting = !(user.key in voters) + if(alert(user, "[voting ? "Cast a" : "Undo your"] vote to activate the beacon?", "Herald's Beacon", "Change Vote", "Cancel") == "Cancel") + return + if(!user.canUseTopic(src) || !is_servant_of_ratvar(user) || !available) + return + if(voting) + if(user.key in voters) + return + voters += user.key + else + if(!user.key in voters) + return + voters -= user.key + var/votes_left = votes_needed - voters.len + message_admins("[ADMIN_LOOKUPFLW(user)] has [voting ? "voted" : "undone their vote"] to activate [src]! [ADMIN_JMP(user)]") + hierophant_message("[user.real_name] has [voting ? "voted" : "undone their vote"] to activate [src]! The beacon needs [votes_left] more votes to activate.") + for(var/mob/M in GLOB.player_list) + if(isobserver(M) || is_servant_of_ratvar(M)) + M.playsound_local(M, 'sound/magic/clockwork/fellowship_armory.ogg', 50, FALSE) + if(!votes_left) + herald_the_justiciar() + +/obj/structure/destructible/clockwork/heralds_beacon/proc/herald_the_justiciar() + priority_announce("A powerful group of fanatical zealots following the cause of Ratvar have brazenly sacrificed stealth for power, and dare anyone \ + to try and stop them.", title = "The Justiciar Comes", sound = 'sound/magic/clockwork/ark_activation.ogg') + GLOB.ratvar_approaches = TRUE + available = FALSE + STOP_PROCESSING(SSprocessing, src) + icon_state = "interdiction_lens_active" + hierophant_message("The beacon's activation has given your team great power! Many of your objects are permanently empowered!") + for(var/mob/living/simple_animal/hostile/clockwork/C in GLOB.all_clockwork_mobs) + if(C.stat == DEAD) + continue + C.update_values() + to_chat(C, C.empower_string) + for(var/mob/living/carbon/human/H in GLOB.living_mob_list) + if(is_servant_of_ratvar(H)) + to_chat(H, "The beacon's power warps your body into a clockwork form! You are now immune to many hazards, and your body is more robust against damage!") + H.set_species(/datum/species/golem/clockwork/no_scrap) + SSshuttle.registerHostileEnvironment(GLOB.ark_of_the_clockwork_justiciar) //no leaving when we need to purge you, heretics + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar + G.grace_period = FALSE //no grace period if we've declared war diff --git a/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm b/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm index 23a50fdd4ce..b95d9cc0db4 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm @@ -32,7 +32,7 @@ /obj/structure/destructible/clockwork/powered/mania_motor/attack_hand(mob/living/user) if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) - if(!total_accessable_power() >= mania_cost) + if(!can_access_clockwork_power(src, mania_cost)) to_chat(user, "[src] needs more power to function!") return 0 toggle(0, user) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm index 7953a7dafd8..cdff486eeaf 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm @@ -11,7 +11,7 @@ break_message = "The warden's eye gives a glare of utter hate before falling dark!" debris = list(/obj/item/clockwork/component/belligerent_eye/blind_eye = 1) resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF - var/damage_per_tick = 2.7 + var/damage_per_tick = 2.5 var/sight_range = 3 var/atom/movable/target var/list/idle_messages = list(" sulkily glares around.", " lazily drifts from side to side.", " looks around for something to burn.", " slowly turns in circles.") @@ -68,14 +68,14 @@ else R.reveal(10) if(prob(50)) - L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot1.ogg',50,1) + L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot1.ogg',75 * get_efficiency_mod(),1) else - L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot2.ogg',50,1) + L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot2.ogg',75 * get_efficiency_mod(),1) L.adjustFireLoss((!iscultist(L) ? damage_per_tick : damage_per_tick * 2) * get_efficiency_mod()) //Nar-Sian cultists take additional damage if(GLOB.ratvar_awakens && L) L.adjust_fire_stacks(damage_per_tick) L.IgniteMob() - else if(istype(target, /obj/mecha)) + else if(ismecha(target)) var/obj/mecha/M = target M.take_damage(damage_per_tick * get_efficiency_mod(), BURN, "melee", 1, get_dir(src, M)) @@ -89,10 +89,10 @@ visible_message("[src] swivels to face [target]!") if(isliving(target)) var/mob/living/L = target - to_chat(L, "\"I SEE YOU!\"\n[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!") - else if(istype(target, /obj/mecha)) + to_chat(L, "\"I SEE YOU!\"\n[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!") + else if(ismecha(target)) var/obj/mecha/M = target - to_chat(M.occupant, "\"I SEE YOU!\"" ) + to_chat(M.occupant, "\"I SEE YOU!\"" ) else if(prob(0.5)) //Extremely low chance because of how fast the subsystem it uses processes if(prob(50)) visible_message("[src][pick(idle_messages)]") @@ -112,7 +112,7 @@ continue if(is_servant_of_ratvar(L) || (L.disabilities & BLIND) || L.null_rod_check()) continue - if(L.stat || L.restrained() || L.buckled || L.lying || istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding)) + if(L.stat || L.restrained() || L.buckled || L.lying) continue if(ishostile(L)) var/mob/living/simple_animal/hostile/H = L @@ -134,3 +134,15 @@ target = null visible_message("[src] settles and seems almost disappointed.") return 1 + +/obj/structure/destructible/clockwork/ocular_warden/get_efficiency_mod() + if(GLOB.ratvar_awakens) + return 2 + . = 1 + if(target) + for(var/turf/T in getline(src, target)) + for(var/obj/structure/O in T) + if(O.density) + . -= 0.15 + . -= (get_dist(src, target) * 0.05) + . = max(., 0.1) //The lowest damage a warden can do is 10% of its normal amount (0.25 by default) diff --git a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm deleted file mode 100644 index 155413a6126..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm +++ /dev/null @@ -1,135 +0,0 @@ -//Prolonging Prism: A prism that consumes power to delay the shuttle -/obj/structure/destructible/clockwork/powered/prolonging_prism - name = "prolonging prism" - desc = "A dark onyx prism, held in midair by spiraling tendrils of stone." - clockwork_desc = "A powerful prism that will delay the arrival of an emergency shuttle." - icon_state = "prolonging_prism_inactive" - active_icon = "prolonging_prism" - inactive_icon = "prolonging_prism_inactive" - unanchored_icon = "prolonging_prism_unwrenched" - construction_value = 20 - max_integrity = 125 - break_message = "The prism falls to the ground with a heavy thud!" - debris = list(/obj/item/clockwork/alloy_shards/small = 3, \ - /obj/item/clockwork/alloy_shards/medium = 1, \ - /obj/item/clockwork/alloy_shards/large = 1, \ - /obj/item/clockwork/component/vanguard_cogwheel/onyx_prism = 1) - var/static/list/component_refund = list(VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 1) - var/static/delay_cost = 3000 - var/static/delay_cost_increase = 1250 - var/static/delay_remaining = 0 - -/obj/structure/destructible/clockwork/powered/prolonging_prism/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) - to_chat(user, "An emergency shuttle has arrived and this prism is no longer useful; attempt to activate it to gain a partial refund of components used.") - else - var/efficiency = get_efficiency_mod(TRUE) - to_chat(user, "It requires at least [DisplayPower(get_delay_cost())] of power to attempt to delay the arrival of an emergency shuttle by [2 * efficiency] minutes.") - to_chat(user, "This cost increases by [DisplayPower(delay_cost_increase)] for every previous activation.") - -/obj/structure/destructible/clockwork/powered/prolonging_prism/forced_disable(bad_effects) - if(active) - if(bad_effects) - try_use_power(MIN_CLOCKCULT_POWER*4) - visible_message("[src] emits an airy chuckling sound and falls dark!") - toggle() - return TRUE - -/obj/structure/destructible/clockwork/powered/prolonging_prism/attack_hand(mob/living/user) - if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) - if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) - to_chat(user, "You break [src] apart, refunding some of the components used.") - for(var/i in component_refund) - generate_cache_component(i, src) - take_damage(max_integrity) - return 0 - if(active) - return 0 - var/turf/T = get_turf(src) - if(!T || !(T.z in GLOB.station_z_levels)) - to_chat(user, "[src] must be on the station to function!") - return 0 - if(SSshuttle.emergency.mode != SHUTTLE_CALL) - to_chat(user, "No emergency shuttles are attempting to arrive at the station!") - return 0 - if(!try_use_power(get_delay_cost())) - to_chat(user, "[src] needs more power to function!") - return 0 - delay_cost += delay_cost_increase - delay_remaining += PRISM_DELAY_DURATION - toggle(0, user) - -/obj/structure/destructible/clockwork/powered/prolonging_prism/process() - var/turf/own_turf = get_turf(src) - if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || !(own_turf.z in GLOB.station_z_levels)) - forced_disable(FALSE) - return - . = ..() - var/delay_amount = 40 - delay_remaining -= delay_amount - var/efficiency = get_efficiency_mod() - SSshuttle.emergency.setTimer(SSshuttle.emergency.timeLeft(1) + (delay_amount * efficiency)) - var/highest_y - var/highest_x - var/lowest_y - var/lowest_x - var/list/prism_turfs = list() - for(var/t in SSshuttle.emergency.ripple_area(SSshuttle.getDock("emergency_home"))) - prism_turfs[t] = TRUE - var/turf/T = t - if(!highest_y || T.y > highest_y) - highest_y = T.y - if(!highest_x || T.x > highest_x) - highest_x = T.x - if(!lowest_y || T.y < lowest_y) - lowest_y = T.y - if(!lowest_x || T.x < lowest_x) - lowest_x = T.x - var/mean_y = Lerp(lowest_y, highest_y) - var/mean_x = Lerp(lowest_x, highest_x) - if(prob(50)) - mean_y = Ceiling(mean_y) - else - mean_y = Floor(mean_y) - if(prob(50)) - mean_x = Ceiling(mean_x) - else - mean_x = Floor(mean_x) - var/turf/semi_random_center_turf = locate(mean_x, mean_y, ZLEVEL_STATION_PRIMARY) - for(var/t in getline(src, semi_random_center_turf)) - prism_turfs[t] = TRUE - var/placement_style = prob(50) - for(var/t in prism_turfs) - var/turf/T = t - if(placement_style) - if(IsOdd(T.x + T.y)) - seven_random_hexes(T, efficiency) - else if(prob(50 * efficiency)) - new /obj/effect/temp_visual/ratvar/prolonging_prism(T) - else - if(IsEven(T.x + T.y)) - seven_random_hexes(T, efficiency) - else if(prob(50 * efficiency)) - new /obj/effect/temp_visual/ratvar/prolonging_prism(T) - CHECK_TICK //we may be going over a hell of a lot of turfs - -/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/get_delay_cost() - return Floor(delay_cost, MIN_CLOCKCULT_POWER) - -/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/seven_random_hexes(turf/T, efficiency) - var/static/list/hex_states = list("prismhex1", "prismhex2", "prismhex3", "prismhex4", "prismhex5", "prismhex6", "prismhex7") - var/mutable_appearance/hex_combo - for(var/n in hex_states) //BUILD ME A HEXAGON - if(prob(50 * efficiency)) - if(!hex_combo) - hex_combo = mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER) - else - hex_combo.add_overlay(mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER)) - if(hex_combo) //YOU BUILT A HEXAGON - hex_combo.pixel_x = -16 - hex_combo.pixel_y = -16 - hex_combo.mouse_opacity = MOUSE_OPACITY_TRANSPARENT - hex_combo.plane = GAME_PLANE - new /obj/effect/temp_visual/ratvar/prolonging_prism(T, hex_combo) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm index c604e106f36..4850b904c83 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -1,8 +1,8 @@ -//Ratvar himself. Impossible to damage by most standard means, He will dominate the station and all upon it. +//Ratvar himself. Impossible to damage by most standard means, and converts nearby objects and players into clockwork variants and Servants. /obj/structure/destructible/clockwork/massive/ratvar name = "Ratvar, the Clockwork Justiciar" - desc = "What is what is what are what real what is all a lie all a lie it's all a lie why how can what is" - clockwork_desc = "Ratvar, the Clockwork Justiciar, your master eternal." + desc = "..." + clockwork_desc = "Ratvar, free at last!" icon = 'icons/effects/512x512.dmi' icon_state = "ratvar" pixel_x = -235 @@ -13,7 +13,7 @@ light_range = 15 light_color = "#BE8700" var/atom/prey //Whatever Ratvar is chasing - var/clashing = FALSE //If Ratvar is FUCKING FIGHTING WITH NAR-SIE + var/clashing = FALSE //If Ratvar is fighting with Nar-Sie var/convert_range = 10 dangerous_possession = TRUE @@ -22,20 +22,21 @@ GLOB.ratvar_awakens++ for(var/obj/O in GLOB.all_clockwork_objects) O.ratvar_act() + for(var/mob/living/simple_animal/hostile/clockwork/M in GLOB.all_clockwork_mobs) + M.ratvar_act() START_PROCESSING(SSobj, src) - INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0, null, FALSE, 0) - send_to_playing_players("\"[text2ratvar("ONCE AGAIN MY LIGHT SHALL SHINE ACROSS THIS PATHETIC REALM")]!!\"") + send_to_playing_players("[text2ratvar("ONCE AGAIN MY LIGHT SHINES AMONG THESE PATHETIC STARS")]") sound_to_playing_players('sound/effects/ratvar_reveal.ogg') var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert") var/area/A = get_area(src) notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [A.name] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay) + INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 10, null, FALSE, 0) /obj/structure/destructible/clockwork/massive/ratvar/Destroy() GLOB.ratvar_awakens-- for(var/obj/O in GLOB.all_clockwork_objects) O.ratvar_act() STOP_PROCESSING(SSobj, src) - send_to_playing_players("\"NO! I will not... be... banished... again...\"") return ..() /obj/structure/destructible/clockwork/massive/ratvar/attack_ghost(mob/dead/observer/O) @@ -100,12 +101,12 @@ return clashing = TRUE GLOB.cult_narsie.clashing = TRUE - to_chat(world, "\"[pick("BLOOD GOD!!!", "NAR-SIE!!!", "AT LAST, YOUR TIME HAS COME!")]\"") - to_chat(world, "\"Ratvar?! How?!\"") - clash_of_the_titans(GLOB.cult_narsie) //IT'S TIME FOR THE BATTLE OF THE AGES + to_chat(world, "\"YOU.\"") + to_chat(world, "\"Ratvar?!\"") + clash_of_the_titans(GLOB.cult_narsie) // >:( return TRUE -//Put me in Reebe, will you? Ratvar has found and is going to fucking murder Nar-Sie +//Put me in Reebe, will you? Ratvar has found and is going to do a hecking murder on Nar-Sie /obj/structure/destructible/clockwork/massive/ratvar/proc/clash_of_the_titans(obj/singularity/narsie/narsie) var/winner = "Undeclared" var/base_victory_chance = 1 @@ -136,7 +137,7 @@ base_victory_chance *= 2 //The clash has a higher chance of resolving each time both gods attack one another switch(winner) if("Ratvar") - send_to_playing_players("\"[pick("DIE! DIE! DIE!", "FILTH!!!", "SUFFER!!!", text2ratvar("ROT FOR CENTURIES AS I HAVE!!"))]\"\n\ + send_to_playing_players("\"[pick("DIE.", "ROT.")]\"\n\ \"[pick("Nooooo...", "Not die. To y-", "Die. Ratv-", "Sas tyen re-")]\"") //nar-sie get out sound_to_playing_players('sound/magic/clockwork/anima_fragment_attack.ogg') sound_to_playing_players('sound/magic/demon_dies.ogg', 50) diff --git a/code/game/gamemodes/clock_cult/clock_structures/stargazer.dm b/code/game/gamemodes/clock_cult/clock_structures/stargazer.dm new file mode 100644 index 00000000000..bb8051356e4 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_structures/stargazer.dm @@ -0,0 +1,66 @@ +#define STARGAZER_RANGE 3 //How many tiles the stargazer can see out to +#define STARGAZER_POWER 20 //How many watts will be produced per second when the stargazer sees starlight + +//Stargazer: A very fragile but cheap generator that creates power from starlight. +/obj/structure/destructible/clockwork/stargazer + name = "stargazer" + desc = "A large lantern-shaped machine made of thin brass. It looks fragile." + clockwork_desc = "A lantern-shaped generator that produces power when near starlight." + icon_state = "stargazer" + unanchored_icon = "stargazer_unwrenched" + max_integrity = 40 + construction_value = 5 + layer = WALL_OBJ_LAYER + break_message = "The stargazer's fragile body shatters into pieces!" + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF + light_color = "#DAAA18" + var/star_light_star_bright = FALSE //If this stargazer can see starlight + +/obj/structure/destructible/clockwork/stargazer/Initialize() + . = ..() + START_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/stargazer/Destroy() + STOP_PROCESSING(SSprocessing, src) + . = ..() + +/obj/structure/destructible/clockwork/stargazer/examine(mob/user) + ..() + if(is_servant_of_ratvar(user)) + to_chat(user, "Generates [DisplayPower(STARGAZER_POWER)] per second while viewing starlight within [STARGAZER_RANGE] tiles.") + if(star_light_star_bright) + to_chat(user, "[is_servant_of_ratvar(user) ? "It can see starlight!" : "It's shining brilliantly!"]") + +/obj/structure/destructible/clockwork/stargazer/process() + star_light_star_bright = check_starlight() + if(star_light_star_bright) + adjust_clockwork_power(STARGAZER_POWER) + +/obj/structure/destructible/clockwork/stargazer/update_anchored(mob/living/user, damage) + . = ..() + star_light_star_bright = check_starlight() + +/obj/structure/destructible/clockwork/stargazer/proc/check_starlight() + var/old_status = star_light_star_bright + var/has_starlight + if(!anchored) + has_starlight = FALSE + else + for(var/turf/T in view(3, src)) + if(isspaceturf(T)) + has_starlight = TRUE + break + if(old_status != has_starlight) + if(has_starlight) + visible_message("[src] hums and shines brilliantly!") + playsound(src, 'sound/machines/clockcult/stargazer_activate.ogg', 50, TRUE) + add_overlay("stargazer_light") + set_light(1.5, 5) + else + if(anchored) //We lost visibility somehow + visible_message("[src] flickers, and falls dark.") + else + visible_message("[src] whooshes quietly as it slides into a less bulky form.") + cut_overlays() + set_light(0) + return has_starlight diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm deleted file mode 100644 index 326aa46c064..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm +++ /dev/null @@ -1,116 +0,0 @@ -//Tinkerer's cache: Stores components for later use. -/obj/structure/destructible/clockwork/cache - name = "tinkerer's cache" - desc = "A large brass spire with a flaming hole in its center." - clockwork_desc = "A brass container capable of storing a large amount of components.\n\ - Shares components with all other caches and will gradually generate components if near a Clockwork Wall." - icon_state = "tinkerers_cache" - unanchored_icon = "tinkerers_cache_unwrenched" - construction_value = 10 - break_message = "The cache's fire winks out before it falls in on itself!" - max_integrity = 80 - light_color = "#C2852F" - var/wall_generation_cooldown - var/turf/closed/wall/clockwork/linkedwall //if we've got a linked wall and are producing - var/static/linked_caches = 0 //how many caches are linked to walls; affects how fast components are produced - -/obj/structure/destructible/clockwork/cache/Initialize() - . = ..() - START_PROCESSING(SSobj, src) - GLOB.clockwork_caches++ - update_slab_info() - set_light(2, 0.7) - -/obj/structure/destructible/clockwork/cache/Destroy() - GLOB.clockwork_caches-- - update_slab_info() - STOP_PROCESSING(SSobj, src) - if(linkedwall) - linked_caches-- - linkedwall.linkedcache = null - linkedwall = null - return ..() - -/obj/structure/destructible/clockwork/cache/process() - if(!anchored) - if(linkedwall) - linked_caches-- - linkedwall.linkedcache = null - linkedwall = null - return - for(var/turf/closed/wall/clockwork/C in range(4, src)) - if(!C.linkedcache && !linkedwall) - linked_caches++ - C.linkedcache = src - linkedwall = C - wall_generation_cooldown = world.time + get_production_time() - visible_message("[src] starts to whirr in the presence of [C]...") - break - if(linkedwall && wall_generation_cooldown <= world.time) - wall_generation_cooldown = world.time + get_production_time() - var/component_id = generate_cache_component(null, src) - playsound(linkedwall, 'sound/magic/clockwork/fellowship_armory.ogg', rand(15, 20), 1, -3, 1, 1) - visible_message("Something cl[pick("ank", "ink", "unk", "ang")]s around inside of [src]...") - -/obj/structure/destructible/clockwork/cache/attackby(obj/item/I, mob/living/user, params) - if(!is_servant_of_ratvar(user)) - return ..() - if(istype(I, /obj/item/clockwork/component)) - var/obj/item/clockwork/component/C = I - if(!anchored) - to_chat(user, "[src] needs to be secured to place [C] into it!") - else - GLOB.clockwork_component_cache[C.component_id]++ - update_slab_info() - to_chat(user, "You add [C] to [src].") - user.drop_item() - qdel(C) - return 1 - else if(istype(I, /obj/item/clockwork/slab)) - var/obj/item/clockwork/slab/S = I - if(!anchored) - to_chat(user, "[src] needs to be secured to offload your slab's components into it!") - else - for(var/i in S.stored_components) - GLOB.clockwork_component_cache[i] += S.stored_components[i] - S.stored_components[i] = 0 - update_slab_info() - user.visible_message("[user] empties [S] into [src].", "You offload your slab's components into [src].") - return 1 - else - return ..() - -/obj/structure/destructible/clockwork/cache/update_anchored(mob/user, do_damage) - ..() - if(anchored) - set_light(2, 0.7) - else - set_light(0) - -/obj/structure/destructible/clockwork/cache/attack_hand(mob/living/user) - ..() - if(is_servant_of_ratvar(user)) - if(linkedwall) - if(wall_generation_cooldown > world.time) - var/temp_time = (wall_generation_cooldown - world.time) * 0.1 - to_chat(user, "[src] will produce a component in [temp_time] second[temp_time == 1 ? "":"s"].") - else - to_chat(user, "[src] is about to produce a component!") - else if(anchored) - to_chat(user, "[src] is unlinked! Construct a Clockwork Wall nearby to generate components!") - else - to_chat(user, "[src] needs to be secured to generate components!") - -/obj/structure/destructible/clockwork/cache/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(linkedwall) - to_chat(user, "It is linked to a Clockwork Wall and will generate a component every [round(get_production_time() * 0.1, 0.1)] seconds!") - else - to_chat(user, "It is unlinked! Construct a Clockwork Wall nearby to generate components!") - to_chat(user, "Stored components:") - for(var/i in GLOB.clockwork_component_cache) - to_chat(user, "[get_component_icon(i)] [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: [GLOB.clockwork_component_cache[i]]") - -/obj/structure/destructible/clockwork/cache/proc/get_production_time() - return (CACHE_PRODUCTION_TIME + (ACTIVE_CACHE_SLOWDOWN * linked_caches)) * get_efficiency_mod(TRUE) diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm deleted file mode 100644 index 4ceb7c3e260..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm +++ /dev/null @@ -1,171 +0,0 @@ -//Tinkerer's Daemon: A machine that rapidly produces components at a power cost. -/obj/structure/destructible/clockwork/powered/tinkerers_daemon - name = "tinkerer's daemon" - desc = "A strange machine with three small brass obelisks attached to it." - clockwork_desc = "An efficient machine that can rapidly produce components at a small power cost. It will only function if active daemons are outnumbered by servants at a rate to 5:1." - icon_state = "tinkerers_daemon" - active_icon = "tinkerers_daemon" - inactive_icon = "tinkerers_daemon" - unanchored_icon = "tinkerers_daemon_unwrenched" - max_integrity = 100 - construction_value = 20 - break_message = "The daemon shatters into millions of pieces, leaving only a disc of metal!" - debris = list(/obj/item/clockwork/alloy_shards/medium = 1, \ - /obj/item/clockwork/alloy_shards/small = 6, \ - /obj/item/clockwork/component/replicant_alloy/replication_plate = 1) - var/static/mutable_appearance/daemon_glow = mutable_appearance('icons/obj/clockwork_objects.dmi', "tinkerglow") - var/static/mutable_appearance/component_glow = mutable_appearance('icons/obj/clockwork_objects.dmi', "t_random_component") - var/component_id_to_produce - var/production_time = 0 //last time we produced a component - var/production_cooldown = 70 - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/Destroy() - GLOB.active_daemons -= src - return ..() - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(active) - if(component_id_to_produce) - to_chat(user, "It is currently producing [get_component_name(component_id_to_produce)][component_id_to_produce != REPLICANT_ALLOY ? "s":""].") - else - to_chat(user, "It is currently producing random components.") - to_chat(user, "It will produce a component every [round((production_cooldown*0.1) * get_efficiency_mod(TRUE), 0.1)] seconds and requires at least the following power for each component type:") - for(var/i in GLOB.clockwork_component_cache) - to_chat(user, "[get_component_icon(i)] [get_component_name(i)]: [DisplayPower(get_component_cost(i))] ([GLOB.clockwork_component_cache[i]] exist[GLOB.clockwork_component_cache[i] == 1 ? "s" : ""])") - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/forced_disable(bad_effects) - if(active) - if(bad_effects) - try_use_power(MIN_CLOCKCULT_POWER*4) - visible_message("[src] shuts down with a horrible grinding noise!") - playsound(src, 'sound/magic/clockwork/anima_fragment_attack.ogg', 50, 1) - else - visible_message("[src] shuts down!") - toggle() - return TRUE - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/attack_hand(mob/living/user) - if(!is_servant_of_ratvar(user)) - to_chat(user, "You place your hand on the daemon, but nothing happens.") - return - if(active) - toggle(0, user) - else - if(!anchored) - to_chat(user, "[src] needs to be secured to the floor before it can be activated!") - return FALSE - if(!GLOB.clockwork_caches) - to_chat(user, "\"You require a cache for this daemon to operate. Get to it.\"") - return - var/min_power_usable = 0 - for(var/i in GLOB.clockwork_component_cache) - if(!min_power_usable) - min_power_usable = get_component_cost(i) - else - min_power_usable = min(min_power_usable, get_component_cost(i)) - if(total_accessable_power() < min_power_usable) - to_chat(user, "\"You need more power to activate this daemon, friend.\"") - return - var/servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(servants * 0.2 < 1) - to_chat(user, "\"There are too few servants for daemons to work.\"") - return - var/choice = alert(user,"Activate Daemon...",,"Specific Component","Random Component","Cancel") - switch(choice) - if("Specific Component") - var/list/components = list() - for(var/i in GLOB.clockwork_component_cache) - components["[get_component_name(i)] ([DisplayPower(get_component_cost(i))])"] = i - var/input_component = input(user, "Choose a component type.", name) as null|anything in components - component_id_to_produce = components[input_component] - servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1) - return - if(!component_id_to_produce) - to_chat(user, "You decide not to select a component and activate the daemon.") - return - if(total_accessable_power() < get_component_cost(component_id_to_produce)) - to_chat(user, "There is too little power to produce this type of component!") - return - toggle(0, user) - if("Random Component") - component_id_to_produce = null - servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1) - return - toggle(0, user) - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/toggle(fast_process, mob/living/user) - . = ..() - if(active) - GLOB.active_daemons += src - var/component_color = get_component_color(component_id_to_produce) - daemon_glow.color = component_color - add_overlay(daemon_glow) - component_glow.icon_state = "t_[component_id_to_produce ? component_id_to_produce :"random_component"]" - component_glow.color = component_color - add_overlay(component_glow) - production_time = world.time + production_cooldown //don't immediately produce when turned on after being off - set_light(2, 0.9, get_component_color_bright(component_id_to_produce)) - else - GLOB.active_daemons -= src - cut_overlays() - set_light(0) - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/proc/get_component_cost(id) - return max(MIN_CLOCKCULT_POWER*2, (MIN_CLOCKCULT_POWER*2) * (1 + round(GLOB.clockwork_component_cache[id] * 0.2))) - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/process() - var/servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - while(servants * 0.2 < LAZYLEN(GLOB.active_daemons)) - var/obj/structure/destructible/clockwork/powered/tinkerers_daemon/D = GLOB.active_daemons[1] - if(!istype(D)) - break - if(D.active) - D.forced_disable(FALSE) - if(D == src) - return - . = ..() - var/min_power_usable = 0 - if(!component_id_to_produce) - for(var/i in GLOB.clockwork_component_cache) - if(!min_power_usable) - min_power_usable = get_component_cost(i) - else - min_power_usable = min(min_power_usable, get_component_cost(i)) - else - min_power_usable = get_component_cost(component_id_to_produce) - if(!GLOB.clockwork_caches || . < min_power_usable) //if we don't have enough to produce the lowest or what we chose to produce, cancel out - forced_disable(FALSE) - return - if(production_time <= world.time) - var/component_to_generate = component_id_to_produce - if(!component_to_generate) - component_to_generate = get_weighted_component_id() //more likely to generate components that we have less of - if(!try_use_power(get_component_cost(component_to_generate))) - component_to_generate = null - if(!component_id_to_produce) - for(var/i in GLOB.clockwork_component_cache) - if(try_use_power(get_component_cost(i))) //if we fail but are producing random, try and get a different component to produce - component_to_generate = i - break - if(component_to_generate) - generate_cache_component(component_to_generate, src) - production_time = world.time + (production_cooldown * get_efficiency_mod(TRUE)) //go on cooldown - visible_message("[src] hums as it produces a component.") - else - forced_disable(FALSE) //we shouldn't actually ever get here, as we should cancel out way before this diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 64062325962..01773f1ea66 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -21,6 +21,8 @@ return FALSE if(M.mind.enslaved_to && !iscultist(M.mind.enslaved_to)) return FALSE + if(M.mind.unconvertable) + return FALSE else return FALSE if(M.isloyal() || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M)) @@ -55,10 +57,10 @@ /datum/game_mode/cult/pre_setup() cult_objectives += "sacrifice" - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" //cult scaling goes here diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index 283376b055c..b8cbed50512 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -96,7 +96,7 @@ /proc/pollCultists(var/mob/living/Nominee) //Cult Master Poll if(world.time < CULT_POLL_WAIT) - to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [round((CULT_POLL_WAIT-world.time)/10)] seconds.") + to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].") return GLOB.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try for(var/datum/mind/B in SSticker.mode.cult) @@ -232,7 +232,7 @@ return FALSE if(cooldown > world.time) if(!CM.active) - to_chat(owner, "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!") + to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!") return FALSE return ..() @@ -324,7 +324,7 @@ return FALSE if(cooldown > world.time) if(!PM.active) - to_chat(owner, "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can pulse again!") + to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!") return FALSE return ..() diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 55f8ece5e65..62fe64eceec 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -72,6 +72,170 @@ if(is_servant_of_ratvar(C) && C.reagents) C.reagents.add_reagent("heparin", 1) +/obj/item/twohanded/required/cult_bastard + name = "bloody bastard sword" + desc = "An enormous sword used by Nar-Sien cultists to rapidly harvest the souls of non-believers." + w_class = WEIGHT_CLASS_HUGE + block_chance = 50 + throwforce = 20 + force = 35 + armour_penetration = 45 + throw_speed = 1 + throw_range = 3 + sharpness = IS_SHARP + light_color = "#ff0000" + attack_verb = list("cleaved", "slashed", "torn", "hacked", "ripped", "diced", "carved") + icon_state = "cultbastard" + item_state = "cultbastard" + hitsound = 'sound/weapons/bladeslice.ogg' + lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 + actions_types = list() + flags_2 = SLOWS_WHILE_IN_HAND_2 + var/datum/action/innate/dash/cult/jaunt + var/datum/action/innate/cult/spin2win/linked_action + var/spinning = FALSE + var/spin_cooldown = 250 + var/dash_toggled = TRUE + +/obj/item/twohanded/required/cult_bastard/Initialize() + . = ..() + set_light(4) + jaunt = new(src) + linked_action = new(src) + +/obj/item/twohanded/required/cult_bastard/can_be_pulled(user) + return FALSE + +/obj/item/twohanded/required/cult_bastard/attack_self(mob/user) + dash_toggled = !dash_toggled + if(dash_toggled) + to_chat(loc, "You raise the [src] and prepare to jaunt with it.") + else + to_chat(loc, "You lower the [src] and prepare to swing it normally.") + +/obj/item/twohanded/required/cult_bastard/pickup(mob/living/user) + . = ..() + if(!iscultist(user)) + if(!is_servant_of_ratvar(user)) + to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, "An overwhelming sense of nausea overpowers you!") + user.Dizzy(80) + user.Knockdown(30) + return + else + to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") + to_chat(user, "A horrible force yanks at your arm!") + user.emote("scream") + user.apply_damage(30, BRUTE, pick("l_arm", "r_arm")) + user.Knockdown(50) + return + jaunt.Grant(user, src) + linked_action.Grant(user, src) + user.update_icons() + +/obj/item/twohanded/required/cult_bastard/dropped(mob/user) + . = ..() + linked_action.Remove(user) + jaunt.Remove(user) + user.update_icons() + +/obj/item/twohanded/required/cult_bastard/IsReflect() + if(spinning) + playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1) + return TRUE + else + ..() + +/obj/item/twohanded/required/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(prob(final_block_chance)) + if(attack_type == PROJECTILE_ATTACK) + owner.visible_message("[owner] deflects [attack_text] with [src]!") + playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 100, 1) + return TRUE + else + playsound(src, 'sound/weapons/parry.ogg', 75, 1) + owner.visible_message("[owner] parries [attack_text] with [src]!") + return TRUE + return FALSE + +/obj/item/twohanded/required/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters) + . = ..() + if(dash_toggled) + jaunt.Teleport(user, target) + return + if(!proximity) + return + if(ishuman(target)) + var/mob/living/carbon/human/H = target + if(H.stat != CONSCIOUS) + var/obj/item/device/soulstone/SS = new /obj/item/device/soulstone(src) + SS.attack(H, user) + if(!LAZYLEN(SS.contents)) + qdel(SS) + if(istype(target, /obj/structure/constructshell) && contents.len) + var/obj/item/device/soulstone/SS = contents[1] + if(istype(SS)) + SS.transfer_soul("CONSTRUCT",target,user) + qdel(SS) + +/datum/action/innate/dash/cult + name = "Rend the Veil" + desc = "Use the sword to shear open the flimsy fabric of this reality and teleport to your target." + icon_icon = 'icons/mob/actions/actions_cult.dmi' + button_icon_state = "phaseshift" + dash_sound = 'sound/magic/enter_blood.ogg' + recharge_sound = 'sound/magic/exit_blood.ogg' + beam_effect = "sendbeam" + phasein = /obj/effect/temp_visual/dir_setting/cult/phase + phaseout = /obj/effect/temp_visual/dir_setting/cult/phase/out + +/datum/action/innate/dash/cult/IsAvailable() + if(iscultist(holder) && current_charges) + return TRUE + else + return FALSE + + + +/datum/action/innate/cult/spin2win + name = "Geometer's Fury" + desc = "You draw on the power of the sword's ancient runes, spinning it wildly around you as you become immune to most attacks." + background_icon_state = "bg_demon" + button_icon_state = "sintouch" + var/cooldown = 0 + var/mob/living/carbon/human/holder + var/obj/item/twohanded/required/cult_bastard/sword + +/datum/action/innate/cult/spin2win/Grant(mob/user, obj/bastard) + . = ..() + sword = bastard + holder = user + +/datum/action/innate/cult/spin2win/IsAvailable() + if(iscultist(holder) && cooldown <= world.time) + return TRUE + else + return FALSE + +/datum/action/innate/cult/spin2win/Activate() + cooldown = world.time + sword.spin_cooldown + holder.changeNext_move(50) + holder.apply_status_effect(/datum/status_effect/sword_spin) + sword.spinning = TRUE + sword.block_chance = 100 + sword.slowdown += 1.5 + addtimer(CALLBACK(src, .proc/stop_spinning), 50) + holder.update_action_buttons_icon() + +/datum/action/innate/cult/spin2win/proc/stop_spinning() + sword.spinning = FALSE + sword.block_chance = 50 + sword.slowdown -= 1.5 + sleep(sword.spin_cooldown) + holder.update_action_buttons_icon() /obj/item/restraints/legcuffs/bola/cult name = "nar'sien bola" diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 0cba943287b..8140dffe53e 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -10,7 +10,7 @@ ..() to_chat(user, "\The [src] is [anchored ? "":"not "]secured to the floor.") if((iscultist(user) || isobserver(user)) && cooldowntime > world.time) - to_chat(user, "The magic in [src] is too weak, [p_they()] will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") /obj/structure/destructible/cult/examine_status(mob/user) if(iscultist(user) || isobserver(user)) @@ -50,13 +50,6 @@ animate(src, color = previouscolor, time = 8) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) -/obj/structure/destructible/cult/proc/getETA() - var/time = (cooldowntime - world.time)/600 - var/eta = "[round(time, 1)] minutes" - if(time <= 1) - time = (cooldowntime - world.time)*0.1 - eta = "[round(time, 1)] seconds" - return eta /obj/structure/destructible/cult/talisman name = "altar" @@ -72,7 +65,7 @@ to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return var/choice = alert(user,"You study the schematics etched into the forge...",,"Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water") var/pickedtype @@ -105,17 +98,23 @@ to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return - var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Nar-Sien Hardsuit") + var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Bastard Sword") var/pickedtype switch(choice) if("Shielded Robe") pickedtype = /obj/item/clothing/suit/hooded/cultrobes/cult_shield if("Flagellant's Robe") pickedtype = /obj/item/clothing/suit/hooded/cultrobes/berserker - if("Nar-Sien Hardsuit") - pickedtype = /obj/item/clothing/suit/space/hardsuit/cult + if("Bastard Sword") + if((world.time - SSticker.round_start_time) >= 12000) + pickedtype = /obj/item/twohanded/required/cult_bastard + else + cooldowntime = 12000 - (world.time - SSticker.round_start_time) + to_chat(user, "The forge fires are not yet hot enough for this weapon, give it another [DisplayTimeText(cooldowntime)].") + cooldowntime = 0 + return if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) cooldowntime = world.time + 2400 var/obj/item/N = new pickedtype(get_turf(src)) @@ -212,7 +211,7 @@ to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Walker Set") var/list/pickedtype = list() diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm index 755fdef87fb..844b027e937 100644 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ b/code/game/gamemodes/devil/devil_game_mode.dm @@ -20,15 +20,16 @@ + Crew: Resist the lure of sin and remain pure!" /datum/game_mode/devil/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" var/num_devils = 1 - if(config.traitor_scaling_coeff) - num_devils = max(minimum_devils, min( round(num_players()/(config.traitor_scaling_coeff*3))+ 2 + num_modifier, round(num_players()/(config.traitor_scaling_coeff*1.5)) + num_modifier )) + var/tsc = CONFIG_GET(number/traitor_scaling_coeff) + if(tsc) + num_devils = max(minimum_devils, min( round(num_players() / (tsc * 3))+ 2 + num_modifier, round(num_players() / (tsc * 1.5)) + num_modifier)) else num_devils = max(minimum_devils, min(num_players(), traitors_possible)) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 82350726d97..9f676936135 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -19,7 +19,6 @@ var/probability = 0 var/false_report_weight = 0 //How often will this show up incorrectly in a centcom report? var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm - var/explosion_in_progress = 0 //sit back and relax var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such var/list/datum/mind/modePlayer = new var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here @@ -79,7 +78,7 @@ ///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things /datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report. if(!report) - report = config.intercept + report = !CONFIG_GET(flag/no_intercept_report) addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) if(SSdbcore.Connect()) @@ -114,14 +113,15 @@ for(var/mob/Player in GLOB.mob_list) if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client) living_crew += Player - if(living_crew.len / GLOB.joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh - message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew") + var/malc = CONFIG_GET(number/midround_antag_life_check) + if(living_crew.len / GLOB.joined_player_list.len <= malc) //If a lot of the player base died, we start fresh + message_admins("Convert_roundtype failed due to too many dead people. Limit is [malc * 100]% living crew") return null var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len) var/list/datum/game_mode/usable_modes = list() for(var/datum/game_mode/G in runnable_modes) - if(G.reroll_friendly && living_crew >= G.required_players) + if(G.reroll_friendly && living_crew.len >= G.required_players) usable_modes += G else qdel(G) @@ -139,8 +139,9 @@ if(SSshuttle.emergency.timeLeft(1) < initial(SSshuttle.emergencyCallTime)*0.5) return 1 - if(world.time >= (config.midround_antag_time_check * 600)) - message_admins("Convert_roundtype failed due to round length. Limit is [config.midround_antag_time_check] minutes.") + var/matc = CONFIG_GET(number/midround_antag_time_check) + if(world.time >= (matc * 600)) + message_admins("Convert_roundtype failed due to round length. Limit is [matc] minutes.") return null var/list/antag_candidates = list() @@ -155,12 +156,12 @@ antag_candidates = shuffle(antag_candidates) - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) replacementmode.restricted_jobs += replacementmode.protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) replacementmode.restricted_jobs += "Assistant" - message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") + message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") . = 1 sleep(rand(600,1800)) @@ -169,7 +170,7 @@ round_converted = 0 return //somewhere between 1 and 3 minutes from now - if(!config.midround_antag[SSticker.mode.config_tag]) + if(!CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag]) round_converted = 0 return 1 for(var/mob/living/carbon/human/H in antag_candidates) @@ -190,7 +191,9 @@ return TRUE if(station_was_nuked) return TRUE - if(!round_converted && (!config.continuous[config_tag] || (config.continuous[config_tag] && config.midround_antag[config_tag]))) //Non-continuous or continous with replacement antags + var/list/continuous = CONFIG_GET(keyed_flag_list/continuous) + var/list/midround_antag = CONFIG_GET(keyed_flag_list/midround_antag) + if(!round_converted && (!continuous[config_tag] || (continuous[config_tag] && midround_antag[config_tag]))) //Non-continuous or continous with replacement antags if(!continuous_sanity_checked) //make sure we have antags to be checking in the first place for(var/mob/Player in GLOB.mob_list) if(Player.mind) @@ -199,8 +202,8 @@ return 0 if(!continuous_sanity_checked) message_admins("The roundtype ([config_tag]) has no antagonists, continuous round has been defaulted to on and midround_antag has been defaulted to off.") - config.continuous[config_tag] = 1 - config.midround_antag[config_tag] = 0 + continuous[config_tag] = TRUE + midround_antag[config_tag] = FALSE SSshuttle.clearHostileEnvironment(src) return 0 @@ -214,7 +217,7 @@ living_antag_player = Player return 0 - if(!config.continuous[config_tag] || force_ending) + if(!continuous[config_tag] || force_ending) return 1 else @@ -223,7 +226,7 @@ if(round_ends_with_antag_death) return 1 else - config.midround_antag[config_tag] = 0 + midround_antag[config_tag] = 0 return 0 return 0 @@ -518,7 +521,7 @@ /datum/game_mode/proc/get_remaining_days(client/C) if(!C) return 0 - if(!config.use_age_restriction_for_jobs) + if(!CONFIG_GET(flag/use_age_restriction_for_jobs)) return 0 if(!isnum(C.player_age)) return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced @@ -562,3 +565,8 @@ /datum/game_mode/proc/generate_report() //Generates a small text blurb for the gamemode in centcom report return "Gamemode report for [name] not set. Contact a coder." + +//By default nuke just ends the round +/datum/game_mode/proc/OnNukeExplosion(off_station) + if(off_station < 2) + station_was_nuked = TRUE //Will end the round on next check. \ No newline at end of file diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 80a22c6b3b5..e972eb5bbb6 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -367,17 +367,17 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/sec_left = seconds_remaining() if(!sec_left) timing = FALSE - detonate(T.z) + detonate() else if(world.time >= next_announce) minor_announce("[sec_left] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE) next_announce += DOOMSDAY_ANNOUNCE_INTERVAL -/obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION_PRIMARY) +/obj/machinery/doomsday_device/proc/detonate() sound_to_playing_players('sound/machines/alarm.ogg') sleep(100) for(var/mob/living/L in GLOB.mob_list) var/turf/T = get_turf(L) - if(!T || T.z != z_level) + if(!T || !(T.z in GLOB.station_z_levels)) continue if(issilicon(L)) continue diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 3bb3c8b43ed..54e6b7de400 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -31,15 +31,16 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event var/max_i = 10//number of tries to spawn meteor. while(!isspaceturf(pickedstart)) var/startSide = pick(GLOB.cardinals) - pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION_PRIMARY) - pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION_PRIMARY) + var/startZ = pick(GLOB.station_z_levels) + pickedstart = spaceDebrisStartLoc(startSide, startZ) + pickedgoal = spaceDebrisFinishLoc(startSide, startZ) max_i-- if(max_i<=0) return var/Me = pickweight(meteortypes) var/obj/effect/meteor/M = new Me(pickedstart) M.dest = pickedgoal - M.z_original = ZLEVEL_STATION_PRIMARY + M.z_original = M.z spawn(0) walk_towards(M, M.dest, 1) @@ -119,6 +120,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event /obj/effect/meteor/Destroy() GLOB.meteor_list -= src + SSaugury.unregister_doom(src) walk(src,0) //this cancels the walk_towards() proc . = ..() diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 7ff5a9742de..d6f1b775e96 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -1,5 +1,17 @@ +/datum/objective_team/abductor_team + member_name = "abductor" + var/list/objectives = list() + var/team_number + +/datum/objective_team/abductor_team/is_solo() + return FALSE + +/datum/objective_team/abductor_team/proc/add_objective(datum/objective/O) + O.team = src + O.update_explanation_text() + objectives += O + /datum/game_mode - var/abductor_teams = 0 var/list/datum/mind/abductors = list() var/list/datum/mind/abductees = list() @@ -12,12 +24,8 @@ required_players = 15 maximum_players = 50 var/max_teams = 4 - abductor_teams = 1 - var/list/datum/mind/scientists = list() - var/list/datum/mind/agents = list() - var/list/datum/objective/team_objectives = list() - var/list/team_names = list() - var/finished = 0 + var/list/datum/objective_team/abductor_team/abductor_teams = list() + var/finished = FALSE /datum/game_mode/abduction/announce() to_chat(world, "The current game mode is - Abduction!") @@ -26,163 +34,78 @@ to_chat(world, "Crew - don't get abducted and stop the abductors.") /datum/game_mode/abduction/pre_setup() - abductor_teams = max(1, min(max_teams,round(num_players()/config.abductor_scaling_coeff))) - var/possible_teams = max(1,round(antag_candidates.len / 2)) - abductor_teams = min(abductor_teams,possible_teams) + var/num_teams = max(1, min(max_teams, round(num_players() / CONFIG_GET(number/abductor_scaling_coeff)))) + var/possible_teams = max(1, round(antag_candidates.len / 2)) + num_teams = min(num_teams, possible_teams) - abductors.len = 2*abductor_teams - scientists.len = abductor_teams - agents.len = abductor_teams - team_objectives.len = abductor_teams - team_names.len = abductor_teams + for(var/i = 1 to num_teams) + if(!make_abductor_team()) + return FALSE + return TRUE - for(var/i=1,i<=abductor_teams,i++) - if(!make_abductor_team(i)) - return 0 +/datum/game_mode/abduction/proc/make_abductor_team(datum/mind/agent, datum/mind/scientist) + var/team_number = abductor_teams.len+1 - return 1 + var/datum/objective_team/abductor_team/team = new + team.team_number = team_number + team.name = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names + team.add_objective(new/datum/objective/experiment) -/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null) - //Team Name - team_names[team_number] = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names - //Team Objective - var/datum/objective/experiment/team_objective = new - team_objective.team_number = team_number - team_objectives[team_number] = team_objective - //Team Members + if(antag_candidates.len < (!agent + !scientist)) + return - if(!preset_agent || !preset_scientist) - if(antag_candidates.len <=2) - return 0 - - var/datum/mind/scientist - var/datum/mind/agent - - if(!preset_scientist) + if(!scientist) scientist = pick(antag_candidates) - antag_candidates -= scientist - else - scientist = preset_scientist + antag_candidates -= scientist + team.members |= scientist + scientist.assigned_role = "Abductor Scientist" + log_game("[scientist.key] (ckey) has been selected as [team.name] abductor scientist.") - if(!preset_agent) + if(!agent) agent = pick(antag_candidates) - antag_candidates -= agent - else - agent = preset_agent + antag_candidates -= agent + team.members |= agent + agent.assigned_role = "Abductor Agent" + log_game("[agent.key] (ckey) has been selected as [team.name] abductor agent.") - - scientist.assigned_role = "abductor scientist" - scientist.special_role = "abductor scientist" - log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.") - - agent.assigned_role = "abductor agent" - agent.special_role = "abductor agent" - log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.") - - abductors |= agent - abductors |= scientist - scientists[team_number] = scientist - agents[team_number] = agent - return 1 + abductor_teams += team + return team /datum/game_mode/abduction/post_setup() - for(var/team_number=1,team_number<=abductor_teams,team_number++) - post_setup_team(team_number) + for(var/datum/objective_team/abductor_team/team in abductor_teams) + post_setup_team(team) return ..() //Used for create antag buttons -/datum/game_mode/abduction/proc/post_setup_team(team_number) - var/list/obj/effect/landmark/abductor/agent_landmarks = list() - var/list/obj/effect/landmark/abductor/scientist_landmarks = list() - agent_landmarks.len = max_teams - scientist_landmarks.len = max_teams - for(var/obj/effect/landmark/abductor/A in GLOB.landmarks_list) - if(istype(A, /obj/effect/landmark/abductor/agent)) - agent_landmarks[text2num(A.team)] = A - else if(istype(A, /obj/effect/landmark/abductor/scientist)) - scientist_landmarks[text2num(A.team)] = A - - var/team_name = team_names[team_number] - - var/datum/mind/agent - var/obj/effect/landmark/L - var/datum/mind/scientist - var/mob/living/carbon/human/H - var/datum/species/abductor/S - - agent = agents[team_number] - H = agent.current - L = agent_landmarks[team_number] - H.forceMove(L.loc) - H.set_species(/datum/species/abductor) - S = H.dna.species - S.team = team_number - H.real_name = team_name + " Agent" - H.equipOutfit(/datum/outfit/abductor/agent) - greet_agent(agent,team_number) - - - scientist = scientists[team_number] - H = scientist.current - L = scientist_landmarks[team_number] - H.forceMove(L.loc) - H.set_species(/datum/species/abductor) - S = H.dna.species - S.scientist = TRUE - S.team = team_number - H.real_name = team_name + " Scientist" - H.equipOutfit(/datum/outfit/abductor/scientist) - greet_scientist(scientist,team_number) - - - -/datum/game_mode/abduction/proc/greet_agent(datum/mind/abductor,team_number) - abductor.objectives += team_objectives[team_number] - var/team_name = team_names[team_number] - - to_chat(abductor.current, "You are an agent of [team_name]!") - to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") - to_chat(abductor.current, "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve.") - - abductor.announce_objectives() - -/datum/game_mode/abduction/proc/greet_scientist(datum/mind/abductor,team_number) - abductor.objectives += team_objectives[team_number] - var/team_name = team_names[team_number] - - to_chat(abductor.current, "You are a scientist of [team_name]!") - to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") - to_chat(abductor.current, "Use your tool and ship consoles to support the agent and retrieve human specimens.") - - abductor.announce_objectives() - -/datum/game_mode/abduction/proc/get_team_console(team_number) - for(var/obj/machinery/abductor/console/C in GLOB.machines) - if(C.team == team_number) - return C +/datum/game_mode/abduction/proc/post_setup_team(datum/objective_team/abductor_team/team) + for(var/datum/mind/M in team.members) + if(M.assigned_role == "Abductor Scientist") + M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_SCIENTIST, team) + else + M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_AGENT, team) /datum/game_mode/abduction/check_finished() if(!finished) - for(var/team_number=1,team_number<=abductor_teams,team_number++) - var/obj/machinery/abductor/console/con = get_team_console(team_number) - var/datum/objective/objective = team_objectives[team_number] - if (con.experiment.points >= objective.target_amount) - SSshuttle.emergency.request(null, set_coefficient = 0.5) - finished = 1 - return ..() + for(var/datum/objective_team/abductor_team/team in abductor_teams) + for(var/datum/objective/O in team.objectives) + if(O.check_completion()) + SSshuttle.emergency.request(null, set_coefficient = 0.5) + finished = TRUE + return ..() return ..() /datum/game_mode/abduction/declare_completion() - for(var/team_number=1,team_number<=abductor_teams,team_number++) - var/obj/machinery/abductor/console/console = get_team_console(team_number) - var/datum/objective/objective = team_objectives[team_number] - var/team_name = team_names[team_number] - if(console.experiment.points >= objective.target_amount) - to_chat(world, "[team_name] team fulfilled its mission!") + for(var/datum/objective_team/abductor_team/team in abductor_teams) + var/won = TRUE + for(var/datum/objective/O in team.objectives) + if(!O.check_completion()) + won = FALSE + if(won) + to_chat(world, "[team.name] team fulfilled its mission!") else - to_chat(world, "[team_name] team failed its mission.") + to_chat(world, "[team.name] team failed its mission.") ..() - return 1 + return TRUE /datum/game_mode/proc/auto_declare_completion_abduction() var/text = "" @@ -200,40 +123,28 @@ text += "
" to_chat(world, text) -//Landmarks -// TODO: Split into separate landmarks for prettier ships +// LANDMARKS /obj/effect/landmark/abductor - var/team = 1 + var/team_number = 1 /obj/effect/landmark/abductor/agent /obj/effect/landmark/abductor/scientist - // OBJECTIVES /datum/objective/experiment target_amount = 6 - var/team_number /datum/objective/experiment/New() explanation_text = "Experiment on [target_amount] humans." /datum/objective/experiment/check_completion() - var/ab_team = team_number - if(owner) - if(!owner.current || !ishuman(owner.current)) - return 0 - var/mob/living/carbon/human/H = owner.current - if(H.dna.species.id != "abductor") - return 0 - var/datum/species/abductor/S = H.dna.species - ab_team = S.team for(var/obj/machinery/abductor/experiment/E in GLOB.machines) - if(E.team == ab_team) - if(E.points >= target_amount) - return 1 - else - return 0 - return 0 + if(!istype(team, /datum/objective_team/abductor_team)) + return FALSE + var/datum/objective_team/abductor_team/T = team + if(E.team_number == T.team_number) + return E.points >= target_amount + return FALSE /datum/game_mode/proc/update_abductor_icons_added(datum/mind/alien_mind) var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_ABDUCTOR] diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index c55b4db4075..36168a58d22 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -328,7 +328,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} return /obj/item/paper/guides/antag/abductor/AltClick() - return + return //otherwise it would fold into a paperplane. #define BATON_STUN 0 #define BATON_SLEEP 1 @@ -532,7 +532,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} flags_2 = BANG_PROTECT_2 /obj/item/device/radio/headset/abductor/Initialize(mapload) - ..() + . = ..() make_syndie() /obj/item/device/radio/headset/abductor/attackby(obj/item/W, mob/user, params) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm index aa97d1e2d86..b24bef04333 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm @@ -5,20 +5,14 @@ back = /obj/item/storage/backpack ears = /obj/item/device/radio/headset/abductor -/datum/outfit/abductor/proc/get_team_console(team_number) - for(var/obj/machinery/abductor/console/C in GLOB.machines) - if(C.team == team_number) - return C - /datum/outfit/abductor/proc/link_to_console(mob/living/carbon/human/H, team_number) - if(!team_number && isabductor(H)) - var/datum/species/abductor/S = H.dna.species - team_number = S.team - + var/datum/antagonist/abductor/A = H.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR) + if(!team_number && A) + team_number = A.team.team_number if(!team_number) team_number = 1 - var/obj/machinery/abductor/console/console = get_team_console(team_number) + var/obj/machinery/abductor/console/console = get_abductor_console(team_number) if(console) var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H if(V) diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index a3d69c45b94..20bd7c9df27 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -218,7 +218,7 @@ /obj/structure/spider/cocoon/abductor/proc/Copy(mob/living/carbon/human/H) var/mob/living/carbon/human/interactive/greytide/clone = new(src) - clone.hardset_dna(H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species.type, H.dna.features) + clone.hardset_dna(H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species, H.dna.features) /obj/structure/spider/cocoon/abductor/proc/Start() hatch_time = world.time + 600 diff --git a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm index 97893d6d2ee..fd9ca0a6584 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/camera_advanced/abductor name = "Human Observation Console" - var/team = 0 + var/team_number = 0 networks = list("SS13","Abductor") var/datum/action/innate/teleport_in/tele_in_action = new var/datum/action/innate/teleport_out/tele_out_action = new @@ -9,7 +9,7 @@ var/datum/action/innate/vest_disguise_swap/vest_disguise_action = new var/datum/action/innate/set_droppoint/set_droppoint_action = new var/obj/machinery/abductor/console/console - z_lock = ZLEVEL_STATION_PRIMARY + station_lock_override = TRUE icon = 'icons/obj/abductor.dmi' icon_state = "camera" diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index f3deebc6b74..d44ff57c964 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -1,8 +1,13 @@ +/proc/get_abductor_console(team_number) + for(var/obj/machinery/abductor/console/C in GLOB.machines) + if(C.team_number == team_number) + return C + //Common /obj/machinery/abductor resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - var/team = 0 + var/team_number = 0 //Console @@ -139,21 +144,21 @@ return INITIALIZE_HINT_LATELOAD /obj/machinery/abductor/console/LateInitialize() - if(!team) + if(!team_number) return for(var/obj/machinery/abductor/pad/p in GLOB.machines) - if(p.team == team) + if(p.team_number == team_number) pad = p break for(var/obj/machinery/abductor/experiment/e in GLOB.machines) - if(e.team == team) + if(e.team_number == team_number) experiment = e e.console = src for(var/obj/machinery/computer/camera_advanced/abductor/c in GLOB.machines) - if(c.team == team) + if(c.team_number == team_number) camera = c c.console = src diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 88bb84fc4a8..2b012e5f811 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -60,9 +60,8 @@ /obj/machinery/abductor/gland_dispenser/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/organ/heart/gland)) - if(!user.drop_item()) + if(!user.transferItemToLoc(W, src)) return - W.loc = src for(var/i=1,i<=gland_colors.len,i++) if(gland_types[i] == W.type) amounts[i]++ diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 182b7e27560..99059e7a251 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -13,7 +13,7 @@ var/flash = " - || - " var/obj/machinery/abductor/console/console var/message_cooldown = 0 - var/breakout_time = 0.75 + var/breakout_time = 450 /obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user) if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) @@ -50,9 +50,9 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ "You hear a metallic creaking from [src].") - if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return user.visible_message("[user] successfully broke out of [src]!", \ @@ -62,7 +62,7 @@ /obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H) var/icon/photo = null var/g = (H.gender == FEMALE) ? "f" : "m" - if(!config.mutant_races || H.dna.species.use_skintones) + if(!CONFIG_GET(flag/join_with_mutant_race) || H.dna.species.use_skintones) photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]") else photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]") diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 8979fb8c784..c125f7648d5 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -468,11 +468,8 @@ return var/turf/open/floor/F - switch(z) //Only the station/lavaland - if(ZLEVEL_STATION_PRIMARY) - F =find_safe_turf(zlevels = ZLEVEL_STATION_PRIMARY, extended_safety_checks = TRUE) - if(ZLEVEL_LAVALAND) - F = find_safe_turf(zlevels = ZLEVEL_LAVALAND, extended_safety_checks = TRUE) + F = find_safe_turf(zlevels = z, extended_safety_checks = TRUE) + if(!F) return // If we're getting rid of a human, slap some energy cuffs on @@ -502,7 +499,7 @@ var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc) M.amount = 5 for(var/obj/item/I in target.component_parts) - I.loc = M.loc + I.forceMove(M.drop_location()) var/obj/effect/temp_visual/swarmer/disintegration/N = new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target)) N.pixel_x = target.pixel_x N.pixel_y = target.pixel_y @@ -511,7 +508,7 @@ if(istype(target, /obj/machinery/computer)) var/obj/machinery/computer/C = target if(C.circuit) - C.circuit.loc = M.loc + C.circuit.forceMove(M.drop_location()) qdel(target) diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index f763f742f7f..5e1a97675b9 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -77,7 +77,7 @@ /mob/living/simple_animal/hostile/morph/proc/eat(atom/movable/A) if(A && A.loc != src) visible_message("[src] swallows [A] whole!") - A.loc = src + A.forceMove(src) return 1 return 0 @@ -153,7 +153,7 @@ /mob/living/simple_animal/hostile/morph/proc/barf_contents() for(var/atom/movable/AM in src) - AM.loc = loc + AM.forceMove(loc) if(prob(90)) step(AM, pick(GLOB.alldirs)) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm index 783cfdd9307..fb0bdfb6f93 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm @@ -34,17 +34,13 @@ var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/revenantspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("revenantspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs.len) //If we can't find any revenant spawns, try the carp spawns - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("carpspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs.len) //If we can't find either, just spawn the revenant at the player's location spawn_locs += get_turf(selected) if(!spawn_locs.len) //If we can't find THAT, then just give up and cry diff --git a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm index bcb2218fe69..4d85744738a 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm @@ -23,17 +23,15 @@ player_mind.active = 1 var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("carpspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs) message_admins("No valid spawn locations found, aborting...") return MAP_ERROR - var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs))) + var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs))) var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder) S.holder = holder player_mind.transfer_to(S) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index d48628ddd14..2179177fc1e 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -22,27 +22,17 @@ var/nukes_left = 1 // Call 3714-PRAY right now and order more nukes! Limited offer! var/nuke_off_station = 0 //Used for tracking if the syndies actually haul the nuke to the station var/syndies_didnt_escape = 0 //Used for tracking if the syndies got the shuttle off of the z-level + var/list/pre_nukeops = list() /datum/game_mode/nuclear/pre_setup() - var/n_players = num_players() - var/n_agents = min(round(n_players / 10, 1), agents_possible) - - if(antag_candidates.len < n_agents) //In the case of having less candidates than the selected number of agents - n_agents = antag_candidates.len - - while(n_agents > 0) - var/datum/mind/new_syndicate = pick(antag_candidates) - syndicates += new_syndicate - antag_candidates -= new_syndicate //So it doesn't pick the same guy each time. - n_agents-- - - for(var/datum/mind/synd_mind in syndicates) - synd_mind.assigned_role = "Syndicate" - synd_mind.special_role = "Syndicate"//So they actually have a special role/N - log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative") - - return 1 - + var/n_agents = min(round(num_players() / 10), antag_candidates.len, agents_possible) + for(var/i = 0, i < n_agents, ++i) + var/datum/mind/new_op = pick_n_take(antag_candidates) + pre_nukeops += new_op + new_op.assigned_role = "Nuclear Operative" + new_op.special_role = "Nuclear Operative" + log_game("[new_op.key] (ckey) has been selected as a nuclear operative") + return TRUE //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -60,48 +50,36 @@ //////////////////////////////////////////////////////////////////////////////////////// /datum/game_mode/nuclear/post_setup() - - var/list/turf/synd_spawn = list() - - for(var/obj/effect/landmark/A in GLOB.landmarks_list) - if(A.name == "Syndicate-Spawn") - synd_spawn += get_turf(A) - continue - var/nuke_code = random_nukecode() - var/leader_selected = 0 var/agent_number = 1 - var/spawnpos = 1 + var/datum/mind/leader = pick(pre_nukeops) + syndicates += pre_nukeops + for(var/i = 1 to pre_nukeops.len) + var/datum/mind/op = pre_nukeops[i] - for(var/datum/mind/synd_mind in syndicates) - if(spawnpos > synd_spawn.len) - spawnpos = 2 - synd_mind.current.loc = synd_spawn[spawnpos] - - forge_syndicate_objectives(synd_mind) - greet_syndicate(synd_mind) - equip_syndicate(synd_mind.current) + forge_syndicate_objectives(op) + greet_syndicate(op) + equip_syndicate(op.current) if(nuke_code) - synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) - to_chat(synd_mind.current, "The nuclear authorization code is: [nuke_code]") + op.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) + to_chat(op.current, "The nuclear authorization code is: [nuke_code]") - if(!leader_selected) - prepare_syndicate_leader(synd_mind, nuke_code) - leader_selected = 1 + if(op == leader) + op.current.forceMove(pick(GLOB.nukeop_leader_start)) + prepare_syndicate_leader(op, nuke_code) else - synd_mind.current.real_name = "[syndicate_name()] Operative #[agent_number]" - agent_number++ - spawnpos++ - update_synd_icons_added(synd_mind) - synd_mind.current.playsound_local(get_turf(synd_mind.current), 'sound/ambience/antag/ops.ogg',100,0) - var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list + op.current.forceMove(GLOB.nukeop_start[((i - 1) % GLOB.nukeop_start.len) + 1]) + op.current.real_name = "[syndicate_name()] Operative #[agent_number++]" + update_synd_icons_added(op) + op.current.playsound_local(get_turf(op.current), 'sound/ambience/antag/ops.ogg',100,0) + + var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list if(nuke) nuke.r_code = nuke_code return ..() - /datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, nuke_code) var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord") spawn(1) @@ -132,7 +110,7 @@ P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" var/mob/living/carbon/human/H = synd_mind.current - P.loc = H.loc + P.forceMove(H.drop_location()) H.put_in_hands_or_del(P) H.update_icons() else @@ -161,6 +139,12 @@ synd_mob.equipOutfit(/datum/outfit/syndicate/no_crystals) return 1 +/datum/game_mode/nuclear/OnNukeExplosion(off_station) + ..() + nukes_left-- + var/obj/docking_port/mobile/Shuttle = SSshuttle.getShuttle("syndicate") + syndies_didnt_escape = (Shuttle && (Shuttle.z == ZLEVEL_CENTCOM || Shuttle.z == ZLEVEL_TRANSIT)) ? 0 : 1 + nuke_off_station = off_station /datum/game_mode/nuclear/check_win() if (nukes_left == 0) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 7b2a20a2976..6e7a5673248 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -19,7 +19,7 @@ return 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-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide", "Declare war?", "Yes", "No") + 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 [DisplayTimeText(world.time-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)] to decide", "Declare war?", "Yes", "No") declaring_war = FALSE if(!check_allowed(user)) @@ -58,7 +58,7 @@ U.hidden_uplink.owner = "[user.key]" U.hidden_uplink.telecrystals = CHALLENGE_TELECRYSTALS U.hidden_uplink.set_gamemode(/datum/game_mode/nuclear) - config.shuttle_refuel_delay = max(config.shuttle_refuel_delay, CHALLENGE_SHUTTLE_DELAY) + CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY)) SSblackbox.set_val("nuclear_challenge_mode",1) qdel(src) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 7642801a6a6..8870399f248 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -81,6 +81,20 @@ /obj/machinery/nuclearbomb/syndicate //ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb +/obj/machinery/nuclearbomb/syndicate/get_cinematic_type(off_station) + var/datum/game_mode/nuclear/NM = SSticker.mode + switch(off_station) + if(0) + if(istype(NM) && NM.syndies_didnt_escape) + return CINEMATIC_ANNIHILATION + else + return CINEMATIC_NUKE_WIN + if(1) + return CINEMATIC_NUKE_MISS + if(2) + return CINEMATIC_NUKE_FAR + return CINEMATIC_NUKE_FAR + /obj/machinery/nuclearbomb/syndicate/Initialize() . = ..() var/obj/machinery/nuclearbomb/existing = locate("syndienuke") in GLOB.nuke_list @@ -422,12 +436,12 @@ update_icon() sound_to_playing_players('sound/machines/alarm.ogg') if(SSticker && SSticker.mode) - SSticker.mode.explosion_in_progress = 1 + SSticker.roundend_check_paused = TRUE sleep(100) if(!core) - SSticker.station_explosion_cinematic(3,"no_core",src) - SSticker.mode.explosion_in_progress = 0 + Cinematic(CINEMATIC_NUKE_NO_CORE,world) + SSticker.roundend_check_paused = FALSE return GLOB.enter_allowed = 0 @@ -437,28 +451,37 @@ var/area/A = get_area(bomb_location) if(bomb_location && (bomb_location.z in GLOB.station_z_levels)) if(istype(A, /area/space)) - off_station = NUKE_MISS_STATION + off_station = NUKE_NEAR_MISS if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE))) - off_station = NUKE_MISS_STATION + off_station = NUKE_NEAR_MISS else if((istype(A, /area/syndicate_mothership) || (istype(A, /area/shuttle/syndicate)) && bomb_location.z == ZLEVEL_CENTCOM)) off_station = NUKE_SYNDICATE_BASE else - off_station = NUKE_NEAR_MISS + off_station = NUKE_MISS_STATION - if(istype(SSticker.mode, /datum/game_mode/nuclear)) - var/obj/docking_port/mobile/Shuttle = SSshuttle.getShuttle("syndicate") - var/datum/game_mode/nuclear/NM = SSticker.mode - NM.syndies_didnt_escape = (Shuttle && (Shuttle.z == ZLEVEL_CENTCOM || Shuttle.z == ZLEVEL_TRANSIT)) ? 0 : 1 - NM.nuke_off_station = off_station + if(off_station < 2) + SSshuttle.registerHostileEnvironment(src) + SSshuttle.lockdown = TRUE - SSticker.station_explosion_cinematic(off_station,null,src) - if(SSticker.mode) - if(istype(SSticker.mode, /datum/game_mode/nuclear)) - var/datum/game_mode/nuclear/NM = SSticker.mode - NM.nukes_left -- - if(!SSticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is - SSticker.Reboot("Station destroyed by Nuclear Device.", "nuke - unhandled ending") + //Cinematic + SSticker.mode.OnNukeExplosion(off_station) + var/bombz = z + Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,/datum/controller/subsystem/ticker/proc/station_explosion_detonation,src)) + INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel,bombz) + SSticker.roundend_check_paused = FALSE +/obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station) + if(off_station < 2) + return CINEMATIC_SELFDESTRUCT + else + return CINEMATIC_SELFDESTRUCT_MISS + +/proc/KillEveryoneOnZLevel(z) + if(!z) + return + for(var/mob/M in GLOB.mob_list) + if(M.stat != DEAD && M.z == z) + M.gib() /* This is here to make the tiles around the station mininuke change when it's armed. diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b65cea8bfc1..13161e9cc6c 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -17,14 +17,6 @@ if(owner) . += owner -/datum/objective/proc/considered_alive(var/datum/mind/M) - if(M && M.current) - var/mob/living/carbon/human/H - if(ishuman(M.current)) - H = M.current - return M.current.stat != DEAD && !issilicon(M.current) && !isbrain(M.current) && (!H || H.dna.species.id != "memezombies") - return FALSE - /datum/objective/proc/considered_escaped(datum/mind/M) if(!considered_alive(M)) return FALSE @@ -37,9 +29,6 @@ return FALSE return location.onCentCom() || location.onSyndieBase() -/datum/objective/proc/considered_afk(datum/mind/M) - return !M || !M.current || !M.current.client || M.current.client.is_afk() - /datum/objective/proc/check_completion() return completed @@ -121,7 +110,7 @@ return target /datum/objective/assassinate/check_completion() - return !target || !considered_alive(target) + return !considered_alive(target) || considered_afk(target) /datum/objective/assassinate/update_explanation_text() ..() @@ -348,6 +337,15 @@ return FALSE return TRUE +/datum/objective/survive/exist //Like survive, but works for silicons and zombies and such. + +/datum/objective/survive/exist/check_completion() + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!considered_alive(M, FALSE)) + return FALSE + return TRUE + /datum/objective/martyr explanation_text = "Die a glorious death." @@ -501,24 +499,31 @@ GLOBAL_LIST_EMPTY(possible_items_special) explanation_text = "Download [target_amount] research level\s." return target_amount -/datum/objective/download/check_completion()//NINJACODE. - var/current_amount = 0 +/datum/objective/download/check_completion() + var/list/current_tech = list() var/list/datum/mind/owners = get_owners() - for(var/datum/mind/M in owners) - if(!ishuman(owner.current)) - continue - var/mob/living/carbon/human/H = owner.current - if(!H || H.stat == DEAD || !istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja)) - continue - var/obj/item/clothing/suit/space/space_ninja/SN = H.wear_suit - if(!SN.s_initialized) - continue - for(var/datum/tech/current_data in SN.stored_research) - if(current_data.level) - current_amount += (current_data.level-1) - return current_amount >= target_amount - - + for(var/datum/mind/owner in owners) + if(ismob(owner.current)) + var/mob/M = owner.current //Yeah if you get morphed and you eat a quantum tech disk with the RD's latest backup good on you soldier. + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H && (H.stat != DEAD) && istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja)) + var/obj/item/clothing/suit/space/space_ninja/S = H.wear_suit + for(var/datum/tech/T in S.stored_research) + current_tech[T.id] = T.level? T.level : 0 + var/list/otherwise = M.GetAllContents() + for(var/obj/item/disk/tech_disk/TD in otherwise) + for(var/datum/tech/T in TD.tech_stored) + if(!T.id || !T.level) + continue + else if(!current_tech[T.id]) + current_tech[T.id] = T.level + else if(T.level > current_tech[T.id]) + current_tech[T.id] = T.level + var/total = 0 + for(var/i in current_tech) + total += current_tech[i] + return total >= target_amount /datum/objective/capture diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 43c1b335f4a..c1b6d13456c 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -44,10 +44,10 @@ /////////////////////////////////////////////////////////////////////////////// /datum/game_mode/revolution/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" for (var/i=1 to max_headrevs) @@ -154,8 +154,7 @@ var/obj/item/device/assembly/flash/T = new(mob) - var/obj/item/toy/crayon/spraycan/R = new(mob) - var/obj/item/clothing/glasses/hud/security/chameleon/C = new(mob) + var/obj/item/organ/cyberimp/eyes/hud/security/syndicate/S = new(mob) var/list/slots = list ( "backpack" = slot_in_backpack, @@ -163,13 +162,8 @@ "right pocket" = slot_r_store ) var/where = mob.equip_in_one_of_slots(T, slots) - var/where2 = mob.equip_in_one_of_slots(C, slots) - mob.equip_in_one_of_slots(R,slots) - - if (!where2) - to_chat(mob, "The Syndicate were unfortunately unable to get you a chameleon security HUD.") - else - to_chat(mob, "The chameleon security HUD in your [where2] will help you keep track of who is mindshield-implanted, and unable to be recruited.") + S.Insert(mob, special = FALSE, drop_if_replaced = FALSE) + to_chat(mob, "Your eyes have been implanted with a cybernetic security HUD which will help you keep track of who is mindshield-implanted, and therefore unable to be recruited.") if (!where) to_chat(mob, "The Syndicate were unfortunately unable to get you a flash.") @@ -236,7 +230,7 @@ //Checks if the round is over// /////////////////////////////// /datum/game_mode/revolution/check_finished() - if(config.continuous["revolution"]) + if(CONFIG_GET(keyed_flag_list/continuous)["revolution"]) if(finished) SSshuttle.clearHostileEnvironment(src) return ..() @@ -259,12 +253,14 @@ /datum/game_mode/proc/add_revolutionary(datum/mind/rev_mind) if(rev_mind.assigned_role in GLOB.command_positions) - return 0 + return FALSE var/mob/living/carbon/human/H = rev_mind.current//Check to see if the potential rev is implanted if(H.isloyal()) - return 0 + return FALSE if((rev_mind in revolutionaries) || (rev_mind in head_revolutionaries)) - return 0 + return FALSE + if(rev_mind.unconvertable) + return FALSE revolutionaries += rev_mind if(iscarbon(rev_mind.current)) var/mob/living/carbon/carbon_mob = rev_mind.current @@ -277,11 +273,11 @@ update_rev_icons_added(rev_mind) if(jobban_isbanned(rev_mind.current, ROLE_REV)) INVOKE_ASYNC(src, .proc/replace_jobbaned_player, rev_mind.current, ROLE_REV, ROLE_REV) - return 1 + return TRUE ////////////////////////////////////////////////////////////////////////////// //Deals with players being converted from the revolution (Not a rev anymore)// // Modified to handle borged MMIs. Accepts another var if the target is being borged at the time -- Polymorph. ////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/remove_revolutionary(datum/mind/rev_mind , beingborged) +/datum/game_mode/proc/remove_revolutionary(datum/mind/rev_mind , beingborged, deconverter) var/remove_head = 0 if(beingborged && (rev_mind in head_revolutionaries)) head_revolutionaries -= rev_mind @@ -290,17 +286,16 @@ if((rev_mind in revolutionaries) || remove_head) revolutionaries -= rev_mind rev_mind.special_role = null - rev_mind.current.log_message("Has renounced the revolution!", INDIVIDUAL_ATTACK_LOG) + log_attack("[rev_mind.current] (Key: [key_name(rev_mind.current)]) has been deconverted from the revolution by [deconverter] (Key: [key_name(deconverter)])!") if(beingborged) - rev_mind.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.",\ - "The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]") + rev_mind.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", \ + "The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]") message_admins("[ADMIN_LOOKUPFLW(rev_mind.current)] has been borged while being a [remove_head ? "leader" : " member"] of the revolution.") - else + rev_mind.current.visible_message("[rev_mind.current] looks like they just remembered their real allegiance!", \ + "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") rev_mind.current.Unconscious(100) - rev_mind.current.visible_message("[rev_mind.current] looks like they just remembered their real allegiance!",\ - "You have been brainwashed! You are no longer a revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") update_rev_icons_removed(rev_mind) ///////////////////////////////////// @@ -336,7 +331,7 @@ /datum/game_mode/revolution/proc/check_heads_victory() for(var/datum/mind/rev_mind in head_revolutionaries) var/turf/T = get_turf(rev_mind.current) - if((rev_mind) && (rev_mind.current) && (rev_mind.current.stat != DEAD) && T && (T.z in GLOB.station_z_levels)) + if(!considered_afk(rev_mind) && considered_alive(rev_mind) && (T.z in GLOB.station_z_levels)) if(ishuman(rev_mind.current)) return 0 return 1 diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 177e051ff99..15cd346b2de 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -112,8 +112,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Admin: toggle spawning // if("hsbtobj") - if(!admin) - return + if(!admin) return if(GLOB.hsboxspawn) to_chat(world, "Sandbox: \black[usr.key] has disabled object spawning!") GLOB.hsboxspawn = FALSE @@ -126,24 +125,22 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Admin: Toggle auto-close // if("hsbtac") - if(!admin) - return - if(config.sandbox_autoclose) + if(!admin) return + var/sbac = CONFIG_GET(flag/sandbox_autoclose) + if(sbac) to_chat(world, "Sandbox: \black [usr.key] has removed the object spawn limiter.") - config.sandbox_autoclose = FALSE else to_chat(world, "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use.") - config.sandbox_autoclose = TRUE + CONFIG_SET(flag/sandbox_autoclose, !sbac) return // // Spacesuit with full air jetpack set as internals // if("hsbsuit") var/mob/living/carbon/human/P = usr - if(!istype(P)) - return + if(!istype(P)) return if(P.wear_suit) - P.wear_suit.loc = P.loc + P.wear_suit.forceMove(P.drop_location()) P.wear_suit.layer = initial(P.wear_suit.layer) P.wear_suit.plane = initial(P.wear_suit.plane) P.wear_suit = null @@ -152,7 +149,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.wear_suit.plane = ABOVE_HUD_PLANE P.update_inv_wear_suit() if(P.head) - P.head.loc = P.loc + P.head.forceMove(P.drop_location()) P.head.layer = initial(P.head.layer) P.head.plane = initial(P.head.plane) P.head = null @@ -161,7 +158,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.head.plane = ABOVE_HUD_PLANE P.update_inv_head() if(P.wear_mask) - P.wear_mask.loc = P.loc + P.wear_mask.forceMove(P.drop_location()) P.wear_mask.layer = initial(P.wear_mask.layer) P.wear_mask.plane = initial(P.wear_mask.plane) P.wear_mask = null @@ -170,7 +167,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.wear_mask.plane = ABOVE_HUD_PLANE P.update_inv_wear_mask() if(P.back) - P.back.loc = P.loc + P.back.forceMove(P.drop_location()) P.back.layer = initial(P.back.layer) P.back.plane = initial(P.back.plane) P.back = null @@ -219,8 +216,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Spawn check due to grief potential (destroying floors, walls, etc) // if("hsbrcd") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return new/obj/item/construction/rcd/combat(usr.loc) @@ -236,8 +232,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Clothing if("hsbcloth") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return if(!clothinfo) clothinfo = "Clothing (Reagent Containers) (Other Items)
" @@ -251,8 +246,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Reagent containers if("hsbreag") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return if(!reaginfo) reaginfo = "Reagent Containers (Clothing) (Other Items)
" @@ -266,8 +260,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Other items if("hsbobj") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return if(!objinfo) objinfo = "Other Items (Clothing) (Reagent Containers)
" @@ -294,7 +287,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) return new typepath(usr.loc) - if(config.sandbox_autoclose) + if(CONFIG_GET(flag/sandbox_autoclose)) usr << browse(null,"window=sandbox") // // For everything else in the href list @@ -306,5 +299,5 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) return new typepath(usr.loc) - if(config.sandbox_autoclose) + if(CONFIG_GET(flag/sandbox_autoclose)) usr << browse(null,"window=sandbox") diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 77b91a85717..64d4f84eec1 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -31,16 +31,17 @@ /datum/game_mode/traitor/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" var/num_traitors = 1 - if(config.traitor_scaling_coeff) - num_traitors = max(1, min( round(num_players()/(config.traitor_scaling_coeff*2))+ 2 + num_modifier, round(num_players()/(config.traitor_scaling_coeff)) + num_modifier )) + var/tsc = CONFIG_GET(number/traitor_scaling_coeff) + if(tsc) + num_traitors = max(1, min(round(num_players() / (tsc * 2)) + 2 + num_modifier, round(num_players() / tsc) + num_modifier)) else num_traitors = max(1, min(num_players(), traitors_possible)) @@ -68,10 +69,11 @@ return 1 /datum/game_mode/traitor/make_antag_chance(mob/living/carbon/human/character) //Assigns traitor to latejoiners - var/traitorcap = min(round(GLOB.joined_player_list.len / (config.traitor_scaling_coeff * 2)) + 2 + num_modifier, round(GLOB.joined_player_list.len/config.traitor_scaling_coeff) + num_modifier ) + var/tsc = CONFIG_GET(number/traitor_scaling_coeff) + var/traitorcap = min(round(GLOB.joined_player_list.len / (tsc * 2)) + 2 + num_modifier, round(GLOB.joined_player_list.len / tsc) + num_modifier) if((SSticker.mode.traitors.len + pre_traitors.len) >= traitorcap) //Upper cap for number of latejoin antagonists return - if((SSticker.mode.traitors.len + pre_traitors.len) <= (traitorcap - 2) || prob(100 / (config.traitor_scaling_coeff * 2))) + if((SSticker.mode.traitors.len + pre_traitors.len) <= (traitorcap - 2) || prob(100 / (tsc * 2))) if(ROLE_TRAITOR in character.client.prefs.be_special) if(!jobban_isbanned(character, ROLE_TRAITOR) && !jobban_isbanned(character, "Syndicate")) if(age_check(character.client)) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index f4847e30a7e..42d676c29b2 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -234,11 +234,10 @@ if(!link) if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL) - user.drop_item() - I.loc = src - link = I - to_chat(user, "You attach [I] to the doll.") - update_targets() + if (user.transferItemToLoc(I,src)) + link = I + to_chat(user, "You attach [I] to the doll.") + update_targets() /obj/item/voodoo/check_eye(mob/user) if(loc != user) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 130839a3737..aa630548b0a 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -60,7 +60,6 @@ to_chat(user, "\"Come now, do not capture your bretheren's soul.\"") return add_logs(user, M, "captured [M.name]'s soul", src) - transfer_soul("VICTIM", M, user) ///////////////////Options for using captured souls/////////////////////////////////////// @@ -119,7 +118,7 @@ ////////////////////////////Proc for moving soul in and out off stone////////////////////////////////////// -/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user). +/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user) switch(choice) if("FORCE") if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul @@ -164,7 +163,7 @@ if(contents.len) to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") else - T.loc = src //put shade in stone + T.forceMove(src) //put shade in stone T.status_flags |= GODMODE T.canmove = 0 T.health = T.maxHealth @@ -199,7 +198,6 @@ SSticker.mode.cult -= A.mind SSticker.mode.update_cult_icons_removed(A.mind) qdel(T) - user.drop_item() qdel(src) else to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!") @@ -237,6 +235,7 @@ S.name = "Shade of [T.real_name]" S.real_name = "Shade of [T.real_name]" S.key = T.key + S.language_holder = U.language_holder.copy(S) if(U) S.faction |= "\ref[U]" //Add the master as a faction, allowing inter-mob cooperation if(U && iscultist(U)) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 31060fffc35..5e22aaac421 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -478,7 +478,7 @@ /datum/spellbook_entry/summon/guns/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (!config.no_summon_guns) + return !CONFIG_GET(flag/no_summon_guns) /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) @@ -495,7 +495,7 @@ /datum/spellbook_entry/summon/magic/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (!config.no_summon_magic) + return !CONFIG_GET(flag/no_summon_magic) /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) @@ -513,7 +513,7 @@ /datum/spellbook_entry/summon/events/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (!config.no_summon_events) + return !CONFIG_GET(flag/no_summon_events) /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index eea7afcb4b6..d25c7613bca 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -30,7 +30,7 @@ to_chat(wizard.current, "A starting location for you could not be found, please report this bug!") return 0 for(var/datum/mind/wiz in wizards) - wiz.current.loc = pick(GLOB.wizardstart) + wiz.current.forceMove(pick(GLOB.wizardstart)) return 1 @@ -111,10 +111,7 @@ if (!newname) newname = randomname - wizard_mob.real_name = newname - wizard_mob.name = newname - if(wizard_mob.mind) - wizard_mob.mind.name = newname + wizard_mob.fully_replace_character_name(wizard_mob.real_name, newname) /* Wizards by nature cannot be too young. */ if(wizard_mob.age < WIZARD_AGE_MIN) @@ -245,15 +242,6 @@ //OTHER PROCS -//To batch-remove wizard spells. Linked to mind.dm. -/mob/proc/spellremove(mob/M) - if(!mind) - return - for(var/X in src.mind.spell_list) - var/obj/effect/proc_holder/spell/spell_to_remove = X - qdel(spell_to_remove) - mind.spell_list -= spell_to_remove - //returns whether the mob is a wizard (or apprentice) /proc/iswizard(mob/living/M) return istype(M) && M.mind && SSticker && SSticker.mode && ((M.mind in SSticker.mode.wizards) || (M.mind in SSticker.mode.apprentices)) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 80400fee053..48eafce3c58 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -44,10 +44,10 @@ var/turf/T = loc Beacon = new /obj/item/device/radio/beacon Beacon.invisibility = INVISIBILITY_MAXIMUM - Beacon.loc = T + Beacon.forceMove(T) if(Beacon) if(Beacon.loc != loc) - Beacon.loc = loc + Beacon.forceMove(loc) updateicon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 65a0e1e5239..94025dae31c 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -26,6 +26,7 @@ ) var/list/chem_buttons //Used when emagged to scramble which chem is used, eg: antitoxin -> morphine var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning + var/enter_message = "You feel cool air surround you. You go numb as your senses turn inward." /obj/machinery/sleeper/Initialize() . = ..() @@ -69,7 +70,7 @@ ..(user) var/mob/living/mob_occupant = occupant if(mob_occupant && mob_occupant.stat != DEAD) - to_chat(occupant, "You feel cool air surround you. You go numb as your senses turn inward.") + to_chat(occupant, "[enter_message]") /obj/machinery/sleeper/emp_act(severity) if(is_operational() && occupant) @@ -205,6 +206,21 @@ icon_state = "sleeper_s" controls_inside = TRUE +/obj/machinery/sleeper/clockwork + name = "soothing sleeper" + desc = "A large cryogenics unit built from brass. Its surface is pleasantly cool the touch." + icon_state = "sleeper_clockwork" + enter_message = "You hear the gentle hum and click of machinery, and are lulled into a sense of peace." + possible_chems = list(list("epinephrine", "salbutamol", "bicaridine", "kelotane", "oculine", "inacusiate", "mannitol")) + +/obj/machinery/sleeper/clockwork/process() + if(occupant && isliving(occupant)) + var/mob/living/L = occupant + if(GLOB.clockwork_vitality) //If there's Vitality, the sleeper has passive healing + GLOB.clockwork_vitality = max(0, GLOB.clockwork_vitality - 1) + L.adjustBruteLoss(-1) + L.adjustFireLoss(-1) + L.adjustOxyLoss(-5) /obj/machinery/sleeper/old icon_state = "oldpod" diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 5bca39780b2..ef50e61e58f 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -95,6 +95,7 @@ Class Procs: /obj/machinery name = "machinery" icon = 'icons/obj/stationobjs.dmi' + desc = "Some kind of machine." verb_say = "beeps" verb_yell = "blares" pressure_resistance = 15 @@ -429,7 +430,7 @@ Class Procs: W.handle_item_insertion(A, 1) component_parts -= A component_parts += B - B.loc = null + B.moveToNullspace() to_chat(user, "[A.name] replaced with [B.name].") shouldplaysound = 1 //Only play the sound when parts are actually replaced! break diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 4f691e053f1..8a4c854d764 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -43,7 +43,7 @@ to_chat(user, "[src] is out of foam and cannot be activated.") return if(cooldown_time > world.time) - to_chat(user, "[src] cannot be activated for another [round((world.time - cooldown_time) * 0.1)] second\s.") + to_chat(user, "[src] cannot be activated for [DisplayTimeText(world.time - cooldown_time)].") return new /obj/effect/particle_effect/foam(loc) uses-- diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 3717501db16..2f89993fdbf 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -147,7 +147,7 @@ radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_AIRLOCK) /obj/machinery/airlock_sensor/Initialize() - ..() + . = ..() set_frequency(frequency) /obj/machinery/airlock_sensor/Destroy() diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index ff072fd0109..299b0500cef 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -11,6 +11,9 @@ var/initial_icon_state var/static/list/style_list_icons = list("standard" = 'icons/mob/augmentation/augments.dmi', "engineer" = 'icons/mob/augmentation/augments_engineer.dmi', "security" = 'icons/mob/augmentation/augments_security.dmi', "mining" = 'icons/mob/augmentation/augments_mining.dmi') +/obj/machinery/aug_manipulator/examine(mob/user) + ..() + to_chat(user, "Alt-click to eject the limb.") /obj/machinery/aug_manipulator/Initialize() initial_icon_state = initial(icon_state) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 9fa53765ed5..4894952a694 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -134,12 +134,11 @@ if(ispath(lit, /obj/item/ore/bluespace_crystal)) use_power(max(500,M.last_amount_inserted/10)) else - var/obj/item/stack/S = lit - var/list/initmats = initial(S.materials) - if (initmats[MAT_METAL]) - flick("autolathe_o",src)//plays metal insertion animation - if (initmats[MAT_GLASS]) - flick("autolathe_r",src)//plays glass insertion animation + switch(M.last_inserted_id) + if (MAT_METAL) + flick("autolathe_o",src)//plays metal insertion animation + if (MAT_GLASS) + flick("autolathe_r",src)//plays glass insertion animation use_power(M.last_amount_inserted*100) updateUsrDialog() diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index de07fc9c2dc..9d446aa77cf 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -43,7 +43,7 @@ say("Station funds depleted. Halting siphon.") siphoning = FALSE else - new /obj/item/stack/spacecash/c200(get_turf(src)) // will autostack + new /obj/item/stack/spacecash/c200(drop_location()) // will autostack playsound(src.loc, 'sound/items/poster_being_created.ogg', 100, 1) SSshuttle.points -= 200 if(next_warning < world.time && prob(15)) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 7c1904d2fe7..8a118b8d08c 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -127,10 +127,10 @@ if(panel_open) if(device || board) if(device) - device.loc = get_turf(src) + device.forceMove(drop_location()) device = null if(board) - board.loc = get_turf(src) + board.forceMove(drop_location()) req_access = list() req_one_access = list() board = null diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index bc6833f84a1..7d3c40a0d93 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -39,6 +39,8 @@ // Upgrades bitflag var/upgrades = 0 + var/internal_light = TRUE //Whether it can light up when an AI views it + /obj/machinery/camera/Initialize(mapload) . = ..() assembly = new(src) @@ -244,7 +246,7 @@ if(disassembled) if(!assembly) assembly = new() - assembly.loc = src.loc + assembly.forceMove(drop_location()) assembly.state = 1 assembly.setDir(dir) assembly = null diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 93e64683060..1e6fe4c5321 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -91,7 +91,7 @@ state = 4 var/obj/machinery/camera/C = new(src.loc) - src.loc = C + forceMove(C) C.assembly = src C.setDir(src.dir) @@ -122,7 +122,7 @@ if(U) to_chat(user, "You unattach an upgrade from the assembly.") playsound(src.loc, W.usesound, 50, 1) - U.loc = get_turf(src) + U.forceMove(drop_location()) upgrades -= U return diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 3f95d2a7804..63c63ce1204 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -45,14 +45,13 @@ if(!isarea(a)) return if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power! - to_chat(user, "The [name] blinks red as you try to insert the cell!") + to_chat(user, "The [src] blinks red as you try to insert the cell!") return - if(!user.drop_item()) + if(!user.transferItemToLoc(W,src)) return - W.loc = src charging = W - user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.") + user.visible_message("[user] inserts a cell into [src].", "You insert a cell into [src].") chargelevel = -1 updateicon() else if(istype(W, /obj/item/wrench)) @@ -61,7 +60,7 @@ return anchored = !anchored - to_chat(user, "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground") + to_chat(user, "You [anchored ? "attach" : "detach"] [src] [anchored ? "to" : "from"] the ground") playsound(src.loc, W.usesound, 75, 1) else return ..() @@ -80,7 +79,7 @@ user.put_in_hands(charging) charging.add_fingerprint(user) - user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.") + user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].") removecell() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 2276b5154b5..bc0bdf8524b 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -229,9 +229,9 @@ else if(mob_occupant.cloneloss > (100 - heal_level)) mob_occupant.Unconscious(80) - + var/dmg_mult = CONFIG_GET(number/damage_multiplier) //Slowly get that clone healed and finished. - mob_occupant.adjustCloneLoss(-((speed_coeff/2) * config.damage_multiplier)) + mob_occupant.adjustCloneLoss(-((speed_coeff / 2) * dmg_mult)) var/progress = CLONE_INITIAL_DAMAGE - mob_occupant.getCloneLoss() // To avoid the default cloner making incomplete clones progress += (100 - MINIMUM_HEAL_LEVEL) @@ -249,7 +249,7 @@ BP.attach_limb(mob_occupant) //Premature clones may have brain damage. - mob_occupant.adjustBrainLoss(-((speed_coeff/2) * config.damage_multiplier)) + mob_occupant.adjustBrainLoss(-((speed_coeff / 2) * dmg_mult)) check_brine() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index ec679567963..24c897ff5ce 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -10,7 +10,7 @@ light_color = LIGHT_COLOR_BLUE /obj/machinery/computer/operating/Initialize() - ..() + . = ..() find_table() /obj/machinery/computer/operating/proc/find_table() diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 3d13e8a748b..b590763ffe6 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -136,7 +136,7 @@ if(occupier && !active) to_chat(occupier, "You have been downloaded to a mobile storage device. Still no remote access.") to_chat(user, "Transfer successful: [occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") - occupier.loc = card + occupier.forceMove(card) card.AI = occupier occupier = null update_icon() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 8131dbd4a69..5c993f0bdea 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -84,7 +84,7 @@ light_color = LIGHT_COLOR_CYAN /obj/machinery/computer/atmos_control/Initialize() - ..() + . = ..() set_frequency(frequency) /obj/machinery/computer/atmos_control/Destroy() diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 2d6c03eebb5..58d29d0698f 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -19,7 +19,7 @@ var/obj/item/weldingtool/WT = P if(!WT.remove_fuel(0, user)) if(!WT.isOn()) - to_chat(user, "The welding tool must be on to complete this task!") + to_chat(user, "[WT] must be on to complete this task!") return playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You start deconstructing the frame...") @@ -41,14 +41,13 @@ state = 0 return if(istype(P, /obj/item/circuitboard/computer) && !circuit) - if(!user.drop_item()) + if(!user.transferItemToLoc(P, null)) return playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) - to_chat(user, "You place the circuit board inside the frame.") + to_chat(user, "You place [P] inside the frame.") icon_state = "1" circuit = P circuit.add_fingerprint(user) - P.loc = null return else if(istype(P, /obj/item/circuitboard) && !circuit) @@ -56,16 +55,16 @@ return if(istype(P, /obj/item/screwdriver) && circuit) playsound(src.loc, P.usesound, 50, 1) - to_chat(user, "You screw the circuit board into place.") + to_chat(user, "You screw [circuit] into place.") state = 2 icon_state = "2" return if(istype(P, /obj/item/crowbar) && circuit) playsound(src.loc, P.usesound, 50, 1) - to_chat(user, "You remove the circuit board.") + to_chat(user, "You remove [circuit].") state = 1 icon_state = "0" - circuit.loc = src.loc + circuit.forceMove(drop_location()) circuit.add_fingerprint(user) circuit = null return diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 3d5b8f026b1..9f252effa69 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -3,7 +3,8 @@ desc = "Used to access the various cameras on the station." icon_screen = "cameras" icon_keyboard = "security_key" - var/z_lock = null // Lock use to this zlevel + var/list/z_lock = list() // Lock use to these z levels + var/station_lock_override = FALSE var/mob/camera/aiEye/remote/eyeobj var/mob/living/current_user = null var/list/networks = list("SS13") @@ -13,6 +14,11 @@ light_color = LIGHT_COLOR_RED +/obj/machinery/computer/camera_advanced/Initialize() + . = ..() + if(station_lock_override) + z_lock = GLOB.station_z_levels.Copy() + /obj/machinery/computer/camera_advanced/syndie icon_keyboard = "syndie_key" @@ -76,7 +82,7 @@ if(!eyeobj.eye_initialized) var/camera_location for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) - if(!C.can_use() || z_lock && C.z != z_lock) + if(!C.can_use() || z_lock.len && !(C.z in z_lock)) continue if(C.network & networks) camera_location = get_turf(C) @@ -201,7 +207,7 @@ var/list/L = list() for (var/obj/machinery/camera/cam in GLOB.cameranet.cameras) - if(origin.z_lock && cam.z != origin.z_lock) + if(origin.z_lock.len && !(cam.z in origin.z_lock)) continue L.Add(cam) @@ -225,3 +231,89 @@ 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) + + +//Used by servants of Ratvar! They let you beam to the station. +/obj/machinery/computer/camera_advanced/ratvar + name = "ratvarian camera observer" + desc = "A console used to snoop on the station's goings-on. A jet of steam occasionally whooshes out from slats on its sides." + use_power = FALSE + networks = list("SS13", "MiniSat") //:eye: + var/datum/action/innate/servant_warp/warp_action = new + +/obj/machinery/computer/camera_advanced/ratvar/Initialize() + . = ..() + ratvar_act() + +/obj/machinery/computer/camera_advanced/ratvar/process() + if(prob(1)) + playsound(src, 'sound/machines/clockcult/steam_whoosh.ogg', 25, TRUE) + new/obj/effect/temp_visual/steam_release(get_turf(src)) + +/obj/machinery/computer/camera_advanced/ratvar/CreateEye() + ..() + eyeobj.visible_icon = 1 + eyeobj.icon = 'icons/obj/abductor.dmi' //in case you still had any doubts + eyeobj.icon_state = "camera_target" + +/obj/machinery/computer/camera_advanced/ratvar/GrantActions(mob/living/carbon/user) + ..() + if(warp_action) + warp_action.Grant(user) + warp_action.target = src + actions += warp_action + +/obj/machinery/computer/camera_advanced/ratvar/attack_hand(mob/living/user) + if(!is_servant_of_ratvar(user)) + to_chat(user, "[src]'s keys are in a language foreign to you, and you don't understand anything on its screen.") + return + . = ..() + +/datum/action/innate/servant_warp + name = "Warp" + desc = "Warps to the tile you're viewing. You can use the Abscond scripture to return." + icon_icon = 'icons/mob/actions/actions_clockcult.dmi' + button_icon_state = "warp_down" + background_icon_state = "bg_clock" + buttontooltipstyle = "clockcult" + var/obj/effect/temp_visual/ratvar/warp_marker/warping + +/datum/action/innate/servant_warp/Activate() + if(QDELETED(target) || !(ishuman(owner) || iscyborg(owner)) || !owner.canUseTopic(target) || warping) + return + if(!istype(SSticker.mode, /datum/game_mode/clockwork_cult)) //No leaving unless there's servants from the get-go + return + var/mob/living/carbon/human/user = owner + var/mob/camera/aiEye/remote/remote_eye = user.remote_control + var/obj/machinery/computer/camera_advanced/ratvar/R = target + var/turf/T = get_turf(remote_eye) + if(user.z != ZLEVEL_CITYOFCOGS || !(T.z in GLOB.station_z_levels)) + return + if(isclosedturf(T)) + to_chat(user, "You can't teleport into a wall.") + return + else if(isspaceturf(T)) + to_chat(user, "[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]") + return + var/area/AR = get_area(T) + if(istype(AR, /area/ai_monitored)) + to_chat(user, "The structure there is too dense for [src] to pierce. (This is normal in high-security areas.)") + return + if(alert(user, "Are you sure you want to warp to [AR]?", target.name, "Warp", "Cancel") == "Cancel" || QDELETED(R) || !user.canUseTopic(R)) + return + do_sparks(5, TRUE, user) + do_sparks(5, TRUE, T) + warping = new(T) + user.visible_message("[user]'s [target.name] flares!", "You begin warping to [AR]...") + if(!do_after(user, 50, target = warping)) + to_chat(user, "Warp interrupted.") + QDEL_NULL(warping) + return + T.visible_message("[user] warps in!") + playsound(user, 'sound/magic/magic_missile.ogg', 50, TRUE) + playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE) + user.forceMove(get_turf(T)) + user.setDir(SOUTH) + flash_color(user, flash_color = "#AF0AAF", flash_time = 5) + R.remove_eye_control(user) + QDEL_NULL(warping) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 0548d94f3d1..e5869310ade 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -47,29 +47,26 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/Initialize() . = ..() - change_position_cooldown = config.id_console_jobslot_delay + change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay) /obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY if(istype(O, /obj/item/card/id)) var/obj/item/card/id/idcard = O if(check_access(idcard)) if(!scan) - if(!usr.drop_item()) + if (!user.transferItemToLoc(idcard,src)) return - idcard.loc = src scan = idcard playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(!modify) - if(!usr.drop_item()) + if (!user.transferItemToLoc(idcard,src)) return - idcard.loc = src modify = idcard playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(!modify) - if(!usr.drop_item()) + if (!user.transferItemToLoc(idcard,src)) return - idcard.loc = src modify = idcard playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else @@ -95,10 +92,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/on_deconstruction() if(scan) - scan.forceMove(loc) + scan.forceMove(drop_location()) scan = null if(modify) - modify.forceMove(loc) + modify.forceMove(drop_location()) modify = null //Check if you can't open a new position for a certain job @@ -355,7 +352,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if (modify) GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment) modify.update_label() - modify.loc = loc + modify.forceMove(drop_location()) modify.verb_pickup() playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) modify = null @@ -364,26 +361,24 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) else var/obj/item/I = usr.get_active_held_item() if (istype(I, /obj/item/card/id)) - if(!usr.drop_item()) + if (!usr.transferItemToLoc(I,src)) return playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) - I.loc = src modify = I authenticated = 0 if ("scan") if (scan) - scan.loc = src.loc + scan.forceMove(drop_location()) scan.verb_pickup() playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) scan = null else var/obj/item/I = usr.get_active_held_item() if (istype(I, /obj/item/card/id)) - if(!usr.drop_item()) + if (!usr.transferItemToLoc(I,src)) return playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) - I.loc = src scan = I authenticated = 0 if ("auth") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index b035ef154f2..31126a6c08c 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -117,9 +117,8 @@ /obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) - if(!user.drop_item()) + if (!user.transferItemToLoc(W,src)) return - W.loc = src src.diskette = W to_chat(user, "You insert [W].") playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) @@ -373,7 +372,7 @@ if("eject") if(src.diskette) - src.diskette.loc = src.loc + src.diskette.forceMove(drop_location()) src.diskette = null playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) if("save") @@ -404,7 +403,7 @@ else if(!pod) temp = "No Clonepods available." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else if(!config.revival_cloning) + else if(!CONFIG_GET(flag/revival_cloning)) temp = "Unable to initiate cloning cycle." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) else if(pod.occupant) @@ -471,7 +470,7 @@ // species datums R.fields["mrace"] = dna.species else - var/datum/species/rando_race = pick(config.roundstart_races) + var/datum/species/rando_race = pick(CONFIG_GET(keyed_flag_list/roundstart_races)) R.fields["mrace"] = rando_race.type R.fields["ckey"] = mob_occupant.ckey diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 7de64f8aa79..77f6e08c7db 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -462,7 +462,7 @@ if (src.authenticated==2) dat += "
Captain Functions" dat += "
\[ Make a Captain's Announcement \]" - if(config.cross_allowed) + if(CONFIG_GET(string/cross_server_address)) dat += "
\[ Send a message to an allied station \]" if(SSmapping.config.allow_custom_shuttles == "yes") dat += "
\[ Purchase Shuttle \]" diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 913d6f63261..27ac682b865 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -43,9 +43,8 @@ /obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) - if(!user.drop_item()) + if (!user.transferItemToLoc(I,src)) return - I.loc = src src.diskette = I to_chat(user, "You insert [I].") src.updateUsrDialog() @@ -170,7 +169,7 @@ if("working") temp_html += status temp_html += "ID: [active1.fields["id"]] Sex: [active1.fields["sex"]] Age: [active1.fields["age"]] Species: [active1.fields["species"]] Fingerprint: [active1.fields["fingerprint"]] Physical Status: [active1.fields["p_stat"]] Medical Record - (MR-[GLOB.data_core.medicalPrintCount])
" if(active1 in GLOB.data_core.general) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"]) - if(config.mutant_races) + if(CONFIG_GET(flag/join_with_mutant_race)) P.info += "\nSpecies: [active1.fields["species"]]
" P.info += text("\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", src.active1.fields["fingerprint"], src.active1.fields["p_stat"], src.active1.fields["m_stat"]) else diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 5470380ca5a..260fbaf4de4 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -58,7 +58,7 @@ to_chat(user, "A no server error appears on the screen.") /obj/machinery/computer/message_monitor/Initialize() - ..() + . = ..() //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. if(!linkedServer) if(GLOB.message_servers && GLOB.message_servers.len > 0) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 2023de1cd90..7cb13043261 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -10,7 +10,7 @@ /obj/machinery/computer/pod/Initialize() - ..() + . = ..() for(var/obj/machinery/mass_driver/M in range(range, src)) if(M.id == id) connected = M @@ -51,9 +51,7 @@ d2 = "Stop Time Launch" else d2 = "Initiate Time Launch" - var/second = time % 60 - var/minute = (time - second) / 60 - dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] - - + +" + dat += "
\nTimer System: [d2]\nTime Left: [DisplayTimeText(time)] - - + +" var/temp = "" var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) for(var/t in L) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 00787f10e29..1a74c44c30e 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -186,7 +186,7 @@ID: [active1.fields["id"]] Sex: [active1.fields["sex"]] Age: [active1.fields["age"]] Species: [active1.fields["species"]] Rank: [active1.fields["rank"]] Fingerprint: [active1.fields["fingerprint"]] Security Record - (SR-[GLOB.data_core.securityPrintCount])
" if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1))) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
", active1.fields["name"], active1.fields["id"], active1.fields["sex"], active1.fields["age"]) - if(config.mutant_races) + if(CONFIG_GET(flag/join_with_mutant_race)) P.info += "\nSpecies: [active1.fields["species"]]
" P.info += text("\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", active1.fields["fingerprint"], active1.fields["p_stat"], active1.fields["m_stat"]) else @@ -519,7 +519,7 @@ What a mess.*/ G.fields["rank"] = "Unassigned" G.fields["sex"] = "Male" G.fields["age"] = "Unknown" - if(config.mutant_races) + if(CONFIG_GET(flag/join_with_mutant_race)) G.fields["species"] = "Human" G.fields["photo_front"] = new /icon() G.fields["photo_side"] = new /icon() @@ -604,7 +604,7 @@ What a mess.*/ active1.fields["age"] = t1 if("species") if(istype(active1, /datum/data/record)) - var/t1 = input("Select a species", "Species Selection") as null|anything in GLOB.roundstart_species + var/t1 = input("Select a species", "Species Selection") as null|anything in CONFIG_GET(keyed_flag_list/roundstart_races) if(!canUseSecurityRecordsConsole(usr, t1, a1)) return active1.fields["species"] = t1 @@ -772,7 +772,7 @@ What a mess.*/ if(6) R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") if(7) - R.fields["species"] = pick(GLOB.roundstart_species) + R.fields["species"] = pick(CONFIG_GET(keyed_flag_list/roundstart_races)) if(8) var/datum/data/record/G = pick(GLOB.data_core.general) R.fields["photo_front"] = G.fields["photo_front"] diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 678d856dcea..3c183456bed 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E var/obj/machinery/computer/telecrystals/boss/linkedboss = null /obj/machinery/computer/telecrystals/uplinker/Initialize() - ..() + . = ..() var/ID = pick_n_take(GLOB.possible_uplinker_IDs) if(!ID) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 9ba8e1d34d9..f919bdbab89 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -96,7 +96,7 @@ dat += "
\ - If it remains close to you, you will gradually regain health up to a low amount, but it will die if it goes too far from you." - invocations = list("Fright's will...", "...call forth...") - channel_time = 100 - consumed_components = list(BELLIGERENT_EYE = 2, VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 4) - usage_tip = "Marauders are useful as personal bodyguards and frontline warriors." - tier = SCRIPTURE_APPLICATION - primary_component = GEIS_CAPACITOR - sort_priority = 3 - -/datum/clockwork_scripture/memory_allocation/check_special_requirements() - for(var/mob/living/simple_animal/hostile/clockwork/marauder/M in GLOB.all_clockwork_mobs) - if(M.host == invoker) - to_chat(invoker, "You can only house one marauder at a time!") - return FALSE - return TRUE - -/datum/clockwork_scripture/memory_allocation/scripture_effects() - return create_marauder() - -/datum/clockwork_scripture/memory_allocation/proc/create_marauder() - invoker.visible_message("A purple tendril appears from [invoker]'s [slab.name] and impales itself in [invoker.p_their()] forehead!", \ - "A tendril flies from [slab] into your forehead. You begin waiting while it painfully rearranges your thought pattern...") - invoker.notransform = TRUE //Vulnerable during the process - slab.busy = "Thought Modification in progress" - if(!do_after(invoker, 50, target = invoker)) - invoker.visible_message("The tendril, covered in blood, retracts from [invoker]'s head and back into the [slab.name]!", \ - "Total agony overcomes you as the tendril is forced out early!") - invoker.notransform = FALSE - invoker.Knockdown(100) - invoker.apply_damage(10, BRUTE, "head") - slab.busy = null - return FALSE - clockwork_say(invoker, text2ratvar("...the mind made...")) - invoker.notransform = FALSE - slab.busy = "Marauder Selection in progress" - if(!check_special_requirements()) - return FALSE - to_chat(invoker, "The tendril shivers slightly as it selects a marauder...") - var/list/marauder_candidates = pollGhostCandidates("Do you want to play as the clockwork marauder of [invoker.real_name]?", ROLE_SERVANT_OF_RATVAR, null, FALSE, 50, POLL_IGNORE_CLOCKWORK_MARAUDER) - if(!check_special_requirements()) - return FALSE - if(!marauder_candidates.len) - invoker.visible_message("The tendril retracts from [invoker]'s head, sealing the entry wound as it does so!", \ - "The tendril was unsuccessful! Perhaps you should try again another time.") - return FALSE - clockwork_say(invoker, text2ratvar("...sword and shield!")) - var/mob/dead/observer/theghost = pick(marauder_candidates) - var/mob/living/simple_animal/hostile/clockwork/marauder/M = new(invoker) - M.key = theghost.key - M.bind_to_host(invoker) - invoker.visible_message("The tendril retracts from [invoker]'s head, sealing the entry wound as it does so!", \ - "[M.true_name], a clockwork marauder, has taken up residence in your mind. Communicate with it via the \"Linked Minds\" action button.") - return TRUE - - -//Sigil of Transmission: Creates a sigil of transmission that can drain and store power for clockwork structures. -/datum/clockwork_scripture/create_object/sigil_of_transmission - descname = "Structure Power Generator & Battery" - name = "Sigil of Transmission" - desc = "Places a sigil that can drain and will store energy to power clockwork structures." - invocations = list("Divinity...", "...power our creations!") - channel_time = 70 - consumed_components = list(VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 2, HIEROPHANT_ANSIBLE = 4) - whispered = TRUE - object_path = /obj/effect/clockwork/sigil/transmission - creator_message = "A sigil silently appears below you. It will automatically power clockwork structures near it and will drain power when activated." - usage_tip = "Cyborgs can charge from this sigil by remaining over it for 5 seconds." +//Clockwork Marauder: Creates a construct shell for a clockwork marauder, a well-rounded frontline fighter. +/datum/clockwork_scripture/create_object/construct/clockwork_marauder + descname = "Well-Rounded Combat Construct" + name = "Clockwork Marauder" + desc = "Creates a shell for a clockwork marauder, a balanced frontline construct." + invocations = list("Arise, avatar of Arbiter!", "Defend the Ark with vengeful zeal.") + channel_time = 50 + power_cost = 1000 + creator_message = "Your slab disgorges several chunks of replicant alloy that form into a suit of thrumming armor." + usage_tip = "The marauder's shield can effectively deflect energy-based projectiles." tier = SCRIPTURE_APPLICATION one_per_tile = TRUE - primary_component = HIEROPHANT_ANSIBLE - sort_priority = 5 + primary_component = BELLIGERENT_EYE + sort_priority = 1 quickbind = TRUE - quickbind_desc = "Creates a Sigil of Transmission, which can drain and will store power for clockwork structures." + quickbind_desc = "Creates a clockwork marauder, used for frontline combat." + object_path = /obj/item/clockwork/construct_chassis/clockwork_marauder + construct_type = /mob/living/simple_animal/hostile/clockwork/marauder + combat_construct = TRUE - -//Prolonging Prism: Creates a prism that will delay the shuttle at a power cost -/datum/clockwork_scripture/create_object/prolonging_prism - descname = "Powered Structure, Delay Emergency Shuttles" - name = "Prolonging Prism" - desc = "Creates a mechanized prism which will delay the arrival of an emergency shuttle by 2 minutes at a massive power cost." - invocations = list("May this prism...", "...grant us time to enact his will!") - channel_time = 80 - consumed_components = list(VANGUARD_COGWHEEL = 5, GEIS_CAPACITOR = 2, REPLICANT_ALLOY = 2) - object_path = /obj/structure/destructible/clockwork/powered/prolonging_prism - creator_message = "You form a prolonging prism, which will delay the arrival of an emergency shuttle at a massive power cost." - observer_message = "An onyx prism forms in midair and sprouts tendrils to support itself!" - invokers_required = 2 - multiple_invokers_used = TRUE - usage_tip = "The power cost to delay a shuttle increases based on the number of times activated." - tier = SCRIPTURE_APPLICATION - one_per_tile = TRUE - primary_component = VANGUARD_COGWHEEL - sort_priority = 7 - quickbind = TRUE - quickbind_desc = "Creates a Prolonging Prism, which will delay the arrival of an emergency shuttle by 2 minutes at a massive power cost." +/datum/clockwork_scripture/create_object/construct/clockwork_marauder/update_construct_limit() + var/human_servants = 0 + for(var/V in SSticker.mode.servants_of_ratvar) + var/datum/mind/M = V + if(ishuman(M.current)) + human_servants++ + construct_limit = human_servants / 4 //1 per 4 human servants, and a maximum of 3 marauders + construct_limit = Clamp(construct_limit, 1, 3) /datum/clockwork_scripture/create_object/prolonging_prism/check_special_requirements() if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) @@ -188,7 +50,7 @@ desc = "Creates a mania motor which causes minor damage and a variety of negative mental effects in nearby non-Servant humans, potentially up to and including conversion." invocations = list("May this transmitter...", "...break the will of all who oppose us!") channel_time = 80 - consumed_components = list(GEIS_CAPACITOR = 5, REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 2) + power_cost = 750 object_path = /obj/structure/destructible/clockwork/powered/mania_motor creator_message = "You form a mania motor, which causes minor damage and negative mental effects in non-Servants." observer_message = "A two-pronged machine rises from the ground!" @@ -198,31 +60,29 @@ tier = SCRIPTURE_APPLICATION one_per_tile = TRUE primary_component = GEIS_CAPACITOR - sort_priority = 8 + sort_priority = 2 quickbind = TRUE quickbind_desc = "Creates a Mania Motor, which causes minor damage and negative mental effects in non-Servants." -//Tinkerer's Daemon: Creates an efficient machine that rapidly produces components at a power cost. -/datum/clockwork_scripture/create_object/tinkerers_daemon - descname = "Powered Structure, Component Generator" - name = "Tinkerer's Daemon" - desc = "Creates a tinkerer's daemon which can rapidly collect components. It will only function if it has sufficient power, active daemons are outnumbered by Servants by a ratio of 5:1, \ - and there is at least one existing cache." - invocations = list("May this generator...", "...collect Engine parts that yet hold greatness!") - channel_time = 80 - consumed_components = list(BELLIGERENT_EYE = 2, GEIS_CAPACITOR = 2, REPLICANT_ALLOY = 5) - object_path = /obj/structure/destructible/clockwork/powered/tinkerers_daemon - creator_message = "You form a tinkerer's daemon which can rapidly collect components at a power cost." - invokers_required = 2 - multiple_invokers_used = TRUE - usage_tip = "Vital to your success!" +//Sigil of Transmission: Creates a sigil of transmission that can drain and store power for clockwork structures. +/datum/clockwork_scripture/create_object/sigil_of_transmission + descname = "Structure Power Generator & Battery" + name = "Sigil of Transmission" + desc = "Places a sigil that can drain and will store energy to power clockwork structures." + invocations = list("Divinity...", "...power our creations!") + channel_time = 70 + power_cost = 200 + whispered = TRUE + object_path = /obj/effect/clockwork/sigil/transmission + creator_message = "A sigil silently appears below you. It will automatically power clockwork structures near it and will drain power when activated." + usage_tip = "Cyborgs can charge from this sigil by remaining over it for 5 seconds." tier = SCRIPTURE_APPLICATION one_per_tile = TRUE - primary_component = REPLICANT_ALLOY - sort_priority = 9 + primary_component = HIEROPHANT_ANSIBLE + sort_priority = 3 quickbind = TRUE - quickbind_desc = "Creates a Tinkerer's Daemon, which can rapidly collect components for power." + quickbind_desc = "Creates a Sigil of Transmission, which can drain and will store power for clockwork structures." //Clockwork Obelisk: Creates a powerful obelisk that can be used to broadcast messages or open a gateway to any servant or clockwork obelisk at a power cost. @@ -232,7 +92,7 @@ desc = "Creates a clockwork obelisk that can broadcast messages over the Hierophant Network or open a Spatial Gateway to any living Servant or clockwork obelisk." invocations = list("May this obelisk...", "...take us to all places!") channel_time = 80 - consumed_components = list(BELLIGERENT_EYE = 2, VANGUARD_COGWHEEL = 2, HIEROPHANT_ANSIBLE = 5) + power_cost = 300 object_path = /obj/structure/destructible/clockwork/powered/clockwork_obelisk creator_message = "You form a clockwork obelisk which can broadcast messages or produce Spatial Gateways." observer_message = "A brass obelisk appears hanging in midair!" @@ -242,6 +102,6 @@ tier = SCRIPTURE_APPLICATION one_per_tile = TRUE primary_component = HIEROPHANT_ANSIBLE - sort_priority = 10 + sort_priority = 4 quickbind = TRUE quickbind_desc = "Creates a Clockwork Obelisk, which can send messages or open Spatial Gateways with power." diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm index fa61e3ca316..19dee4e347a 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm @@ -2,47 +2,47 @@ // DRIVERS // ///////////// -//Belligerent: Channeled for up to fifteen times over thirty seconds. Forces non-servants that can hear the chant to walk, doing minor damage. Nar-Sian cultists are burned. -/datum/clockwork_scripture/channeled/belligerent - descname = "Channeled, Area Slowdown" - name = "Belligerent" - desc = "Forces all nearby non-servants to walk rather than run, doing minor damage. Chanted every two seconds for up to thirty seconds." - chant_invocations = list("Punish their blindness!", "Take time, make slow!") - chant_amount = 15 - chant_interval = 20 - channel_time = 20 - usage_tip = "Useful for crowd control in a populated area and disrupting mass movement." +//Hateful Manacles: Applies restraints from melee over several seconds. The restraints function like handcuffs and break on removal. +/datum/clockwork_scripture/ranged_ability/hateful_manacles + descname = "Handcuffs" + name = "Hateful Manacles" + desc = "Forms replicant manacles around a target's wrists that function like handcuffs." + invocations = list("Shackle the heretic!", "Break them in body and spirit!") + channel_time = 15 + power_cost = 25 + whispered = TRUE + usage_tip = "The manacles are about as strong as zipties, and break when removed." tier = SCRIPTURE_DRIVER primary_component = BELLIGERENT_EYE sort_priority = 1 + ranged_type = /obj/effect/proc_holder/slab/hateful_manacles + slab_overlay = "hateful_manacles" + ranged_message = "You charge the clockwork slab with divine energy.\n\ + Left-click a target within melee range to shackle!\n\ + Click your slab to cancel." + timeout_time = 200 quickbind = TRUE - quickbind_desc = "Forces nearby non-Servants to walk, doing minor damage with each chant.
Maximum 15 chants." - -/datum/clockwork_scripture/channeled/belligerent/chant_effects(chant_number) - for(var/mob/living/carbon/C in hearers(7, invoker)) - C.apply_status_effect(STATUS_EFFECT_BELLIGERENT) - new /obj/effect/temp_visual/ratvar/belligerent(get_turf(invoker)) - return TRUE + quickbind_desc = "Applies handcuffs to a struck target." -//Judicial Visor: Creates a judicial visor, which can smite an area. -/datum/clockwork_scripture/create_object/judicial_visor - descname = "Delayed Area Knockdown Glasses" - name = "Judicial Visor" - desc = "Creates a visor that can smite an area, applying Belligerent and briefly stunning. The smote area will explode after 3 seconds." - invocations = list("Grant me the flames of Engine!") - channel_time = 10 - consumed_components = list(BELLIGERENT_EYE = 1) +//Sigil of Transgression: Creates a sigil of transgression, which briefly stuns and applies Belligerent to the first non-servant to cross it. +/datum/clockwork_scripture/create_object/sigil_of_transgression + descname = "Trap, Stunning" + name = "Sigil of Transgression" + desc = "Wards a tile with a sigil, which will briefly stun the next non-Servant to cross it and apply Belligerent to them." + invocations = list("Divinity, smite...", "...those who tresspass here!") + channel_time = 50 + power_cost = 50 whispered = TRUE - object_path = /obj/item/clothing/glasses/judicial_visor - creator_message = "You form a judicial visor, which is capable of smiting a small area." - usage_tip = "The visor has a thirty-second cooldown once used." + object_path = /obj/effect/clockwork/sigil/transgression + creator_message = "A sigil silently appears below you. The next non-Servant to cross it will be smitten." + usage_tip = "The sigil does not silence its victim, and is generally used to soften potential converts or would-be invaders." tier = SCRIPTURE_DRIVER - space_allowed = TRUE + one_per_tile = TRUE primary_component = BELLIGERENT_EYE sort_priority = 2 quickbind = TRUE - quickbind_desc = "Creates a Judicial Visor, which can smite an area, applying Belligerent and briefly stunning." + quickbind_desc = "Creates a Sigil of Transgression, which will briefly stun and slow the next non-Servant to cross it." //Vanguard: Provides twenty seconds of stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker. @@ -53,6 +53,7 @@ Excessive absorption will cause unconsciousness." invocations = list("Shield me...", "...from darkness!") channel_time = 30 + power_cost = 25 usage_tip = "You cannot reactivate Vanguard while still shielded by it." tier = SCRIPTURE_DRIVER primary_component = VANGUARD_COGWHEEL @@ -84,7 +85,7 @@ desc = "Charges your slab with healing power, allowing you to convert all of a target Servant's brute, burn, and oxygen damage to half as much toxin damage." invocations = list("Mend the wounds of...", "...my inferior flesh.") channel_time = 30 - consumed_components = list(VANGUARD_COGWHEEL = 1) + power_cost = 100 usage_tip = "The Compromise is very fast to invoke, and will remove holy water from the target Servant." tier = SCRIPTURE_DRIVER primary_component = VANGUARD_COGWHEEL @@ -98,38 +99,77 @@ Click your slab to cancel." -//Geis: Grants a short-range binding attack that allows you to mute and drag around a target in a very obvious manner. -/datum/clockwork_scripture/ranged_ability/geis - descname = "Melee Mute & Stun" - name = "Geis" - desc = "Charges your slab with divine energy, allowing you to bind and pull a struck heretic." - invocations = list("Divinity, grant me strength...", "...to bind the heathen!") +//Abscond: Used to return to Reebe. +/datum/clockwork_scripture/abscond + descname = "Return to Reebe" + name = "Abscond" + desc = "Yanks you through space, returning you to home base." + invocations = list("As we bid farewell, and return to the stars...", "...we shall find our way home.") whispered = TRUE - channel_time = 20 - usage_tip = "You CANNOT TAKE ANY NON-PULL ACTIONS while the target is bound, so Sigils of Submission should be placed before use." + channel_time = 50 + power_cost = 5 + special_power_text = "POWERCOST to bring pulled creature" + special_power_cost = ABSCOND_ABDUCTION_COST + usage_tip = "This can't be used while on Reebe, for obvious reasons." tier = SCRIPTURE_DRIVER primary_component = GEIS_CAPACITOR sort_priority = 5 quickbind = TRUE - quickbind_desc = "Allows you to bind and mute an adjacent target non-Servant.
Click your slab to disable." - slab_overlay = "geis" - ranged_type = /obj/effect/proc_holder/slab/geis - ranged_message = "You charge the clockwork slab with divine energy.\n\ - Left-click a target within melee range to bind!\n\ - Click your slab to cancel." - timeout_time = 100 + quickbind_desc = "Returns you to Reebe." -/datum/clockwork_scripture/ranged_ability/geis/run_scripture() - var/servants = 0 - if(!GLOB.ratvar_awakens) - for(var/mob/living/M in GLOB.living_mob_list) - if(can_recite_scripture(M, TRUE)) - servants++ - if(servants > SCRIPT_SERVANT_REQ) - whispered = FALSE - servants -= SCRIPT_SERVANT_REQ - channel_time = min(channel_time + servants*3, 50) - return ..() +/datum/clockwork_scripture/abscond/check_special_requirements() + if(invoker.z == ZLEVEL_CITYOFCOGS) + to_chat(invoker, "You're already at Reebe.") + return + return TRUE + +/datum/clockwork_scripture/abscond/recital() + animate(invoker.client, color = "#AF0AAF", time = 50) + . = ..() + +/datum/clockwork_scripture/abscond/scripture_effects() + var/take_pulling = invoker.pulling && isliving(invoker.pulling) && get_clockwork_power(ABSCOND_ABDUCTION_COST) + var/turf/T = get_turf(pick(GLOB.servant_spawns)) + invoker.visible_message("[invoker] flickers and phases out of existence!", \ + "You feel a dizzying sense of vertigo as you're yanked back to Reebe!") + T.visible_message("[invoker] flickers and phases into existence!") + playsound(invoker, 'sound/magic/magic_missile.ogg', 50, TRUE) + playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE) + do_sparks(5, TRUE, invoker) + do_sparks(5, TRUE, T) + if(take_pulling) + adjust_clockwork_power(-special_power_cost) + invoker.pulling.forceMove(T) + invoker.forceMove(T) + if(invoker.client) + animate(invoker.client, color = initial(invoker.client.color), time = 25) + +/datum/clockwork_scripture/abscond/scripture_fail() + if(invoker && invoker.client) + animate(invoker.client, color = initial(invoker.client.color), time = 10) + + +//Kindle: Charges the slab with blazing energy. It can be released to stun and silence a target. +/datum/clockwork_scripture/ranged_ability/kindle + descname = "Short-Range Single-Target Stun" + name = "Kindle" + desc = "Charges your slab with divine energy, allowing you to overwhelm a target with Ratvar's light." + invocations = list("Divinity, show them your light!") + whispered = TRUE + channel_time = 30 + power_cost = 125 + usage_tip = "The light can be used from up to two tiles away. Damage taken will GREATLY REDUCE the stun's duration." + tier = SCRIPTURE_DRIVER + primary_component = GEIS_CAPACITOR + sort_priority = 6 + slab_overlay = "volt" + ranged_type = /obj/effect/proc_holder/slab/kindle + ranged_message = "You charge the clockwork slab with divine energy.\n\ + Left-click a target within melee range to stun!\n\ + Click your slab to cancel." + timeout_time = 150 + quickbind = TRUE + quickbind_desc = "Stuns and mutes a target from a short range." //Sigil of Submission: Creates a sigil of submission, which converts one heretic above it after a delay. @@ -139,7 +179,7 @@ desc = "Places a luminous sigil that will convert any non-Servants that remain on it for 8 seconds." invocations = list("Divinity, enlighten...", "...those who trespass here!") channel_time = 60 - consumed_components = list(GEIS_CAPACITOR = 1) + power_cost = 125 whispered = TRUE object_path = /obj/effect/clockwork/sigil/submission creator_message = "A luminous sigil appears below you. Any non-Servants to cross it will be converted after 8 seconds if they do not move." @@ -159,6 +199,7 @@ desc = "Creates a new clockwork slab." invocations = list("Metal, become greater!") channel_time = 10 + power_cost = 25 whispered = TRUE object_path = /obj/item/clockwork/slab creator_message = "You copy a piece of replicant alloy and command it into a new slab." @@ -171,37 +212,44 @@ quickbind_desc = "Creates a new Clockwork Slab." -//Tinkerer's Cache: Creates a tinkerer's cache, allowing global component storage. -/datum/clockwork_scripture/create_object/tinkerers_cache - descname = "Necessary Structure, Shares Components" - name = "Tinkerer's Cache" - desc = "Forms a cache that can store an infinite amount of components. All caches are linked and will provide components to slabs. \ - Striking a cache with a slab will transfer that slab's components to the global cache." - invocations = list("Constructing...", "...a cache!") +//Stargazer: Creates a stargazer, a cheap power generator that utilizes starlight. +/datum/clockwork_scripture/create_object/stargazer + descname = "Necessary Structure, Generates Power From Starlight" + name = "Stargazer" + desc = "Forms a weak structure that generates power every second while within three tiles of starlight." + invocations = list("Capture their inferior light for us!") channel_time = 50 - consumed_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 0) - object_path = /obj/structure/destructible/clockwork/cache - creator_message = "You form a tinkerer's cache, which is capable of storing components, which will automatically be used by slabs." - observer_message = "A hollow brass spire rises and begins to blaze!" - usage_tip = "Slabs will draw components from the global cache after the slab's own repositories, making caches extremely useful." + power_cost = 50 + object_path = /obj/structure/destructible/clockwork/stargazer + creator_message = "You form a stargazer, which will generate power near starlight." + observer_message = "A large lantern-shaped machine forms!" + usage_tip = "For obvious reasons, make sure to place this near a window or somewhere else that can see space!" tier = SCRIPTURE_DRIVER one_per_tile = TRUE primary_component = REPLICANT_ALLOY sort_priority = 8 quickbind = TRUE - quickbind_desc = "Creates a Tinkerer's Cache, which stores components globally for slab access." - var/static/prev_cost = 0 + quickbind_desc = "Creates a stargazer, which generates power when near starlight." -/datum/clockwork_scripture/create_object/tinkerers_cache/creation_update() - var/cache_cost_increase = min(round(GLOB.clockwork_caches*0.4), 10) - if(cache_cost_increase != prev_cost) - prev_cost = cache_cost_increase - consumed_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 0) - for(var/i in consumed_components) - if(i != REPLICANT_ALLOY) - consumed_components[i] += cache_cost_increase - return TRUE - return FALSE + +//Integration Cog: Creates an integration cog that can be inserted into APCs to passively siphon power. +/datum/clockwork_scripture/create_object/integration_cog + descname = "APC Power Siphoner" + name = "Integration Cog" + desc = "Fabricates an integration cog, which can be used on an open APC to replace its innards and passively siphon its power." + invocations = list("Take that which sustains them!") + channel_time = 10 + power_cost = 10 + whispered = TRUE + object_path = /obj/item/clockwork/integration_cog + creator_message = "You form an integration cog, which can be inserted into an open APC to passively siphon power." + usage_tip = "Tampering isn't visible unless the APC is opened." + tier = SCRIPTURE_DRIVER + space_allowed = TRUE + primary_component = HIEROPHANT_ANSIBLE + sort_priority = 9 + quickbind = TRUE + quickbind_desc = "Creates an integration cog, which can be used to siphon power from an open APC." //Wraith Spectacles: Creates a pair of wraith spectacles, which grant xray vision but damage vision slowly. @@ -211,6 +259,7 @@ desc = "Fabricates a pair of glasses which grant true sight but cause gradual vision loss." invocations = list("Show the truth of this world to me!") channel_time = 10 + power_cost = 50 whispered = TRUE object_path = /obj/item/clothing/glasses/wraith_spectacles creator_message = "You form a pair of wraith spectacles, which grant true sight but cause gradual vision loss." @@ -218,26 +267,6 @@ tier = SCRIPTURE_DRIVER space_allowed = TRUE primary_component = HIEROPHANT_ANSIBLE - sort_priority = 9 - quickbind = TRUE - quickbind_desc = "Creates a pair of Wraith Spectacles, which grant true sight but cause gradual vision loss." - - -//Sigil of Transgression: Creates a sigil of transgression, which stuns the first nonservant to cross it. -/datum/clockwork_scripture/create_object/sigil_of_transgression - descname = "Trap, Stunning" - name = "Sigil of Transgression" - desc = "Wards a tile with a sigil, which will stun the next non-Servant to cross it." - invocations = list("Divinity, smite...", "...those who tresspass here!") - channel_time = 50 - consumed_components = list(HIEROPHANT_ANSIBLE = 1) - whispered = TRUE - object_path = /obj/effect/clockwork/sigil/transgression - creator_message = "A sigil silently appears below you. The next non-Servant to cross it will be stunned." - usage_tip = "The sigil, while fairly powerful in its stun, does not induce muteness in its victim." - tier = SCRIPTURE_DRIVER - one_per_tile = TRUE - primary_component = HIEROPHANT_ANSIBLE sort_priority = 10 quickbind = TRUE - quickbind_desc = "Creates a Sigil of Transgression, which will stun the next non-Servant to cross it." + quickbind_desc = "Creates a pair of Wraith Spectacles, which grant true sight but cause gradual vision loss." diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm deleted file mode 100644 index c7daef14507..00000000000 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm +++ /dev/null @@ -1,42 +0,0 @@ -/////////////// -// JUDGEMENT // -/////////////// - -//Ark of the Clockwork Justiciar: Creates a Gateway to the Celestial Derelict, summoning ratvar. -/datum/clockwork_scripture/create_object/ark_of_the_clockwork_justiciar - descname = "Structure, Win Condition" - name = "Ark of the Clockwork Justiciar" - desc = "Tears apart a rift in spacetime to Reebe, the Celestial Derelict, using a massive amount of components.\n\ - This gateway will, after some time, call forth Ratvar from his exile and massively empower all scriptures and tools." - invocations = list("ARMORER! FRIGHT! AMPERAGE! VANGUARD! I CALL UPON YOU!!", \ - "THE TIME HAS COME FOR OUR MASTER TO BREAK THE CHAINS OF EXILE!!", \ - "LEND US YOUR AID! ENGINE COMES!!") - channel_time = 150 - consumed_components = list(BELLIGERENT_EYE = ARK_SUMMON_COST, VANGUARD_COGWHEEL = ARK_SUMMON_COST, GEIS_CAPACITOR = ARK_SUMMON_COST, REPLICANT_ALLOY = ARK_SUMMON_COST, HIEROPHANT_ANSIBLE = ARK_SUMMON_COST) - invokers_required = 6 - multiple_invokers_used = TRUE - object_path = /obj/structure/destructible/clockwork/massive/celestial_gateway - creator_message = null - usage_tip = "The gateway is completely vulnerable to attack during its five-minute duration. It will periodically give indication of its general position to everyone on the station \ - as well as being loud enough to be heard throughout the entire sector. Defend it with your life!" - tier = SCRIPTURE_JUDGEMENT - sort_priority = 1 - -/datum/clockwork_scripture/create_object/ark_of_the_clockwork_justiciar/check_special_requirements() - if(!slab.no_cost) - if(GLOB.ratvar_awakens) - to_chat(invoker, "\"I am already here, idiot.\"") - return FALSE - for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in GLOB.all_clockwork_objects) - var/area/gate_area = get_area(G) - to_chat(invoker, "There is already an Ark at [gate_area.map_name]!") - return FALSE - var/area/A = get_area(invoker) - var/turf/T = get_turf(invoker) - if(!T || !(T.z in GLOB.station_z_levels) || istype(A, /area/shuttle) || !A.blob_allowed) - to_chat(invoker, "You must be on the station to activate the Ark!") - return FALSE - if(GLOB.clockwork_gateway_activated) - to_chat(invoker, "Ratvar's recent banishment renders him too weak to be wrung forth from Reebe!") - return FALSE - return ..() diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index 0e42af3a656..16a6f3ffd7a 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -7,9 +7,9 @@ descname = "Structure, Turret" name = "Ocular Warden" desc = "Forms an automatic short-range turret which will automatically attack nearby unrestrained non-Servants that can see it." - invocations = list("Guardians...", "...of the Engine...", "...defend us!") - channel_time = 120 - consumed_components = list(BELLIGERENT_EYE = 2, REPLICANT_ALLOY = 1) + invocations = list("Guardians of Engine...", "...judge those who would harm us!") + channel_time = 100 + power_cost = 250 object_path = /obj/structure/destructible/clockwork/ocular_warden creator_message = "You form an ocular warden, which will automatically attack nearby unrestrained non-Servants that can see it." observer_message = "A brass eye takes shape and slowly rises into the air, its red iris glaring!" @@ -29,15 +29,35 @@ return ..() +//Judicial Visor: Creates a judicial visor, which can smite an area. +/datum/clockwork_scripture/create_object/judicial_visor + descname = "Delayed Area Knockdown Glasses" + name = "Judicial Visor" + desc = "Creates a visor that can smite an area, applying Belligerent and briefly stunning. The smote area will explode after 3 seconds." + invocations = list("Grant me the flames of Engine!") + channel_time = 10 + power_cost = 400 + whispered = TRUE + object_path = /obj/item/clothing/glasses/judicial_visor + creator_message = "You form a judicial visor, which is capable of smiting a small area." + usage_tip = "The visor has a thirty-second cooldown once used." + tier = SCRIPTURE_SCRIPT + space_allowed = TRUE + primary_component = BELLIGERENT_EYE + sort_priority = 2 + quickbind = TRUE + quickbind_desc = "Creates a Judicial Visor, which can smite an area, applying Belligerent and briefly stunning." + + //Vitality Matrix: Creates a sigil which will drain health from nonservants and can use that health to heal or even revive servants. /datum/clockwork_scripture/create_object/vitality_matrix descname = "Trap, Damage to Healing" name = "Vitality Matrix" desc = "Places a sigil that drains life from any living non-Servants that cross it, producing Vitality. Servants that cross it, however, will be healed using existing Vitality. \ Dead Servants can be revived by this sigil at a cost of 150 Vitality." - invocations = list("Divinity...", "...steal their life...", "...for these shells!") + invocations = list("Divinity, siphon their essence...", "...for this shell to consume.") channel_time = 60 - consumed_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 2) + power_cost = 1000 whispered = TRUE object_path = /obj/effect/clockwork/sigil/vitality creator_message = "A vitality matrix appears below you. It will drain life from non-Servants and heal Servants that cross it." @@ -58,7 +78,7 @@ chant_invocations = list("Mend our dents!", "Heal our scratches!", "Repair our gears!") chant_amount = 10 chant_interval = 20 - consumed_components = list(VANGUARD_COGWHEEL = 2, REPLICANT_ALLOY = 1) + power_cost = 1000 usage_tip = "This is a very effective way to rapidly reinforce a base after an attack." tier = SCRIPTURE_SCRIPT primary_component = VANGUARD_COGWHEEL @@ -169,76 +189,115 @@ desc = "Forms a device that, when used on certain objects, replaces them with their Ratvarian equivalents. It requires power to function." invocations = list("With this device...", "...his presence shall be made known.") channel_time = 20 - consumed_components = list(GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 2) + power_cost = 250 whispered = TRUE - object_path = /obj/item/clockwork/replica_fabricator/preloaded + object_path = /obj/item/clockwork/replica_fabricator creator_message = "You form a replica fabricator." usage_tip = "Clockwork Walls cause nearby Tinkerer's Caches to generate components passively, making this a vital tool. Clockwork Floors heal toxin damage in Servants standing on them." tier = SCRIPTURE_SCRIPT space_allowed = TRUE primary_component = REPLICANT_ALLOY - sort_priority = 7 + sort_priority = 5 quickbind = TRUE quickbind_desc = "Creates a Replica Fabricator, which can convert various objects to Ratvarian variants." -//Function Call: Grants the invoker the ability to call forth a Ratvarian spear that deals significant damage to silicons. -/datum/clockwork_scripture/function_call - descname = "Permanent Summonable Spear" - name = "Function Call" - desc = "Grants the invoker the ability to call forth a powerful Ratvarian spear every 3 minutes, with it lasting 3 minutes. The spear's attacks will generate Vitality, used for healing." - invocations = list("Grant me...", "...the might of brass!") +//Clockwork Arnaments: Grants the invoker the ability to call forth a Ratvarian spear and clockwork armor. +/datum/clockwork_scripture/clockwork_arnaments + descname = "Summonable Armor and Weapons" + name = "Clockwork Arnaments" + desc = "Allows the invoker to summon clockwork armor and a Ratvarian spear at will. The spear's attacks will generate Vitality, used for healing." + invocations = list("Grant me arnaments...", "...from the forge of Armorer!") channel_time = 20 - consumed_components = list(REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 1) + power_cost = 250 whispered = TRUE - usage_tip = "Throwing the spear at a mob will do massive damage and knock them down, but break the spear." + usage_tip = "Throwing the spear at a mob will do massive damage and knock them down, but break the spear. You will need to wait for 30 seconds before resummoning it." tier = SCRIPTURE_SCRIPT primary_component = REPLICANT_ALLOY - sort_priority = 8 + sort_priority = 6 + quickbind = TRUE + quickbind_desc = "Permanently binds clockwork armor and a Ratvarian spear to you." -/datum/clockwork_scripture/function_call/check_special_requirements() - for(var/datum/action/innate/function_call/F in invoker.actions) +/datum/clockwork_scripture/clockwork_arnaments/check_special_requirements() + for(var/datum/action/innate/clockwork_arnaments/F in invoker.actions) to_chat(invoker, "You have already bound a Ratvarian spear to yourself!") return FALSE return invoker.can_hold_items() -/datum/clockwork_scripture/function_call/scripture_effects() +/datum/clockwork_scripture/clockwork_arnaments/scripture_effects() invoker.visible_message("A shimmer of yellow light infuses [invoker]!", \ - "You bind a Ratvarian spear to yourself. Use the \"Function Call\" action button to call it forth.") - var/datum/action/innate/function_call/F = new() - F.Grant(invoker) + "You bind clockwork equipment to yourself. Use Clockwork Arnaments and Call Spear to summon them.") + var/datum/action/innate/call_weapon/ratvarian_spear/S = new() + S.Grant(invoker) + var/datum/action/innate/clockwork_arnaments/A = new() + A.Grant(invoker) return TRUE -//Function Call action: Calls forth a Ratvarian spear once every 3 minutes. -/datum/action/innate/function_call - name = "Function Call" - desc = "Allows you to summon a Ratvarian spear to fight enemies." - button_icon_state = "ratvarian_spear" +//Clockwork Arnaments: Equips a set of clockwork armor. Three-minute cooldown. +/datum/action/innate/clockwork_arnaments + name = "Clockwork Arnaments" + desc = "Outfits you in a full set of Ratvarian armor." + icon_icon = 'icons/mob/actions/actions_clockcult.dmi' + button_icon_state = "clockwork_armor" background_icon_state = "bg_clock" check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS buttontooltipstyle = "clockcult" var/cooldown = 0 - var/base_cooldown = RATVARIAN_SPEAR_DURATION + var/static/list/ratvarian_armor_typecache = typecacheof(list( + /obj/item/clothing/suit/armor/clockwork, + /obj/item/clothing/head/helmet/clockwork, + /obj/item/clothing/gloves/clockwork, + /obj/item/clothing/shoes/clockwork)) //don't replace this ever + var/static/list/better_armor_typecache = typecacheof(list( + /obj/item/clothing/suit/space, + /obj/item/clothing/head/helmet/space, + /obj/item/clothing/shoes/magboots)) //replace this only if ratvar is up -/datum/action/innate/function_call/IsAvailable() - if(!is_servant_of_ratvar(owner) || cooldown > world.time) - return FALSE +/datum/action/innate/clockwork_arnaments/IsAvailable() + if(!is_servant_of_ratvar(owner)) + qdel(src) + return + if(cooldown > world.time) + return return ..() -/datum/action/innate/function_call/Activate() - if(!owner.get_empty_held_indexes()) - to_chat(usr, "You need an empty hand to call forth your spear!") - return FALSE - owner.visible_message("A strange spear materializes in [owner]'s hands!", "You call forth your spear!") - var/obj/item/clockwork/ratvarian_spear/R = new(get_turf(usr)) - owner.put_in_hands(R) - if(!GLOB.ratvar_awakens) - to_chat(owner, "Your spear begins to break down in this plane of existence. You can't use it for long!") - cooldown = base_cooldown + world.time +/datum/action/innate/clockwork_arnaments/Activate() + var/do_message = 0 + var/obj/item/I = owner.get_item_by_slot(slot_wear_suit) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/suit/armor/clockwork(null), slot_wear_suit) + I = owner.get_item_by_slot(slot_head) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/head/helmet/clockwork(null), slot_head) + I = owner.get_item_by_slot(slot_gloves) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/gloves/clockwork(null), slot_gloves) + I = owner.get_item_by_slot(slot_shoes) + if(remove_item_if_better(I, owner)) + do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/shoes/clockwork(null), slot_shoes) + if(do_message) + owner.visible_message("Strange armor appears on [owner]!", "A bright shimmer runs down your body, equipping you with Ratvarian armor.") + playsound(owner, 'sound/magic/clockwork/fellowship_armory.ogg', 15 * do_message, TRUE) //get sound loudness based on how much we equipped + cooldown = CLOCKWORK_ARMOR_COOLDOWN + world.time owner.update_action_buttons_icon() - addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), base_cooldown) + addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), CLOCKWORK_ARMOR_COOLDOWN) return TRUE +/datum/action/innate/clockwork_arnaments/proc/remove_item_if_better(obj/item/I, mob/user) + if(!I) + return TRUE + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + return FALSE + if(!GLOB.ratvar_awakens && is_type_in_typecache(I, better_armor_typecache)) + return FALSE + return user.dropItemToGround(I) + +//Call Spear: Calls forth a powerful Ratvarian spear. +/datum/action/innate/call_weapon/ratvarian_spear + name = "Call Spear" + desc = "Calls a Ratvarian spear into your hands to fight your enemies." + weapon_type = /obj/item/clockwork/weapon/ratvarian_spear + //Spatial Gateway: Allows the invoker to teleport themselves and any nearby allies to a conscious servant or clockwork obelisk. /datum/clockwork_scripture/spatial_gateway @@ -248,7 +307,7 @@ Each servant assisting in the invocation adds one additional use and four additional seconds to the gateway's uses and duration." invocations = list("Spatial Gateway...", "...activate!") channel_time = 80 - consumed_components = list(VANGUARD_COGWHEEL = 1, HIEROPHANT_ANSIBLE = 2) + power_cost = 400 multiple_invokers_used = TRUE multiple_invokers_optional = TRUE usage_tip = "This gateway is strictly one-way and will only allow things through the invoker's portal." @@ -285,3 +344,4 @@ portal_uses = max(portal_uses, 100) //Very powerful if Ratvar has been summoned duration = max(duration, 100) return slab.procure_gateway(invoker, duration, portal_uses) + diff --git a/code/game/gamemodes/clock_cult/clock_structure.dm b/code/game/gamemodes/clock_cult/clock_structure.dm index 1da30536050..6c3f3a0c0b6 100644 --- a/code/game/gamemodes/clock_cult/clock_structure.dm +++ b/code/game/gamemodes/clock_cult/clock_structure.dm @@ -77,14 +77,10 @@ return FALSE return ..() -/obj/structure/destructible/clockwork/proc/get_efficiency_mod(increasing) +/obj/structure/destructible/clockwork/proc/get_efficiency_mod() if(GLOB.ratvar_awakens) - if(increasing) - return 0.5 return 2 . = max(sqrt(obj_integrity/max(max_integrity, 1)), 0.5) - if(increasing) - . *= min(max_integrity/max(obj_integrity, 1), 4) . = round(., 0.01) /obj/structure/destructible/clockwork/attack_ai(mob/user) @@ -116,7 +112,7 @@ else icon_state = unanchored_icon if(do_damage) - playsound(src, break_sound, 10 * get_efficiency_mod(TRUE), 1) + playsound(src, break_sound, 10 * (40 * (1 - get_efficiency_mod())), 1) take_damage(round(max_integrity * 0.25, 1), BRUTE) to_chat(user, "As you unsecure [src] from the floor, you see cracks appear in its surface!") @@ -158,10 +154,10 @@ /obj/structure/destructible/clockwork/powered/examine(mob/user) ..() if(is_servant_of_ratvar(user) || isobserver(user)) - var/powered = total_accessable_power() - var/sigil_number = LAZYLEN(check_apc_and_sigils()) - to_chat(user, "It has access to [powered == INFINITY ? "INFINITE":"[DisplayPower(powered)] of"] power, \ - and [sigil_number] Sigil[sigil_number == 1 ? "":"s"] of Transmission [sigil_number == 1 ? "is":"are"] in range.") + if(!can_access_clockwork_power(src)) + to_chat(user, "It has no access to the power network! Create a sigil of transmission nearby.") + else + to_chat(user, "It has access to [DisplayPower(get_clockwork_power())] of power.") /obj/structure/destructible/clockwork/powered/Destroy() SSfastprocess.processing -= src @@ -169,7 +165,7 @@ return ..() /obj/structure/destructible/clockwork/powered/process() - var/powered = total_accessable_power() + var/powered = can_access_clockwork_power(src) return powered == PROCESS_KILL ? 25 : powered //make sure we don't accidentally return the arbitrary PROCESS_KILL define /obj/structure/destructible/clockwork/powered/can_be_unfasten_wrench(mob/user, silent) @@ -210,102 +206,12 @@ if(forced_disable(TRUE)) new /obj/effect/temp_visual/emp(loc) -/obj/structure/destructible/clockwork/powered/proc/total_accessable_power() //how much power we have and can use - if(!needs_power || GLOB.ratvar_awakens) - return INFINITY //oh yeah we've got power why'd you ask - - var/power = 0 - power += accessable_apc_power() - power += accessable_sigil_power() - return power - -/obj/structure/destructible/clockwork/powered/proc/accessable_apc_power() - var/power = 0 - var/area/A = get_area(src) - var/area/targetAPCA - for(var/obj/machinery/power/apc/APC in GLOB.apcs_list) - var/area/APCA = get_area(APC) - if(APCA == A) - target_apc = APC - if(target_apc) - targetAPCA = get_area(target_apc) - if(targetAPCA != A) - target_apc = null - else if(target_apc.cell) - var/apccharge = target_apc.cell.charge - if(apccharge >= MIN_CLOCKCULT_POWER) - power += apccharge - return power - -/obj/structure/destructible/clockwork/powered/proc/accessable_sigil_power() - var/power = 0 - for(var/obj/effect/clockwork/sigil/transmission/T in range(SIGIL_ACCESS_RANGE, src)) - power += T.power_charge - return power - - /obj/structure/destructible/clockwork/powered/proc/try_use_power(amount) //try to use an amount of power - if(!needs_power || GLOB.ratvar_awakens) - return 1 - if(amount <= 0) - return FALSE - var/power = total_accessable_power() - if(!power || power < amount) - return FALSE + if(!needs_power || GLOB.ratvar_awakens || !amount) + return TRUE + if(!can_access_clockwork_power(src, amount)) + return return use_power(amount) /obj/structure/destructible/clockwork/powered/proc/use_power(amount) //we've made sure we had power, so now we use it - var/sigilpower = accessable_sigil_power() - var/list/sigils_in_range = list() - for(var/obj/effect/clockwork/sigil/transmission/T in range(SIGIL_ACCESS_RANGE, src)) - sigils_in_range += T - while(sigilpower && amount >= MIN_CLOCKCULT_POWER) - for(var/S in sigils_in_range) - var/obj/effect/clockwork/sigil/transmission/T = S - if(amount >= MIN_CLOCKCULT_POWER && T.modify_charge(MIN_CLOCKCULT_POWER)) - sigilpower -= MIN_CLOCKCULT_POWER - amount -= MIN_CLOCKCULT_POWER - var/apcpower = accessable_apc_power() - while(apcpower >= MIN_CLOCKCULT_POWER && amount >= MIN_CLOCKCULT_POWER) - if(target_apc.cell.use(MIN_CLOCKCULT_POWER)) - apcpower -= MIN_CLOCKCULT_POWER - amount -= MIN_CLOCKCULT_POWER - target_apc.charging = 1 - target_apc.chargemode = TRUE - target_apc.update() - target_apc.update_icon() - target_apc.updateUsrDialog() - else - apcpower = 0 - if(amount) - return FALSE - else - return TRUE - -/obj/structure/destructible/clockwork/powered/proc/return_power(amount) //returns a given amount of power to all nearby sigils or if there are no sigils, to the APC - if(amount <= 0) - return FALSE - var/list/sigils_in_range = check_apc_and_sigils() - if(!istype(sigils_in_range)) - return FALSE - if(sigils_in_range.len) - while(amount >= MIN_CLOCKCULT_POWER) - for(var/S in sigils_in_range) - var/obj/effect/clockwork/sigil/transmission/T = S - if(amount >= MIN_CLOCKCULT_POWER && T.modify_charge(-MIN_CLOCKCULT_POWER)) - amount -= MIN_CLOCKCULT_POWER - if(target_apc && target_apc.cell && target_apc.cell.give(amount)) - target_apc.charging = 1 - target_apc.chargemode = TRUE - target_apc.update() - target_apc.update_icon() - target_apc.updateUsrDialog() - return TRUE - -/obj/structure/destructible/clockwork/powered/proc/check_apc_and_sigils() //checks for sigils and an APC, returning FALSE if it finds neither, and a list of sigils otherwise - . = list() - for(var/obj/effect/clockwork/sigil/transmission/T in range(SIGIL_ACCESS_RANGE, src)) - . += T - var/list/L = . - if(!L.len && (!target_apc || !target_apc.cell)) - return FALSE + return adjust_clockwork_power(-amount) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index b684b854c13..2d66739b4ed 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -1,18 +1,24 @@ +#define ARK_GRACE_PERIOD 300 //In seconds, how long the crew has before the Ark truly "begins" + //The gateway to Reebe, from which Ratvar emerges. /obj/structure/destructible/clockwork/massive/celestial_gateway - name = "ark of the Clockwork Justicar" - desc = "A massive, thrumming rip in spacetime." - clockwork_desc = "A portal to the Celestial Derelict. Massive and intimidating, it is the only thing that can both transport Ratvar and withstand the massive amount of energy he emits." + name = "\improper Ark of the Clockwork Justicar" + desc = "A massive, hulking amalgamation of parts. It seems to be maintaining a very unstable bluespace anomaly." + clockwork_desc = "Nezbere's magnum opus: a hulking clockwork machine capable of combining bluespace and steam power to summon Ratvar. Once activated, \ + its instability will cause one-way bluespace rifts to open across the station to the City of Cogs, so be prepared to defend it at all costs." max_integrity = 500 mouse_opacity = MOUSE_OPACITY_OPAQUE icon = 'icons/effects/clockwork_effects.dmi' icon_state = "nothing" - density = FALSE - invisibility = INVISIBILITY_MAXIMUM - resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE | FREEZE_PROOF + density = TRUE + resistance_flags = FIRE_PROOF | ACID_PROOF | FREEZE_PROOF can_be_repaired = FALSE immune_to_servant_attacks = TRUE + var/active = FALSE var/progress_in_seconds = 0 //Once this reaches GATEWAY_RATVAR_ARRIVAL, it's game over + var/grace_period = ARK_GRACE_PERIOD //This exists to allow the crew to gear up and prepare for the invasion + var/initial_activation_delay = -1 //How many seconds the Ark will have initially taken to activate + var/seconds_until_activation = -1 //How many seconds until the Ark activates; if it should never activate, set this to -1 var/purpose_fulfilled = FALSE var/first_sound_played = FALSE var/second_sound_played = FALSE @@ -20,31 +26,41 @@ var/fourth_sound_played = FALSE var/obj/effect/clockwork/overlay/gateway_glow/glow var/obj/effect/countdown/clockworkgate/countdown - var/list/required_components = list(BELLIGERENT_EYE = ARK_CONSUME_COST, VANGUARD_COGWHEEL = ARK_CONSUME_COST, GEIS_CAPACITOR = ARK_CONSUME_COST, REPLICANT_ALLOY = ARK_CONSUME_COST, HIEROPHANT_ANSIBLE = ARK_CONSUME_COST) /obj/structure/destructible/clockwork/massive/celestial_gateway/Initialize() . = ..() - INVOKE_ASYNC(src, .proc/spawn_animation) + glow = new(get_turf(src)) + if(!GLOB.ark_of_the_clockwork_justiciar) + GLOB.ark_of_the_clockwork_justiciar = src + START_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/cry_havoc() + visible_message("[src] shudders and roars to life, its parts beginning to whirr and screech!") + hierophant_message("The Ark is activating! Get back to the base!") + for(var/mob/M in GLOB.player_list) + if(is_servant_of_ratvar(M) || isobserver(M) || M.z == z) + M.playsound_local(M, 'sound/magic/clockwork/ark_activation_sequence.ogg', 30, FALSE, pressure_affected = FALSE) + addtimer(CALLBACK(src, .proc/let_slip_the_dogs), 300) + +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/let_slip_the_dogs() + spawn_animation() + first_sound_played = TRUE + active = TRUE + priority_announce("Massive [Gibberish("bluespace", 100)] anomaly detected on all frequencies. All crew are directed to \ + @!$, [text2ratvar("PURGE ALL UNTRUTHS")] <&. the anomalies and destroy their source to prevent further damage to corporate property. This is \ + not a drill.[grace_period ? " Estimated time of appearance: [grace_period] seconds. Use this time to prepare." : ""]", \ + "Central Command Higher Dimensional Affairs", 'sound/magic/clockwork/ark_activation.ogg') + set_security_level("delta") + for(var/V in SSticker.mode.servants_of_ratvar) + var/datum/mind/M = V + if(ishuman(M.current)) + M.current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)) + +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/open_portal(turf/T) + new/obj/effect/clockwork/city_of_cogs_rift(T) /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/spawn_animation() var/turf/T = get_turf(src) - new/obj/effect/clockwork/general_marker/inathneq(T) - hierophant_message("\"[text2ratvar("Engine, come forth and show your servants your mercy")]!\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 30, 0) - sleep(10) - new/obj/effect/clockwork/general_marker/sevtug(T) - hierophant_message("\"[text2ratvar("Engine, come forth and show this station your decorating skills")]!\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 45, 0) - sleep(10) - new/obj/effect/clockwork/general_marker/nezbere(T) - hierophant_message("\"[text2ratvar("Engine, come forth and shine your light across this realm")]!!\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 60, 0) - sleep(10) - new/obj/effect/clockwork/general_marker/nzcrentr(T) - hierophant_message("\"[text2ratvar("Engine, come forth")].\"") - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 75, 0) - sleep(10) - playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 100, 0) var/list/open_turfs = list() for(var/turf/open/OT in orange(1, T)) if(!is_blocked_turf(OT, TRUE)) @@ -52,33 +68,36 @@ if(open_turfs.len) for(var/mob/living/L in T) L.forceMove(pick(open_turfs)) - resistance_flags &= ~INDESTRUCTIBLE - density = TRUE - invisibility = 0 - glow = new(get_turf(src)) - countdown = new(src) - countdown.start() - var/area/gate_area = get_area(src) - hierophant_message("An Ark of the Clockwork Justicar has been created in [gate_area.map_name]!", FALSE, src) + hierophant_message("The Ark has activated! [grace_period ? "You have [round(grace_period / 60)] minutes until the crew invades! " : ""]Defend it at all costs!", FALSE, src) + sound_to_playing_players(volume = 10, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', TRUE)) + seconds_until_activation = 0 SSshuttle.registerHostileEnvironment(src) - START_PROCESSING(SSprocessing, src) /obj/structure/destructible/clockwork/massive/celestial_gateway/Destroy() STOP_PROCESSING(SSprocessing, src) - if(!purpose_fulfilled) - var/area/gate_area = get_area(src) - hierophant_message("An Ark of the Clockwork Justicar has fallen at [gate_area.map_name]!") - sound_to_playing_players(channel = CHANNEL_JUSTICAR_ARK, S = sound(null, 0)) - var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED SSshuttle.clearHostileEnvironment(src) - if(!was_stranded && !purpose_fulfilled) - priority_announce("Massive energy anomaly no longer on short-range scanners.","Anomaly Alert") + if(!purpose_fulfilled && istype(SSticker.mode, /datum/game_mode/clockwork_cult)) + hierophant_message("The Ark has fallen!") + sound_to_playing_players(null, channel = CHANNEL_JUSTICAR_ARK) + SSticker.force_ending = TRUE //rip if(glow) qdel(glow) glow = null if(countdown) qdel(countdown) countdown = null + for(var/mob/L in GLOB.player_list) + if(L.z == z) + L.forceMove(get_turf(pick(GLOB.generic_event_spawns))) + L.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static) + L.clear_fullscreen("flash", 30) + if(isliving(L)) + var/mob/living/LI = L + LI.Stun(50) + for(var/obj/effect/clockwork/city_of_cogs_rift/R in GLOB.all_clockwork_objects) + qdel(R) + if(GLOB.ark_of_the_clockwork_justiciar == src) + GLOB.ark_of_the_clockwork_justiciar = null . = ..() /obj/structure/destructible/clockwork/massive/celestial_gateway/deconstruct(disassembled = TRUE) @@ -87,12 +106,13 @@ resistance_flags |= INDESTRUCTIBLE countdown.stop() visible_message("[src] begins to pulse uncontrollably... you might want to run!") - sound_to_playing_players(volume = 50, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_disrupted.ogg', 0)) + sound_to_playing_players(volume = 50, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_disrupted.ogg')) make_glow() glow.icon_state = "clockwork_gateway_disrupted" resistance_flags |= INDESTRUCTIBLE sleep(27) explosion(src, 1, 3, 8, 8) + sound_to_playing_players('sound/effects/explosion_distant.ogg', volume = 50) qdel(src) /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/make_glow() @@ -104,46 +124,11 @@ var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down take_damage(damage, BRUTE, "bomb", 0) -/obj/structure/destructible/clockwork/massive/celestial_gateway/attackby(obj/item/I, mob/living/user, params) //add components directly to the ark - if(!is_servant_of_ratvar(user) || !still_needs_components()) - return ..() - if(istype(I, /obj/item/clockwork/component)) - var/obj/item/clockwork/component/C = I - if(required_components[C.component_id]) - required_components[C.component_id]-- - to_chat(user, "You add [C] to [src].") - user.drop_item() - qdel(C) - else - to_chat(user, "[src] has enough [get_component_name(C.component_id)][C.component_id != REPLICANT_ALLOY ? "s":""].") - return 1 - else if(istype(I, /obj/item/clockwork/slab)) - var/obj/item/clockwork/slab/S = I - var/used_components = FALSE - var/used_all = TRUE - for(var/i in S.stored_components) - if(required_components[i]) - var/to_use = min(S.stored_components[i], required_components[i]) - required_components[i] -= to_use - S.stored_components[i] -= to_use - if(to_use) - used_components = TRUE - if(S.stored_components[i]) - used_all = FALSE - if(used_components) - update_slab_info(S) - user.visible_message("[user][used_all ? "":" partially"] empties [S] into [src].", \ - "You offload [used_all ? "all":"some"] of your slab's components into [src].") - return 1 - else - return ..() - -/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/still_needs_components() - for(var/i in required_components) - if(required_components[i]) - return TRUE - /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_text(s_on_time) + if(seconds_until_activation) + return "[seconds_until_activation][s_on_time ? "S" : ""]" + if(grace_period) + return "[grace_period][s_on_time ? "S" : ""]" . = "IMMINENT" if(!obj_integrity) . = "DETONATING" @@ -155,97 +140,87 @@ ..() icon_state = initial(icon_state) if(is_servant_of_ratvar(user) || isobserver(user)) - if(still_needs_components()) - to_chat(user, "Components required until activation:") - for(var/i in required_components) - if(required_components[i]) - to_chat(user, "[get_component_icon(i)] [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: \ - [required_components[i]]") + if(!active) + to_chat(user, "Seconds until the Ark's activation: [get_arrival_text(TRUE)]") + else + if(grace_period) + to_chat(user, "Crew grace period time remaining: [get_arrival_text(TRUE)]") + else + to_chat(user, "Seconds until Ratvar's arrival: [get_arrival_text(TRUE)]") + switch(progress_in_seconds) + if(-INFINITY to GATEWAY_REEBE_FOUND) + to_chat(user, "The Ark is feeding power into the bluespace field.") + if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) + to_chat(user, "The field is ripping open a copy of itself in Ratvar's prison.") + if(GATEWAY_RATVAR_COMING to INFINITY) + to_chat(user, "With the bluespace field established, Ratvar is preparing to come through!") + else + if(!active) + to_chat(user, "Whatever it is, it doesn't seem to be active.") else - to_chat(user, "Seconds until Ratvar's arrival: [get_arrival_text(TRUE)]") switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) - to_chat(user, "It's still opening.") + to_chat(user, "You see a swirling bluespace anomaly steadily growing in intensity.") if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) - to_chat(user, "It's reached the Celestial Derelict and is drawing power from it.") + to_chat(user, "The anomaly is stable, and you can see flashes of something from it.") if(GATEWAY_RATVAR_COMING to INFINITY) - to_chat(user, "Ratvar is coming through the gateway!") - else - switch(progress_in_seconds) - if(-INFINITY to GATEWAY_REEBE_FOUND) - to_chat(user, "It's a swirling mass of blackness.") - if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) - to_chat(user, "It seems to be leading somewhere.") - if(GATEWAY_RATVAR_COMING to INFINITY) - to_chat(user, "Something is coming through!") + to_chat(user, "The anomaly is stable! Something is coming through!") /obj/structure/destructible/clockwork/massive/celestial_gateway/process() + if(seconds_until_activation == -1) //we never do anything + return + adjust_clockwork_power(2.5) //Provides weak power generation on its own + if(seconds_until_activation) + if(!countdown) + countdown = new(src) + countdown.start() + seconds_until_activation-- + if(!GLOB.script_scripture_unlocked && initial_activation_delay * 0.5 > seconds_until_activation) + GLOB.script_scripture_unlocked = TRUE + hierophant_message("The Ark is halfway prepared. Script scripture is now available!") + if(!seconds_until_activation) + cry_havoc() + seconds_until_activation = -1 //we'll set this after cry_havoc() + return if(!first_sound_played || prob(7)) - for(var/M in GLOB.player_list) + for(var/mob/M in GLOB.player_list) if(M && !isnewplayer(M)) - to_chat(M, "You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...") + if(M.z == z) + to_chat(M, "You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...") + else + to_chat(M, "You hear otherworldly sounds from all around you...") if(!obj_integrity) - return 0 - var/convert_dist = 1 + (round(Floor(progress_in_seconds, 15) * 0.067)) - for(var/t in RANGE_TURFS(convert_dist, loc)) - var/turf/T = t - if(!T) - continue - if(get_dist(T, src) < 2) - if(iswallturf(T)) - var/turf/closed/wall/W = T - W.dismantle_wall() - else if(t && (isclosedturf(T) || !is_blocked_turf(T))) - T.ChangeTurf(/turf/open/floor/clockwork) - var/dist = cheap_hypotenuse(T.x, T.y, x, y) - if(dist < convert_dist) - T.ratvar_act(FALSE, TRUE, 3) + return + for(var/turf/closed/wall/W in RANGE_TURFS(2, src)) + W.dismantle_wall() for(var/obj/O in orange(1, src)) if(!O.pulledby && !istype(O, /obj/effect) && O.density) if(!step_away(O, src, 2) || get_dist(O, src) < 2) O.take_damage(50, BURN, "bomb") O.update_icon() - if(still_needs_components()) - if(!first_sound_played) - priority_announce("Massive energy anomaly detected on short-range scanners. Attempting to triangulate location...", "Anomaly Alert") - sound_to_playing_players(volume = 10, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', 1)) - first_sound_played = TRUE - make_glow() - glow.icon_state = "clockwork_gateway_components" - var/used_components = FALSE - for(var/i in required_components) - if(required_components[i]) - var/to_use = min(GLOB.clockwork_component_cache[i], required_components[i]) - required_components[i] -= to_use - GLOB.clockwork_component_cache[i] -= to_use - if(to_use) - used_components = TRUE - if(used_components) - update_slab_info() - if(still_needs_components()) - return + if(grace_period) + grace_period-- + return progress_in_seconds += GATEWAY_SUMMON_RATE switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) if(!second_sound_played) - new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow) - sound_to_playing_players(volume = 30, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', 1)) + for(var/V in GLOB.generic_event_spawns) + addtimer(CALLBACK(src, .proc/open_portal, get_turf(V)), rand(100, 600)) + sound_to_playing_players('sound/magic/clockwork/invoke_general.ogg', 30, FALSE) + sound_to_playing_players(volume = 30, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', TRUE)) second_sound_played = TRUE make_glow() glow.icon_state = "clockwork_gateway_charging" if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) if(!third_sound_played) - var/area/gate_area = get_area(src) - priority_announce("Location of massive energy anomaly has been triangulated. Location: [gate_area.map_name].", "Anomaly Alert") - new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow) - sound_to_playing_players(volume = 35, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_active.ogg', 1)) + sound_to_playing_players(volume = 35, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_active.ogg', TRUE)) third_sound_played = TRUE make_glow() glow.icon_state = "clockwork_gateway_active" if(GATEWAY_RATVAR_COMING to GATEWAY_RATVAR_ARRIVAL) if(!fourth_sound_played) - new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow) - sound_to_playing_players(volume = 40, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_closing.ogg', 1)) + sound_to_playing_players(volume = 40, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_closing.ogg', TRUE)) fourth_sound_played = TRUE make_glow() glow.icon_state = "clockwork_gateway_closing" @@ -255,38 +230,25 @@ resistance_flags |= INDESTRUCTIBLE purpose_fulfilled = TRUE make_glow() - animate(glow, transform = matrix() * 3, time = 125) - sound_to_playing_players('sound/effects/ratvar_rises.ogg', channel = CHANNEL_JUSTICAR_ARK) //End the sounds + animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125) + sound_to_playing_players(volume = 100, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/ratvar_rises.ogg')) //End the sounds sleep(125) - var/turf/startpoint = get_turf(src) make_glow() - glow.transform = matrix() * 4.5 - animate(glow, transform = matrix() * 0.1, time = 10) - QDEL_IN(src, 10) + animate(glow, transform = matrix() * 3, alpha = 0, time = 5) + var/turf/startpoint = get_turf(src) + QDEL_IN(src, 3) + sleep(3) GLOB.clockwork_gateway_activated = TRUE - new/obj/structure/destructible/clockwork/massive/ratvar(startpoint) - send_to_playing_players("\"[text2ratvar("See Engine's mercy")]!\"\n\ - \"[text2ratvar("Observe Engine's design skills")]!\"\n\"[text2ratvar("Behold Engine's light")]!!\"\n\ - \"[text2ratvar("Gaze upon Engine's power")].\"") - sound_to_playing_players('sound/effects/empulse.ogg') - var/x0 = startpoint.x - var/y0 = startpoint.y - for(var/I in spiral_range_turfs(255, startpoint)) - var/turf/T = I - if(!T) - continue - var/dist = cheap_hypotenuse(T.x, T.y, x0, y0) - if(dist < 100) - dist = TRUE - else - dist = FALSE - T.ratvar_act(dist, TRUE) - CHECK_TICK + var/obj/structure/destructible/clockwork/massive/ratvar/R = new(startpoint) + var/turf/T = locate(round(world.maxx * 0.5, 1), round(world.maxy * 0.5, 1), ZLEVEL_STATION_PRIMARY) //approximate center of the station + R.forceMove(T) + + //the actual appearance of the Ark of the Clockwork Justicar; an object so the edges of the gate can be clicked through. /obj/effect/clockwork/overlay/gateway_glow icon = 'icons/effects/96x96.dmi' - icon_state = "clockwork_gateway_charging" + icon_state = "clockwork_gateway_components" pixel_x = -32 pixel_y = -32 layer = BELOW_OPEN_DOOR_LAYER diff --git a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm index de6b058b783..51d42611d20 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm @@ -42,7 +42,7 @@ return affected /obj/structure/destructible/clockwork/powered/clockwork_obelisk/attack_hand(mob/living/user) - if(!is_servant_of_ratvar(user) || total_accessable_power() < hierophant_cost || !anchored) + if(!is_servant_of_ratvar(user) || !can_access_clockwork_power(src, hierophant_cost) || !anchored) to_chat(user, "You place your hand on [src], but it doesn't react.") return var/choice = alert(user,"You place your hand on [src]...",,"Hierophant Broadcast","Spatial Gateway","Cancel") @@ -87,7 +87,7 @@ active = TRUE clockwork_say(user, text2ratvar("Spatial Gateway, activate!")) return - return_power(gateway_cost) //if we didn't return above, ie, successfully create a gateway, we give the power back + adjust_clockwork_power(gateway_cost) //if we didn't return above, ie, successfully create a gateway, we give the power back /obj/structure/destructible/clockwork/powered/clockwork_obelisk/process() if(!anchored) diff --git a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm deleted file mode 100644 index 029fd552e20..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm +++ /dev/null @@ -1,174 +0,0 @@ -//Used by the Geis scripture to hold its target in place -/obj/structure/destructible/clockwork/geis_binding - name = "glowing ring" - desc = "A flickering, glowing purple ring around a target." - clockwork_desc = "A binding ring around a target, preventing them from taking action." - max_integrity = 20 - light_range = 2 - light_power = 0.8 - light_color = "#AF0AAF" - anchored = FALSE - density = FALSE - immune_to_servant_attacks = TRUE - icon = 'icons/effects/clockwork_effects.dmi' - icon_state = "geisbinding_full" - break_message = null - break_sound = 'sound/magic/repulse.ogg' - debris = list() - can_buckle = TRUE - buckle_lying = 0 - var/mob_layer = MOB_LAYER - var/last_mob_health = 0 - var/apply_time = 0 - -/obj/structure/destructible/clockwork/geis_binding/Initialize(mapload, obj/item/clockwork/slab/the_slab) - . = ..() - START_PROCESSING(SSprocessing, src) - -/obj/structure/destructible/clockwork/geis_binding/Destroy() - STOP_PROCESSING(SSprocessing, src) - return ..() - -/obj/structure/destructible/clockwork/geis_binding/examine(mob/user) - icon_state = "geisbinding_full" - ..() - icon_state = "geisbinding" - -/obj/structure/destructible/clockwork/geis_binding/process() - var/tick_damage = 1 - if(locate(/obj/effect/clockwork/sigil/submission) in loc) - tick_damage *= 0.5 - if(LAZYLEN(buckled_mobs)) - for(var/V in buckled_mobs) - var/mob/living/L = V - if(is_servant_of_ratvar(L)) //servants are freed automatically - take_damage(obj_integrity) - return - if(last_mob_health > L.health) - tick_damage += last_mob_health - L.health - last_mob_health = L.health - if(L.layer != mob_layer) - mob_layer = L.layer - layer = mob_layer - 0.01 - cut_overlays() - add_overlay(mutable_appearance('icons/effects/clockwork_effects.dmi', "geisbinding_top", mob_layer + 0.01)) - break - take_damage(tick_damage, sound_effect = FALSE) - playsound(src, 'sound/effects/empulse.ogg', tick_damage * 40, TRUE, -4) - -/obj/structure/destructible/clockwork/geis_binding/attack_hand(mob/living/user) - return - -/obj/structure/destructible/clockwork/geis_binding/attackby(obj/item/I, mob/user, params) - if(is_servant_of_ratvar(user) && istype(I, /obj/item/clockwork/slab)) - user.visible_message("[user] starts to dispel [src]...", "You start to dispel [src]...") - if(do_after(user, 30, target = src)) - user.visible_message("[user] dispels [src]!", "You dispel [src]!") - take_damage(obj_integrity) - return 1 - return ..() - -/obj/structure/destructible/clockwork/geis_binding/emp_act(severity) - new /obj/effect/temp_visual/emp(loc) - qdel(src) - -/obj/structure/destructible/clockwork/geis_binding/post_buckle_mob(mob/living/M) - ..() - if(M.buckled == src) - desc = "A flickering, glowing purple ring around [M]." - clockwork_desc = "A binding ring around [M], preventing [M.p_them()] from taking action." - icon_state = "geisbinding" - mob_layer = M.layer - layer = mob_layer - 0.01 - add_overlay(mutable_appearance('icons/effects/clockwork_effects.dmi', "geisbinding_top", mob_layer + 0.01)) - last_mob_health = M.health - apply_time = world.time - for(var/obj/item/I in M.held_items) - M.dropItemToGround(I) - for(var/i in M.get_empty_held_indexes()) - var/obj/item/geis_binding/B = new(M) - M.put_in_hands(B, i) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(!C.handcuffed) - C.handcuffed = new /obj/item/restraints/handcuffs/energy/clock(C) - M.regenerate_icons() - M.visible_message("A [name] appears around [M]!", "A [name] appears around you!") - repair_and_interrupt() - else - var/obj/effect/temp_visual/ratvar/geis_binding/G = new /obj/effect/temp_visual/ratvar/geis_binding(M.loc) - var/obj/effect/temp_visual/ratvar/geis_binding/T = new /obj/effect/temp_visual/ratvar/geis_binding/top(M.loc) - G.layer = mob_layer - 0.01 - T.layer = mob_layer + 0.01 - G.alpha = alpha - T.alpha = alpha - animate(G, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT) - animate(T, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT) - M.visible_message("[src] snaps into glowing pieces and dissipates!") - M.AdjustStun(-130 + (apply_time - world.time), 1, 1) //remove exactly as much stun as was applied - if(iscarbon(M)) - var/mob/living/carbon/C = M - C.silent = max(C.silent - 7, 0) - for(var/obj/item/geis_binding/GB in M.held_items) - M.dropItemToGround(GB, TRUE) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(istype(C.handcuffed, /obj/item/restraints/handcuffs/energy/clock)) - QDEL_NULL(C.handcuffed) - C.update_handcuffed() - -/obj/structure/destructible/clockwork/geis_binding/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - playsound(src, 'sound/effects/empulse.ogg', 50, 1) - -/obj/structure/destructible/clockwork/geis_binding/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) - . = ..() - if(.) - update_icon() - -/obj/structure/destructible/clockwork/geis_binding/update_icon() - alpha = min(255 * ((obj_integrity/max_integrity) + 0.2) , 255) - -/obj/structure/destructible/clockwork/geis_binding/proc/repair_and_interrupt() - obj_integrity = max_integrity - update_icon() - for(var/m in buckled_mobs) - var/mob/living/L = m - if(L) - L.Stun(130, 1, 1) //basically here to act as a mute for borgs - if(iscarbon(L)) - var/mob/living/carbon/C = L - C.silent += 7 - visible_message("[src] flares brightly!") - var/obj/effect/temp_visual/ratvar/geis_binding/G1 = new /obj/effect/temp_visual/ratvar/geis_binding(loc) - var/obj/effect/temp_visual/ratvar/geis_binding/G2 = new /obj/effect/temp_visual/ratvar/geis_binding(loc) - var/obj/effect/temp_visual/ratvar/geis_binding/T1 = new /obj/effect/temp_visual/ratvar/geis_binding/top(loc) - var/obj/effect/temp_visual/ratvar/geis_binding/T2 = new /obj/effect/temp_visual/ratvar/geis_binding/top(loc) - G1.layer = mob_layer - 0.01 - G2.layer = mob_layer - 0.01 - T1.layer = mob_layer + 0.01 - T2.layer = mob_layer + 0.01 - animate(G1, pixel_y = pixel_y + 9, alpha = 0, time = 8, easing = EASE_IN) - animate(G2, pixel_y = pixel_y - 9, alpha = 0, time = 8, easing = EASE_IN) - animate(T1, pixel_y = pixel_y + 9, alpha = 0, time = 8, easing = EASE_IN) - animate(T2, pixel_y = pixel_y - 9, alpha = 0, time = 8, easing = EASE_IN) - -/obj/structure/destructible/clockwork/geis_binding/user_unbuckle_mob(mob/living/buckled_mob, mob/user) - if(buckled_mob != user) - return ..() - -/obj/item/geis_binding - name = "glowing ring" - desc = "A flickering ring preventing you from holding items." - icon = 'icons/effects/clockwork_effects.dmi' - icon_state = "geisbinding_full" - flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1 - -/obj/item/geis_binding/pre_attackby(atom/target, mob/living/user, params) - return FALSE - -/obj/item/restraints/handcuffs/energy/clock - name = "glowing rings" - desc = "Flickering rings preventing you from holding items." - icon = 'icons/effects/clockwork_effects.dmi' - icon_state = "geisbinding_full" - flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1 diff --git a/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm b/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm new file mode 100644 index 00000000000..5e43749ac56 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm @@ -0,0 +1,109 @@ +//Used to "declare war" against the station. The servants' equipment will be permanently supercharged, and the Ark given extra time to prepare. +//This will send an announcement to the station, meaning that they will be warned very early in advance about the impending attack. +/obj/structure/destructible/clockwork/heralds_beacon + name = "herald's beacon" + desc = "An imposing spire formed of brass, with a thrumming gemstone at its peak." + clockwork_desc = "A massively-powerful beacon. If enough servants decide to activate it, it will send an incredibly large energy pulse to the Ark, \ + permanently empowering many clockwork objects and reducing all power costs by 50%, but alerting the crew to your presence. It doesn't have enough \ + energy to sustain itself for long, and if not activated within five minutes, it will permanently shut down." + icon_state = "interdiction_lens" + break_message = "The beacon crackles with power before collapsing into pieces!" + max_integrity = 250 + light_color = "#EF078E" + var/time_remaining = 300 //Amount of seconds left to vote on whether or not to activate the beacon + var/list/voters //People who have voted to activate the beacon + var/votes_needed = 0 //How many votes are needed to activate the beacon + var/available = FALSE //If the beacon can be used + +/obj/structure/destructible/clockwork/heralds_beacon/Initialize() + . = ..() + voters = list() + START_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/heralds_beacon/Destroy() + STOP_PROCESSING(SSprocessing, src) + . = ..() + +/obj/structure/destructible/clockwork/heralds_beacon/process() + if(!available) + if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) + available = TRUE + else + return + if(!SSticker.mode.servants_of_ratvar.len) + return + if(!votes_needed) + var/servants = SSticker.mode.servants_of_ratvar.len + if(servants) + votes_needed = round(servants * 0.66) + time_remaining-- + if(!time_remaining) + hierophant_message("[src] has lost its power, and can no longer be activated.") + for(var/mob/M in GLOB.player_list) + if(isobserver(M) || is_servant_of_ratvar(M)) + M.playsound_local(M, 'sound/magic/blind.ogg', 50, FALSE) + available = FALSE + icon_state = "interdiction_lens_unwrenched" + STOP_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/heralds_beacon/examine(mob/user) + ..() + if(isobserver(user) || is_servant_of_ratvar(user)) + if(!available) + if(!GLOB.ratvar_approaches) + to_chat(user, "It can no longer be activated.") + else + to_chat(user, "It has been activated!") + else + to_chat(user, "There are [time_remaining] second[time_remaining != 1 ? "s" : ""] remaining to vote.") + to_chat(user, "There are [voters.len]/[votes_needed] votes to activate the beacon!") + +/obj/structure/destructible/clockwork/heralds_beacon/attack_hand(mob/living/user) + if(!is_servant_of_ratvar(user)) + to_chat(user, "You can tell how powerful [src] is; you know better than to touch it.") + return + if(!available) + to_chat(user, "You can no longer vote with [src].") + return + var/voting = !(user.key in voters) + if(alert(user, "[voting ? "Cast a" : "Undo your"] vote to activate the beacon?", "Herald's Beacon", "Change Vote", "Cancel") == "Cancel") + return + if(!user.canUseTopic(src) || !is_servant_of_ratvar(user) || !available) + return + if(voting) + if(user.key in voters) + return + voters += user.key + else + if(!user.key in voters) + return + voters -= user.key + var/votes_left = votes_needed - voters.len + message_admins("[ADMIN_LOOKUPFLW(user)] has [voting ? "voted" : "undone their vote"] to activate [src]! [ADMIN_JMP(user)]") + hierophant_message("[user.real_name] has [voting ? "voted" : "undone their vote"] to activate [src]! The beacon needs [votes_left] more votes to activate.") + for(var/mob/M in GLOB.player_list) + if(isobserver(M) || is_servant_of_ratvar(M)) + M.playsound_local(M, 'sound/magic/clockwork/fellowship_armory.ogg', 50, FALSE) + if(!votes_left) + herald_the_justiciar() + +/obj/structure/destructible/clockwork/heralds_beacon/proc/herald_the_justiciar() + priority_announce("A powerful group of fanatical zealots following the cause of Ratvar have brazenly sacrificed stealth for power, and dare anyone \ + to try and stop them.", title = "The Justiciar Comes", sound = 'sound/magic/clockwork/ark_activation.ogg') + GLOB.ratvar_approaches = TRUE + available = FALSE + STOP_PROCESSING(SSprocessing, src) + icon_state = "interdiction_lens_active" + hierophant_message("The beacon's activation has given your team great power! Many of your objects are permanently empowered!") + for(var/mob/living/simple_animal/hostile/clockwork/C in GLOB.all_clockwork_mobs) + if(C.stat == DEAD) + continue + C.update_values() + to_chat(C, C.empower_string) + for(var/mob/living/carbon/human/H in GLOB.living_mob_list) + if(is_servant_of_ratvar(H)) + to_chat(H, "The beacon's power warps your body into a clockwork form! You are now immune to many hazards, and your body is more robust against damage!") + H.set_species(/datum/species/golem/clockwork/no_scrap) + SSshuttle.registerHostileEnvironment(GLOB.ark_of_the_clockwork_justiciar) //no leaving when we need to purge you, heretics + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar + G.grace_period = FALSE //no grace period if we've declared war diff --git a/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm b/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm index 23a50fdd4ce..b95d9cc0db4 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm @@ -32,7 +32,7 @@ /obj/structure/destructible/clockwork/powered/mania_motor/attack_hand(mob/living/user) if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) - if(!total_accessable_power() >= mania_cost) + if(!can_access_clockwork_power(src, mania_cost)) to_chat(user, "[src] needs more power to function!") return 0 toggle(0, user) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm index 7953a7dafd8..cdff486eeaf 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm @@ -11,7 +11,7 @@ break_message = "The warden's eye gives a glare of utter hate before falling dark!" debris = list(/obj/item/clockwork/component/belligerent_eye/blind_eye = 1) resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF - var/damage_per_tick = 2.7 + var/damage_per_tick = 2.5 var/sight_range = 3 var/atom/movable/target var/list/idle_messages = list(" sulkily glares around.", " lazily drifts from side to side.", " looks around for something to burn.", " slowly turns in circles.") @@ -68,14 +68,14 @@ else R.reveal(10) if(prob(50)) - L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot1.ogg',50,1) + L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot1.ogg',75 * get_efficiency_mod(),1) else - L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot2.ogg',50,1) + L.playsound_local(null,'sound/machines/clockcult/ocularwarden-dot2.ogg',75 * get_efficiency_mod(),1) L.adjustFireLoss((!iscultist(L) ? damage_per_tick : damage_per_tick * 2) * get_efficiency_mod()) //Nar-Sian cultists take additional damage if(GLOB.ratvar_awakens && L) L.adjust_fire_stacks(damage_per_tick) L.IgniteMob() - else if(istype(target, /obj/mecha)) + else if(ismecha(target)) var/obj/mecha/M = target M.take_damage(damage_per_tick * get_efficiency_mod(), BURN, "melee", 1, get_dir(src, M)) @@ -89,10 +89,10 @@ visible_message("[src] swivels to face [target]!") if(isliving(target)) var/mob/living/L = target - to_chat(L, "\"I SEE YOU!\"\n[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!") - else if(istype(target, /obj/mecha)) + to_chat(L, "\"I SEE YOU!\"\n[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!") + else if(ismecha(target)) var/obj/mecha/M = target - to_chat(M.occupant, "\"I SEE YOU!\"" ) + to_chat(M.occupant, "\"I SEE YOU!\"" ) else if(prob(0.5)) //Extremely low chance because of how fast the subsystem it uses processes if(prob(50)) visible_message("[src][pick(idle_messages)]") @@ -112,7 +112,7 @@ continue if(is_servant_of_ratvar(L) || (L.disabilities & BLIND) || L.null_rod_check()) continue - if(L.stat || L.restrained() || L.buckled || L.lying || istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding)) + if(L.stat || L.restrained() || L.buckled || L.lying) continue if(ishostile(L)) var/mob/living/simple_animal/hostile/H = L @@ -134,3 +134,15 @@ target = null visible_message("[src] settles and seems almost disappointed.") return 1 + +/obj/structure/destructible/clockwork/ocular_warden/get_efficiency_mod() + if(GLOB.ratvar_awakens) + return 2 + . = 1 + if(target) + for(var/turf/T in getline(src, target)) + for(var/obj/structure/O in T) + if(O.density) + . -= 0.15 + . -= (get_dist(src, target) * 0.05) + . = max(., 0.1) //The lowest damage a warden can do is 10% of its normal amount (0.25 by default) diff --git a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm deleted file mode 100644 index 155413a6126..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm +++ /dev/null @@ -1,135 +0,0 @@ -//Prolonging Prism: A prism that consumes power to delay the shuttle -/obj/structure/destructible/clockwork/powered/prolonging_prism - name = "prolonging prism" - desc = "A dark onyx prism, held in midair by spiraling tendrils of stone." - clockwork_desc = "A powerful prism that will delay the arrival of an emergency shuttle." - icon_state = "prolonging_prism_inactive" - active_icon = "prolonging_prism" - inactive_icon = "prolonging_prism_inactive" - unanchored_icon = "prolonging_prism_unwrenched" - construction_value = 20 - max_integrity = 125 - break_message = "The prism falls to the ground with a heavy thud!" - debris = list(/obj/item/clockwork/alloy_shards/small = 3, \ - /obj/item/clockwork/alloy_shards/medium = 1, \ - /obj/item/clockwork/alloy_shards/large = 1, \ - /obj/item/clockwork/component/vanguard_cogwheel/onyx_prism = 1) - var/static/list/component_refund = list(VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 1) - var/static/delay_cost = 3000 - var/static/delay_cost_increase = 1250 - var/static/delay_remaining = 0 - -/obj/structure/destructible/clockwork/powered/prolonging_prism/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) - to_chat(user, "An emergency shuttle has arrived and this prism is no longer useful; attempt to activate it to gain a partial refund of components used.") - else - var/efficiency = get_efficiency_mod(TRUE) - to_chat(user, "It requires at least [DisplayPower(get_delay_cost())] of power to attempt to delay the arrival of an emergency shuttle by [2 * efficiency] minutes.") - to_chat(user, "This cost increases by [DisplayPower(delay_cost_increase)] for every previous activation.") - -/obj/structure/destructible/clockwork/powered/prolonging_prism/forced_disable(bad_effects) - if(active) - if(bad_effects) - try_use_power(MIN_CLOCKCULT_POWER*4) - visible_message("[src] emits an airy chuckling sound and falls dark!") - toggle() - return TRUE - -/obj/structure/destructible/clockwork/powered/prolonging_prism/attack_hand(mob/living/user) - if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) - if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) - to_chat(user, "You break [src] apart, refunding some of the components used.") - for(var/i in component_refund) - generate_cache_component(i, src) - take_damage(max_integrity) - return 0 - if(active) - return 0 - var/turf/T = get_turf(src) - if(!T || !(T.z in GLOB.station_z_levels)) - to_chat(user, "[src] must be on the station to function!") - return 0 - if(SSshuttle.emergency.mode != SHUTTLE_CALL) - to_chat(user, "No emergency shuttles are attempting to arrive at the station!") - return 0 - if(!try_use_power(get_delay_cost())) - to_chat(user, "[src] needs more power to function!") - return 0 - delay_cost += delay_cost_increase - delay_remaining += PRISM_DELAY_DURATION - toggle(0, user) - -/obj/structure/destructible/clockwork/powered/prolonging_prism/process() - var/turf/own_turf = get_turf(src) - if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || !(own_turf.z in GLOB.station_z_levels)) - forced_disable(FALSE) - return - . = ..() - var/delay_amount = 40 - delay_remaining -= delay_amount - var/efficiency = get_efficiency_mod() - SSshuttle.emergency.setTimer(SSshuttle.emergency.timeLeft(1) + (delay_amount * efficiency)) - var/highest_y - var/highest_x - var/lowest_y - var/lowest_x - var/list/prism_turfs = list() - for(var/t in SSshuttle.emergency.ripple_area(SSshuttle.getDock("emergency_home"))) - prism_turfs[t] = TRUE - var/turf/T = t - if(!highest_y || T.y > highest_y) - highest_y = T.y - if(!highest_x || T.x > highest_x) - highest_x = T.x - if(!lowest_y || T.y < lowest_y) - lowest_y = T.y - if(!lowest_x || T.x < lowest_x) - lowest_x = T.x - var/mean_y = Lerp(lowest_y, highest_y) - var/mean_x = Lerp(lowest_x, highest_x) - if(prob(50)) - mean_y = Ceiling(mean_y) - else - mean_y = Floor(mean_y) - if(prob(50)) - mean_x = Ceiling(mean_x) - else - mean_x = Floor(mean_x) - var/turf/semi_random_center_turf = locate(mean_x, mean_y, ZLEVEL_STATION_PRIMARY) - for(var/t in getline(src, semi_random_center_turf)) - prism_turfs[t] = TRUE - var/placement_style = prob(50) - for(var/t in prism_turfs) - var/turf/T = t - if(placement_style) - if(IsOdd(T.x + T.y)) - seven_random_hexes(T, efficiency) - else if(prob(50 * efficiency)) - new /obj/effect/temp_visual/ratvar/prolonging_prism(T) - else - if(IsEven(T.x + T.y)) - seven_random_hexes(T, efficiency) - else if(prob(50 * efficiency)) - new /obj/effect/temp_visual/ratvar/prolonging_prism(T) - CHECK_TICK //we may be going over a hell of a lot of turfs - -/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/get_delay_cost() - return Floor(delay_cost, MIN_CLOCKCULT_POWER) - -/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/seven_random_hexes(turf/T, efficiency) - var/static/list/hex_states = list("prismhex1", "prismhex2", "prismhex3", "prismhex4", "prismhex5", "prismhex6", "prismhex7") - var/mutable_appearance/hex_combo - for(var/n in hex_states) //BUILD ME A HEXAGON - if(prob(50 * efficiency)) - if(!hex_combo) - hex_combo = mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER) - else - hex_combo.add_overlay(mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER)) - if(hex_combo) //YOU BUILT A HEXAGON - hex_combo.pixel_x = -16 - hex_combo.pixel_y = -16 - hex_combo.mouse_opacity = MOUSE_OPACITY_TRANSPARENT - hex_combo.plane = GAME_PLANE - new /obj/effect/temp_visual/ratvar/prolonging_prism(T, hex_combo) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm index c604e106f36..4850b904c83 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -1,8 +1,8 @@ -//Ratvar himself. Impossible to damage by most standard means, He will dominate the station and all upon it. +//Ratvar himself. Impossible to damage by most standard means, and converts nearby objects and players into clockwork variants and Servants. /obj/structure/destructible/clockwork/massive/ratvar name = "Ratvar, the Clockwork Justiciar" - desc = "What is what is what are what real what is all a lie all a lie it's all a lie why how can what is" - clockwork_desc = "Ratvar, the Clockwork Justiciar, your master eternal." + desc = "..." + clockwork_desc = "Ratvar, free at last!" icon = 'icons/effects/512x512.dmi' icon_state = "ratvar" pixel_x = -235 @@ -13,7 +13,7 @@ light_range = 15 light_color = "#BE8700" var/atom/prey //Whatever Ratvar is chasing - var/clashing = FALSE //If Ratvar is FUCKING FIGHTING WITH NAR-SIE + var/clashing = FALSE //If Ratvar is fighting with Nar-Sie var/convert_range = 10 dangerous_possession = TRUE @@ -22,20 +22,21 @@ GLOB.ratvar_awakens++ for(var/obj/O in GLOB.all_clockwork_objects) O.ratvar_act() + for(var/mob/living/simple_animal/hostile/clockwork/M in GLOB.all_clockwork_mobs) + M.ratvar_act() START_PROCESSING(SSobj, src) - INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0, null, FALSE, 0) - send_to_playing_players("\"[text2ratvar("ONCE AGAIN MY LIGHT SHALL SHINE ACROSS THIS PATHETIC REALM")]!!\"") + send_to_playing_players("[text2ratvar("ONCE AGAIN MY LIGHT SHINES AMONG THESE PATHETIC STARS")]") sound_to_playing_players('sound/effects/ratvar_reveal.ogg') var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert") var/area/A = get_area(src) notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [A.name] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay) + INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 10, null, FALSE, 0) /obj/structure/destructible/clockwork/massive/ratvar/Destroy() GLOB.ratvar_awakens-- for(var/obj/O in GLOB.all_clockwork_objects) O.ratvar_act() STOP_PROCESSING(SSobj, src) - send_to_playing_players("\"NO! I will not... be... banished... again...\"") return ..() /obj/structure/destructible/clockwork/massive/ratvar/attack_ghost(mob/dead/observer/O) @@ -100,12 +101,12 @@ return clashing = TRUE GLOB.cult_narsie.clashing = TRUE - to_chat(world, "\"[pick("BLOOD GOD!!!", "NAR-SIE!!!", "AT LAST, YOUR TIME HAS COME!")]\"") - to_chat(world, "\"Ratvar?! How?!\"") - clash_of_the_titans(GLOB.cult_narsie) //IT'S TIME FOR THE BATTLE OF THE AGES + to_chat(world, "\"YOU.\"") + to_chat(world, "\"Ratvar?!\"") + clash_of_the_titans(GLOB.cult_narsie) // >:( return TRUE -//Put me in Reebe, will you? Ratvar has found and is going to fucking murder Nar-Sie +//Put me in Reebe, will you? Ratvar has found and is going to do a hecking murder on Nar-Sie /obj/structure/destructible/clockwork/massive/ratvar/proc/clash_of_the_titans(obj/singularity/narsie/narsie) var/winner = "Undeclared" var/base_victory_chance = 1 @@ -136,7 +137,7 @@ base_victory_chance *= 2 //The clash has a higher chance of resolving each time both gods attack one another switch(winner) if("Ratvar") - send_to_playing_players("\"[pick("DIE! DIE! DIE!", "FILTH!!!", "SUFFER!!!", text2ratvar("ROT FOR CENTURIES AS I HAVE!!"))]\"\n\ + send_to_playing_players("\"[pick("DIE.", "ROT.")]\"\n\ \"[pick("Nooooo...", "Not die. To y-", "Die. Ratv-", "Sas tyen re-")]\"") //nar-sie get out sound_to_playing_players('sound/magic/clockwork/anima_fragment_attack.ogg') sound_to_playing_players('sound/magic/demon_dies.ogg', 50) diff --git a/code/game/gamemodes/clock_cult/clock_structures/stargazer.dm b/code/game/gamemodes/clock_cult/clock_structures/stargazer.dm new file mode 100644 index 00000000000..bb8051356e4 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_structures/stargazer.dm @@ -0,0 +1,66 @@ +#define STARGAZER_RANGE 3 //How many tiles the stargazer can see out to +#define STARGAZER_POWER 20 //How many watts will be produced per second when the stargazer sees starlight + +//Stargazer: A very fragile but cheap generator that creates power from starlight. +/obj/structure/destructible/clockwork/stargazer + name = "stargazer" + desc = "A large lantern-shaped machine made of thin brass. It looks fragile." + clockwork_desc = "A lantern-shaped generator that produces power when near starlight." + icon_state = "stargazer" + unanchored_icon = "stargazer_unwrenched" + max_integrity = 40 + construction_value = 5 + layer = WALL_OBJ_LAYER + break_message = "The stargazer's fragile body shatters into pieces!" + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF + light_color = "#DAAA18" + var/star_light_star_bright = FALSE //If this stargazer can see starlight + +/obj/structure/destructible/clockwork/stargazer/Initialize() + . = ..() + START_PROCESSING(SSprocessing, src) + +/obj/structure/destructible/clockwork/stargazer/Destroy() + STOP_PROCESSING(SSprocessing, src) + . = ..() + +/obj/structure/destructible/clockwork/stargazer/examine(mob/user) + ..() + if(is_servant_of_ratvar(user)) + to_chat(user, "Generates [DisplayPower(STARGAZER_POWER)] per second while viewing starlight within [STARGAZER_RANGE] tiles.") + if(star_light_star_bright) + to_chat(user, "[is_servant_of_ratvar(user) ? "It can see starlight!" : "It's shining brilliantly!"]") + +/obj/structure/destructible/clockwork/stargazer/process() + star_light_star_bright = check_starlight() + if(star_light_star_bright) + adjust_clockwork_power(STARGAZER_POWER) + +/obj/structure/destructible/clockwork/stargazer/update_anchored(mob/living/user, damage) + . = ..() + star_light_star_bright = check_starlight() + +/obj/structure/destructible/clockwork/stargazer/proc/check_starlight() + var/old_status = star_light_star_bright + var/has_starlight + if(!anchored) + has_starlight = FALSE + else + for(var/turf/T in view(3, src)) + if(isspaceturf(T)) + has_starlight = TRUE + break + if(old_status != has_starlight) + if(has_starlight) + visible_message("[src] hums and shines brilliantly!") + playsound(src, 'sound/machines/clockcult/stargazer_activate.ogg', 50, TRUE) + add_overlay("stargazer_light") + set_light(1.5, 5) + else + if(anchored) //We lost visibility somehow + visible_message("[src] flickers, and falls dark.") + else + visible_message("[src] whooshes quietly as it slides into a less bulky form.") + cut_overlays() + set_light(0) + return has_starlight diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm deleted file mode 100644 index 326aa46c064..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm +++ /dev/null @@ -1,116 +0,0 @@ -//Tinkerer's cache: Stores components for later use. -/obj/structure/destructible/clockwork/cache - name = "tinkerer's cache" - desc = "A large brass spire with a flaming hole in its center." - clockwork_desc = "A brass container capable of storing a large amount of components.\n\ - Shares components with all other caches and will gradually generate components if near a Clockwork Wall." - icon_state = "tinkerers_cache" - unanchored_icon = "tinkerers_cache_unwrenched" - construction_value = 10 - break_message = "The cache's fire winks out before it falls in on itself!" - max_integrity = 80 - light_color = "#C2852F" - var/wall_generation_cooldown - var/turf/closed/wall/clockwork/linkedwall //if we've got a linked wall and are producing - var/static/linked_caches = 0 //how many caches are linked to walls; affects how fast components are produced - -/obj/structure/destructible/clockwork/cache/Initialize() - . = ..() - START_PROCESSING(SSobj, src) - GLOB.clockwork_caches++ - update_slab_info() - set_light(2, 0.7) - -/obj/structure/destructible/clockwork/cache/Destroy() - GLOB.clockwork_caches-- - update_slab_info() - STOP_PROCESSING(SSobj, src) - if(linkedwall) - linked_caches-- - linkedwall.linkedcache = null - linkedwall = null - return ..() - -/obj/structure/destructible/clockwork/cache/process() - if(!anchored) - if(linkedwall) - linked_caches-- - linkedwall.linkedcache = null - linkedwall = null - return - for(var/turf/closed/wall/clockwork/C in range(4, src)) - if(!C.linkedcache && !linkedwall) - linked_caches++ - C.linkedcache = src - linkedwall = C - wall_generation_cooldown = world.time + get_production_time() - visible_message("[src] starts to whirr in the presence of [C]...") - break - if(linkedwall && wall_generation_cooldown <= world.time) - wall_generation_cooldown = world.time + get_production_time() - var/component_id = generate_cache_component(null, src) - playsound(linkedwall, 'sound/magic/clockwork/fellowship_armory.ogg', rand(15, 20), 1, -3, 1, 1) - visible_message("Something cl[pick("ank", "ink", "unk", "ang")]s around inside of [src]...") - -/obj/structure/destructible/clockwork/cache/attackby(obj/item/I, mob/living/user, params) - if(!is_servant_of_ratvar(user)) - return ..() - if(istype(I, /obj/item/clockwork/component)) - var/obj/item/clockwork/component/C = I - if(!anchored) - to_chat(user, "[src] needs to be secured to place [C] into it!") - else - GLOB.clockwork_component_cache[C.component_id]++ - update_slab_info() - to_chat(user, "You add [C] to [src].") - user.drop_item() - qdel(C) - return 1 - else if(istype(I, /obj/item/clockwork/slab)) - var/obj/item/clockwork/slab/S = I - if(!anchored) - to_chat(user, "[src] needs to be secured to offload your slab's components into it!") - else - for(var/i in S.stored_components) - GLOB.clockwork_component_cache[i] += S.stored_components[i] - S.stored_components[i] = 0 - update_slab_info() - user.visible_message("[user] empties [S] into [src].", "You offload your slab's components into [src].") - return 1 - else - return ..() - -/obj/structure/destructible/clockwork/cache/update_anchored(mob/user, do_damage) - ..() - if(anchored) - set_light(2, 0.7) - else - set_light(0) - -/obj/structure/destructible/clockwork/cache/attack_hand(mob/living/user) - ..() - if(is_servant_of_ratvar(user)) - if(linkedwall) - if(wall_generation_cooldown > world.time) - var/temp_time = (wall_generation_cooldown - world.time) * 0.1 - to_chat(user, "[src] will produce a component in [temp_time] second[temp_time == 1 ? "":"s"].") - else - to_chat(user, "[src] is about to produce a component!") - else if(anchored) - to_chat(user, "[src] is unlinked! Construct a Clockwork Wall nearby to generate components!") - else - to_chat(user, "[src] needs to be secured to generate components!") - -/obj/structure/destructible/clockwork/cache/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(linkedwall) - to_chat(user, "It is linked to a Clockwork Wall and will generate a component every [round(get_production_time() * 0.1, 0.1)] seconds!") - else - to_chat(user, "It is unlinked! Construct a Clockwork Wall nearby to generate components!") - to_chat(user, "Stored components:") - for(var/i in GLOB.clockwork_component_cache) - to_chat(user, "[get_component_icon(i)] [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: [GLOB.clockwork_component_cache[i]]") - -/obj/structure/destructible/clockwork/cache/proc/get_production_time() - return (CACHE_PRODUCTION_TIME + (ACTIVE_CACHE_SLOWDOWN * linked_caches)) * get_efficiency_mod(TRUE) diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm deleted file mode 100644 index 4ceb7c3e260..00000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm +++ /dev/null @@ -1,171 +0,0 @@ -//Tinkerer's Daemon: A machine that rapidly produces components at a power cost. -/obj/structure/destructible/clockwork/powered/tinkerers_daemon - name = "tinkerer's daemon" - desc = "A strange machine with three small brass obelisks attached to it." - clockwork_desc = "An efficient machine that can rapidly produce components at a small power cost. It will only function if active daemons are outnumbered by servants at a rate to 5:1." - icon_state = "tinkerers_daemon" - active_icon = "tinkerers_daemon" - inactive_icon = "tinkerers_daemon" - unanchored_icon = "tinkerers_daemon_unwrenched" - max_integrity = 100 - construction_value = 20 - break_message = "The daemon shatters into millions of pieces, leaving only a disc of metal!" - debris = list(/obj/item/clockwork/alloy_shards/medium = 1, \ - /obj/item/clockwork/alloy_shards/small = 6, \ - /obj/item/clockwork/component/replicant_alloy/replication_plate = 1) - var/static/mutable_appearance/daemon_glow = mutable_appearance('icons/obj/clockwork_objects.dmi', "tinkerglow") - var/static/mutable_appearance/component_glow = mutable_appearance('icons/obj/clockwork_objects.dmi', "t_random_component") - var/component_id_to_produce - var/production_time = 0 //last time we produced a component - var/production_cooldown = 70 - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/Destroy() - GLOB.active_daemons -= src - return ..() - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(active) - if(component_id_to_produce) - to_chat(user, "It is currently producing [get_component_name(component_id_to_produce)][component_id_to_produce != REPLICANT_ALLOY ? "s":""].") - else - to_chat(user, "It is currently producing random components.") - to_chat(user, "It will produce a component every [round((production_cooldown*0.1) * get_efficiency_mod(TRUE), 0.1)] seconds and requires at least the following power for each component type:") - for(var/i in GLOB.clockwork_component_cache) - to_chat(user, "[get_component_icon(i)] [get_component_name(i)]: [DisplayPower(get_component_cost(i))] ([GLOB.clockwork_component_cache[i]] exist[GLOB.clockwork_component_cache[i] == 1 ? "s" : ""])") - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/forced_disable(bad_effects) - if(active) - if(bad_effects) - try_use_power(MIN_CLOCKCULT_POWER*4) - visible_message("[src] shuts down with a horrible grinding noise!") - playsound(src, 'sound/magic/clockwork/anima_fragment_attack.ogg', 50, 1) - else - visible_message("[src] shuts down!") - toggle() - return TRUE - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/attack_hand(mob/living/user) - if(!is_servant_of_ratvar(user)) - to_chat(user, "You place your hand on the daemon, but nothing happens.") - return - if(active) - toggle(0, user) - else - if(!anchored) - to_chat(user, "[src] needs to be secured to the floor before it can be activated!") - return FALSE - if(!GLOB.clockwork_caches) - to_chat(user, "\"You require a cache for this daemon to operate. Get to it.\"") - return - var/min_power_usable = 0 - for(var/i in GLOB.clockwork_component_cache) - if(!min_power_usable) - min_power_usable = get_component_cost(i) - else - min_power_usable = min(min_power_usable, get_component_cost(i)) - if(total_accessable_power() < min_power_usable) - to_chat(user, "\"You need more power to activate this daemon, friend.\"") - return - var/servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(servants * 0.2 < 1) - to_chat(user, "\"There are too few servants for daemons to work.\"") - return - var/choice = alert(user,"Activate Daemon...",,"Specific Component","Random Component","Cancel") - switch(choice) - if("Specific Component") - var/list/components = list() - for(var/i in GLOB.clockwork_component_cache) - components["[get_component_name(i)] ([DisplayPower(get_component_cost(i))])"] = i - var/input_component = input(user, "Choose a component type.", name) as null|anything in components - component_id_to_produce = components[input_component] - servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1) - return - if(!component_id_to_produce) - to_chat(user, "You decide not to select a component and activate the daemon.") - return - if(total_accessable_power() < get_component_cost(component_id_to_produce)) - to_chat(user, "There is too little power to produce this type of component!") - return - toggle(0, user) - if("Random Component") - component_id_to_produce = null - servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1) - return - toggle(0, user) - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/toggle(fast_process, mob/living/user) - . = ..() - if(active) - GLOB.active_daemons += src - var/component_color = get_component_color(component_id_to_produce) - daemon_glow.color = component_color - add_overlay(daemon_glow) - component_glow.icon_state = "t_[component_id_to_produce ? component_id_to_produce :"random_component"]" - component_glow.color = component_color - add_overlay(component_glow) - production_time = world.time + production_cooldown //don't immediately produce when turned on after being off - set_light(2, 0.9, get_component_color_bright(component_id_to_produce)) - else - GLOB.active_daemons -= src - cut_overlays() - set_light(0) - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/proc/get_component_cost(id) - return max(MIN_CLOCKCULT_POWER*2, (MIN_CLOCKCULT_POWER*2) * (1 + round(GLOB.clockwork_component_cache[id] * 0.2))) - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/process() - var/servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - while(servants * 0.2 < LAZYLEN(GLOB.active_daemons)) - var/obj/structure/destructible/clockwork/powered/tinkerers_daemon/D = GLOB.active_daemons[1] - if(!istype(D)) - break - if(D.active) - D.forced_disable(FALSE) - if(D == src) - return - . = ..() - var/min_power_usable = 0 - if(!component_id_to_produce) - for(var/i in GLOB.clockwork_component_cache) - if(!min_power_usable) - min_power_usable = get_component_cost(i) - else - min_power_usable = min(min_power_usable, get_component_cost(i)) - else - min_power_usable = get_component_cost(component_id_to_produce) - if(!GLOB.clockwork_caches || . < min_power_usable) //if we don't have enough to produce the lowest or what we chose to produce, cancel out - forced_disable(FALSE) - return - if(production_time <= world.time) - var/component_to_generate = component_id_to_produce - if(!component_to_generate) - component_to_generate = get_weighted_component_id() //more likely to generate components that we have less of - if(!try_use_power(get_component_cost(component_to_generate))) - component_to_generate = null - if(!component_id_to_produce) - for(var/i in GLOB.clockwork_component_cache) - if(try_use_power(get_component_cost(i))) //if we fail but are producing random, try and get a different component to produce - component_to_generate = i - break - if(component_to_generate) - generate_cache_component(component_to_generate, src) - production_time = world.time + (production_cooldown * get_efficiency_mod(TRUE)) //go on cooldown - visible_message("[src] hums as it produces a component.") - else - forced_disable(FALSE) //we shouldn't actually ever get here, as we should cancel out way before this diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 64062325962..01773f1ea66 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -21,6 +21,8 @@ return FALSE if(M.mind.enslaved_to && !iscultist(M.mind.enslaved_to)) return FALSE + if(M.mind.unconvertable) + return FALSE else return FALSE if(M.isloyal() || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M)) @@ -55,10 +57,10 @@ /datum/game_mode/cult/pre_setup() cult_objectives += "sacrifice" - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" //cult scaling goes here diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index 283376b055c..b8cbed50512 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -96,7 +96,7 @@ /proc/pollCultists(var/mob/living/Nominee) //Cult Master Poll if(world.time < CULT_POLL_WAIT) - to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [round((CULT_POLL_WAIT-world.time)/10)] seconds.") + to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].") return GLOB.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try for(var/datum/mind/B in SSticker.mode.cult) @@ -232,7 +232,7 @@ return FALSE if(cooldown > world.time) if(!CM.active) - to_chat(owner, "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!") + to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!") return FALSE return ..() @@ -324,7 +324,7 @@ return FALSE if(cooldown > world.time) if(!PM.active) - to_chat(owner, "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can pulse again!") + to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!") return FALSE return ..() diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 55f8ece5e65..62fe64eceec 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -72,6 +72,170 @@ if(is_servant_of_ratvar(C) && C.reagents) C.reagents.add_reagent("heparin", 1) +/obj/item/twohanded/required/cult_bastard + name = "bloody bastard sword" + desc = "An enormous sword used by Nar-Sien cultists to rapidly harvest the souls of non-believers." + w_class = WEIGHT_CLASS_HUGE + block_chance = 50 + throwforce = 20 + force = 35 + armour_penetration = 45 + throw_speed = 1 + throw_range = 3 + sharpness = IS_SHARP + light_color = "#ff0000" + attack_verb = list("cleaved", "slashed", "torn", "hacked", "ripped", "diced", "carved") + icon_state = "cultbastard" + item_state = "cultbastard" + hitsound = 'sound/weapons/bladeslice.ogg' + lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 + actions_types = list() + flags_2 = SLOWS_WHILE_IN_HAND_2 + var/datum/action/innate/dash/cult/jaunt + var/datum/action/innate/cult/spin2win/linked_action + var/spinning = FALSE + var/spin_cooldown = 250 + var/dash_toggled = TRUE + +/obj/item/twohanded/required/cult_bastard/Initialize() + . = ..() + set_light(4) + jaunt = new(src) + linked_action = new(src) + +/obj/item/twohanded/required/cult_bastard/can_be_pulled(user) + return FALSE + +/obj/item/twohanded/required/cult_bastard/attack_self(mob/user) + dash_toggled = !dash_toggled + if(dash_toggled) + to_chat(loc, "You raise the [src] and prepare to jaunt with it.") + else + to_chat(loc, "You lower the [src] and prepare to swing it normally.") + +/obj/item/twohanded/required/cult_bastard/pickup(mob/living/user) + . = ..() + if(!iscultist(user)) + if(!is_servant_of_ratvar(user)) + to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, "An overwhelming sense of nausea overpowers you!") + user.Dizzy(80) + user.Knockdown(30) + return + else + to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") + to_chat(user, "A horrible force yanks at your arm!") + user.emote("scream") + user.apply_damage(30, BRUTE, pick("l_arm", "r_arm")) + user.Knockdown(50) + return + jaunt.Grant(user, src) + linked_action.Grant(user, src) + user.update_icons() + +/obj/item/twohanded/required/cult_bastard/dropped(mob/user) + . = ..() + linked_action.Remove(user) + jaunt.Remove(user) + user.update_icons() + +/obj/item/twohanded/required/cult_bastard/IsReflect() + if(spinning) + playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1) + return TRUE + else + ..() + +/obj/item/twohanded/required/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(prob(final_block_chance)) + if(attack_type == PROJECTILE_ATTACK) + owner.visible_message("[owner] deflects [attack_text] with [src]!") + playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 100, 1) + return TRUE + else + playsound(src, 'sound/weapons/parry.ogg', 75, 1) + owner.visible_message("[owner] parries [attack_text] with [src]!") + return TRUE + return FALSE + +/obj/item/twohanded/required/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters) + . = ..() + if(dash_toggled) + jaunt.Teleport(user, target) + return + if(!proximity) + return + if(ishuman(target)) + var/mob/living/carbon/human/H = target + if(H.stat != CONSCIOUS) + var/obj/item/device/soulstone/SS = new /obj/item/device/soulstone(src) + SS.attack(H, user) + if(!LAZYLEN(SS.contents)) + qdel(SS) + if(istype(target, /obj/structure/constructshell) && contents.len) + var/obj/item/device/soulstone/SS = contents[1] + if(istype(SS)) + SS.transfer_soul("CONSTRUCT",target,user) + qdel(SS) + +/datum/action/innate/dash/cult + name = "Rend the Veil" + desc = "Use the sword to shear open the flimsy fabric of this reality and teleport to your target." + icon_icon = 'icons/mob/actions/actions_cult.dmi' + button_icon_state = "phaseshift" + dash_sound = 'sound/magic/enter_blood.ogg' + recharge_sound = 'sound/magic/exit_blood.ogg' + beam_effect = "sendbeam" + phasein = /obj/effect/temp_visual/dir_setting/cult/phase + phaseout = /obj/effect/temp_visual/dir_setting/cult/phase/out + +/datum/action/innate/dash/cult/IsAvailable() + if(iscultist(holder) && current_charges) + return TRUE + else + return FALSE + + + +/datum/action/innate/cult/spin2win + name = "Geometer's Fury" + desc = "You draw on the power of the sword's ancient runes, spinning it wildly around you as you become immune to most attacks." + background_icon_state = "bg_demon" + button_icon_state = "sintouch" + var/cooldown = 0 + var/mob/living/carbon/human/holder + var/obj/item/twohanded/required/cult_bastard/sword + +/datum/action/innate/cult/spin2win/Grant(mob/user, obj/bastard) + . = ..() + sword = bastard + holder = user + +/datum/action/innate/cult/spin2win/IsAvailable() + if(iscultist(holder) && cooldown <= world.time) + return TRUE + else + return FALSE + +/datum/action/innate/cult/spin2win/Activate() + cooldown = world.time + sword.spin_cooldown + holder.changeNext_move(50) + holder.apply_status_effect(/datum/status_effect/sword_spin) + sword.spinning = TRUE + sword.block_chance = 100 + sword.slowdown += 1.5 + addtimer(CALLBACK(src, .proc/stop_spinning), 50) + holder.update_action_buttons_icon() + +/datum/action/innate/cult/spin2win/proc/stop_spinning() + sword.spinning = FALSE + sword.block_chance = 50 + sword.slowdown -= 1.5 + sleep(sword.spin_cooldown) + holder.update_action_buttons_icon() /obj/item/restraints/legcuffs/bola/cult name = "nar'sien bola" diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 0cba943287b..8140dffe53e 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -10,7 +10,7 @@ ..() to_chat(user, "\The [src] is [anchored ? "":"not "]secured to the floor.") if((iscultist(user) || isobserver(user)) && cooldowntime > world.time) - to_chat(user, "The magic in [src] is too weak, [p_they()] will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") /obj/structure/destructible/cult/examine_status(mob/user) if(iscultist(user) || isobserver(user)) @@ -50,13 +50,6 @@ animate(src, color = previouscolor, time = 8) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) -/obj/structure/destructible/cult/proc/getETA() - var/time = (cooldowntime - world.time)/600 - var/eta = "[round(time, 1)] minutes" - if(time <= 1) - time = (cooldowntime - world.time)*0.1 - eta = "[round(time, 1)] seconds" - return eta /obj/structure/destructible/cult/talisman name = "altar" @@ -72,7 +65,7 @@ to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return var/choice = alert(user,"You study the schematics etched into the forge...",,"Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water") var/pickedtype @@ -105,17 +98,23 @@ to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return - var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Nar-Sien Hardsuit") + var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Bastard Sword") var/pickedtype switch(choice) if("Shielded Robe") pickedtype = /obj/item/clothing/suit/hooded/cultrobes/cult_shield if("Flagellant's Robe") pickedtype = /obj/item/clothing/suit/hooded/cultrobes/berserker - if("Nar-Sien Hardsuit") - pickedtype = /obj/item/clothing/suit/space/hardsuit/cult + if("Bastard Sword") + if((world.time - SSticker.round_start_time) >= 12000) + pickedtype = /obj/item/twohanded/required/cult_bastard + else + cooldowntime = 12000 - (world.time - SSticker.round_start_time) + to_chat(user, "The forge fires are not yet hot enough for this weapon, give it another [DisplayTimeText(cooldowntime)].") + cooldowntime = 0 + return if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) cooldowntime = world.time + 2400 var/obj/item/N = new pickedtype(get_turf(src)) @@ -212,7 +211,7 @@ to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Walker Set") var/list/pickedtype = list() diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm index 755fdef87fb..844b027e937 100644 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ b/code/game/gamemodes/devil/devil_game_mode.dm @@ -20,15 +20,16 @@ + Crew: Resist the lure of sin and remain pure!" /datum/game_mode/devil/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" var/num_devils = 1 - if(config.traitor_scaling_coeff) - num_devils = max(minimum_devils, min( round(num_players()/(config.traitor_scaling_coeff*3))+ 2 + num_modifier, round(num_players()/(config.traitor_scaling_coeff*1.5)) + num_modifier )) + var/tsc = CONFIG_GET(number/traitor_scaling_coeff) + if(tsc) + num_devils = max(minimum_devils, min( round(num_players() / (tsc * 3))+ 2 + num_modifier, round(num_players() / (tsc * 1.5)) + num_modifier)) else num_devils = max(minimum_devils, min(num_players(), traitors_possible)) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 82350726d97..9f676936135 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -19,7 +19,6 @@ var/probability = 0 var/false_report_weight = 0 //How often will this show up incorrectly in a centcom report? var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm - var/explosion_in_progress = 0 //sit back and relax var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such var/list/datum/mind/modePlayer = new var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here @@ -79,7 +78,7 @@ ///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things /datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report. if(!report) - report = config.intercept + report = !CONFIG_GET(flag/no_intercept_report) addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) if(SSdbcore.Connect()) @@ -114,14 +113,15 @@ for(var/mob/Player in GLOB.mob_list) if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client) living_crew += Player - if(living_crew.len / GLOB.joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh - message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew") + var/malc = CONFIG_GET(number/midround_antag_life_check) + if(living_crew.len / GLOB.joined_player_list.len <= malc) //If a lot of the player base died, we start fresh + message_admins("Convert_roundtype failed due to too many dead people. Limit is [malc * 100]% living crew") return null var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len) var/list/datum/game_mode/usable_modes = list() for(var/datum/game_mode/G in runnable_modes) - if(G.reroll_friendly && living_crew >= G.required_players) + if(G.reroll_friendly && living_crew.len >= G.required_players) usable_modes += G else qdel(G) @@ -139,8 +139,9 @@ if(SSshuttle.emergency.timeLeft(1) < initial(SSshuttle.emergencyCallTime)*0.5) return 1 - if(world.time >= (config.midround_antag_time_check * 600)) - message_admins("Convert_roundtype failed due to round length. Limit is [config.midround_antag_time_check] minutes.") + var/matc = CONFIG_GET(number/midround_antag_time_check) + if(world.time >= (matc * 600)) + message_admins("Convert_roundtype failed due to round length. Limit is [matc] minutes.") return null var/list/antag_candidates = list() @@ -155,12 +156,12 @@ antag_candidates = shuffle(antag_candidates) - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) replacementmode.restricted_jobs += replacementmode.protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) replacementmode.restricted_jobs += "Assistant" - message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") + message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") . = 1 sleep(rand(600,1800)) @@ -169,7 +170,7 @@ round_converted = 0 return //somewhere between 1 and 3 minutes from now - if(!config.midround_antag[SSticker.mode.config_tag]) + if(!CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag]) round_converted = 0 return 1 for(var/mob/living/carbon/human/H in antag_candidates) @@ -190,7 +191,9 @@ return TRUE if(station_was_nuked) return TRUE - if(!round_converted && (!config.continuous[config_tag] || (config.continuous[config_tag] && config.midround_antag[config_tag]))) //Non-continuous or continous with replacement antags + var/list/continuous = CONFIG_GET(keyed_flag_list/continuous) + var/list/midround_antag = CONFIG_GET(keyed_flag_list/midround_antag) + if(!round_converted && (!continuous[config_tag] || (continuous[config_tag] && midround_antag[config_tag]))) //Non-continuous or continous with replacement antags if(!continuous_sanity_checked) //make sure we have antags to be checking in the first place for(var/mob/Player in GLOB.mob_list) if(Player.mind) @@ -199,8 +202,8 @@ return 0 if(!continuous_sanity_checked) message_admins("The roundtype ([config_tag]) has no antagonists, continuous round has been defaulted to on and midround_antag has been defaulted to off.") - config.continuous[config_tag] = 1 - config.midround_antag[config_tag] = 0 + continuous[config_tag] = TRUE + midround_antag[config_tag] = FALSE SSshuttle.clearHostileEnvironment(src) return 0 @@ -214,7 +217,7 @@ living_antag_player = Player return 0 - if(!config.continuous[config_tag] || force_ending) + if(!continuous[config_tag] || force_ending) return 1 else @@ -223,7 +226,7 @@ if(round_ends_with_antag_death) return 1 else - config.midround_antag[config_tag] = 0 + midround_antag[config_tag] = 0 return 0 return 0 @@ -518,7 +521,7 @@ /datum/game_mode/proc/get_remaining_days(client/C) if(!C) return 0 - if(!config.use_age_restriction_for_jobs) + if(!CONFIG_GET(flag/use_age_restriction_for_jobs)) return 0 if(!isnum(C.player_age)) return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced @@ -562,3 +565,8 @@ /datum/game_mode/proc/generate_report() //Generates a small text blurb for the gamemode in centcom report return "Gamemode report for [name] not set. Contact a coder." + +//By default nuke just ends the round +/datum/game_mode/proc/OnNukeExplosion(off_station) + if(off_station < 2) + station_was_nuked = TRUE //Will end the round on next check. \ No newline at end of file diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 80a22c6b3b5..e972eb5bbb6 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -367,17 +367,17 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/sec_left = seconds_remaining() if(!sec_left) timing = FALSE - detonate(T.z) + detonate() else if(world.time >= next_announce) minor_announce("[sec_left] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE) next_announce += DOOMSDAY_ANNOUNCE_INTERVAL -/obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION_PRIMARY) +/obj/machinery/doomsday_device/proc/detonate() sound_to_playing_players('sound/machines/alarm.ogg') sleep(100) for(var/mob/living/L in GLOB.mob_list) var/turf/T = get_turf(L) - if(!T || T.z != z_level) + if(!T || !(T.z in GLOB.station_z_levels)) continue if(issilicon(L)) continue diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 3bb3c8b43ed..54e6b7de400 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -31,15 +31,16 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event var/max_i = 10//number of tries to spawn meteor. while(!isspaceturf(pickedstart)) var/startSide = pick(GLOB.cardinals) - pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION_PRIMARY) - pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION_PRIMARY) + var/startZ = pick(GLOB.station_z_levels) + pickedstart = spaceDebrisStartLoc(startSide, startZ) + pickedgoal = spaceDebrisFinishLoc(startSide, startZ) max_i-- if(max_i<=0) return var/Me = pickweight(meteortypes) var/obj/effect/meteor/M = new Me(pickedstart) M.dest = pickedgoal - M.z_original = ZLEVEL_STATION_PRIMARY + M.z_original = M.z spawn(0) walk_towards(M, M.dest, 1) @@ -119,6 +120,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event /obj/effect/meteor/Destroy() GLOB.meteor_list -= src + SSaugury.unregister_doom(src) walk(src,0) //this cancels the walk_towards() proc . = ..() diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 7ff5a9742de..d6f1b775e96 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -1,5 +1,17 @@ +/datum/objective_team/abductor_team + member_name = "abductor" + var/list/objectives = list() + var/team_number + +/datum/objective_team/abductor_team/is_solo() + return FALSE + +/datum/objective_team/abductor_team/proc/add_objective(datum/objective/O) + O.team = src + O.update_explanation_text() + objectives += O + /datum/game_mode - var/abductor_teams = 0 var/list/datum/mind/abductors = list() var/list/datum/mind/abductees = list() @@ -12,12 +24,8 @@ required_players = 15 maximum_players = 50 var/max_teams = 4 - abductor_teams = 1 - var/list/datum/mind/scientists = list() - var/list/datum/mind/agents = list() - var/list/datum/objective/team_objectives = list() - var/list/team_names = list() - var/finished = 0 + var/list/datum/objective_team/abductor_team/abductor_teams = list() + var/finished = FALSE /datum/game_mode/abduction/announce() to_chat(world, "The current game mode is - Abduction!") @@ -26,163 +34,78 @@ to_chat(world, "Crew - don't get abducted and stop the abductors.") /datum/game_mode/abduction/pre_setup() - abductor_teams = max(1, min(max_teams,round(num_players()/config.abductor_scaling_coeff))) - var/possible_teams = max(1,round(antag_candidates.len / 2)) - abductor_teams = min(abductor_teams,possible_teams) + var/num_teams = max(1, min(max_teams, round(num_players() / CONFIG_GET(number/abductor_scaling_coeff)))) + var/possible_teams = max(1, round(antag_candidates.len / 2)) + num_teams = min(num_teams, possible_teams) - abductors.len = 2*abductor_teams - scientists.len = abductor_teams - agents.len = abductor_teams - team_objectives.len = abductor_teams - team_names.len = abductor_teams + for(var/i = 1 to num_teams) + if(!make_abductor_team()) + return FALSE + return TRUE - for(var/i=1,i<=abductor_teams,i++) - if(!make_abductor_team(i)) - return 0 +/datum/game_mode/abduction/proc/make_abductor_team(datum/mind/agent, datum/mind/scientist) + var/team_number = abductor_teams.len+1 - return 1 + var/datum/objective_team/abductor_team/team = new + team.team_number = team_number + team.name = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names + team.add_objective(new/datum/objective/experiment) -/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null) - //Team Name - team_names[team_number] = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names - //Team Objective - var/datum/objective/experiment/team_objective = new - team_objective.team_number = team_number - team_objectives[team_number] = team_objective - //Team Members + if(antag_candidates.len < (!agent + !scientist)) + return - if(!preset_agent || !preset_scientist) - if(antag_candidates.len <=2) - return 0 - - var/datum/mind/scientist - var/datum/mind/agent - - if(!preset_scientist) + if(!scientist) scientist = pick(antag_candidates) - antag_candidates -= scientist - else - scientist = preset_scientist + antag_candidates -= scientist + team.members |= scientist + scientist.assigned_role = "Abductor Scientist" + log_game("[scientist.key] (ckey) has been selected as [team.name] abductor scientist.") - if(!preset_agent) + if(!agent) agent = pick(antag_candidates) - antag_candidates -= agent - else - agent = preset_agent + antag_candidates -= agent + team.members |= agent + agent.assigned_role = "Abductor Agent" + log_game("[agent.key] (ckey) has been selected as [team.name] abductor agent.") - - scientist.assigned_role = "abductor scientist" - scientist.special_role = "abductor scientist" - log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.") - - agent.assigned_role = "abductor agent" - agent.special_role = "abductor agent" - log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.") - - abductors |= agent - abductors |= scientist - scientists[team_number] = scientist - agents[team_number] = agent - return 1 + abductor_teams += team + return team /datum/game_mode/abduction/post_setup() - for(var/team_number=1,team_number<=abductor_teams,team_number++) - post_setup_team(team_number) + for(var/datum/objective_team/abductor_team/team in abductor_teams) + post_setup_team(team) return ..() //Used for create antag buttons -/datum/game_mode/abduction/proc/post_setup_team(team_number) - var/list/obj/effect/landmark/abductor/agent_landmarks = list() - var/list/obj/effect/landmark/abductor/scientist_landmarks = list() - agent_landmarks.len = max_teams - scientist_landmarks.len = max_teams - for(var/obj/effect/landmark/abductor/A in GLOB.landmarks_list) - if(istype(A, /obj/effect/landmark/abductor/agent)) - agent_landmarks[text2num(A.team)] = A - else if(istype(A, /obj/effect/landmark/abductor/scientist)) - scientist_landmarks[text2num(A.team)] = A - - var/team_name = team_names[team_number] - - var/datum/mind/agent - var/obj/effect/landmark/L - var/datum/mind/scientist - var/mob/living/carbon/human/H - var/datum/species/abductor/S - - agent = agents[team_number] - H = agent.current - L = agent_landmarks[team_number] - H.forceMove(L.loc) - H.set_species(/datum/species/abductor) - S = H.dna.species - S.team = team_number - H.real_name = team_name + " Agent" - H.equipOutfit(/datum/outfit/abductor/agent) - greet_agent(agent,team_number) - - - scientist = scientists[team_number] - H = scientist.current - L = scientist_landmarks[team_number] - H.forceMove(L.loc) - H.set_species(/datum/species/abductor) - S = H.dna.species - S.scientist = TRUE - S.team = team_number - H.real_name = team_name + " Scientist" - H.equipOutfit(/datum/outfit/abductor/scientist) - greet_scientist(scientist,team_number) - - - -/datum/game_mode/abduction/proc/greet_agent(datum/mind/abductor,team_number) - abductor.objectives += team_objectives[team_number] - var/team_name = team_names[team_number] - - to_chat(abductor.current, "You are an agent of [team_name]!") - to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") - to_chat(abductor.current, "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve.") - - abductor.announce_objectives() - -/datum/game_mode/abduction/proc/greet_scientist(datum/mind/abductor,team_number) - abductor.objectives += team_objectives[team_number] - var/team_name = team_names[team_number] - - to_chat(abductor.current, "You are a scientist of [team_name]!") - to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") - to_chat(abductor.current, "Use your tool and ship consoles to support the agent and retrieve human specimens.") - - abductor.announce_objectives() - -/datum/game_mode/abduction/proc/get_team_console(team_number) - for(var/obj/machinery/abductor/console/C in GLOB.machines) - if(C.team == team_number) - return C +/datum/game_mode/abduction/proc/post_setup_team(datum/objective_team/abductor_team/team) + for(var/datum/mind/M in team.members) + if(M.assigned_role == "Abductor Scientist") + M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_SCIENTIST, team) + else + M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_AGENT, team) /datum/game_mode/abduction/check_finished() if(!finished) - for(var/team_number=1,team_number<=abductor_teams,team_number++) - var/obj/machinery/abductor/console/con = get_team_console(team_number) - var/datum/objective/objective = team_objectives[team_number] - if (con.experiment.points >= objective.target_amount) - SSshuttle.emergency.request(null, set_coefficient = 0.5) - finished = 1 - return ..() + for(var/datum/objective_team/abductor_team/team in abductor_teams) + for(var/datum/objective/O in team.objectives) + if(O.check_completion()) + SSshuttle.emergency.request(null, set_coefficient = 0.5) + finished = TRUE + return ..() return ..() /datum/game_mode/abduction/declare_completion() - for(var/team_number=1,team_number<=abductor_teams,team_number++) - var/obj/machinery/abductor/console/console = get_team_console(team_number) - var/datum/objective/objective = team_objectives[team_number] - var/team_name = team_names[team_number] - if(console.experiment.points >= objective.target_amount) - to_chat(world, "[team_name] team fulfilled its mission!") + for(var/datum/objective_team/abductor_team/team in abductor_teams) + var/won = TRUE + for(var/datum/objective/O in team.objectives) + if(!O.check_completion()) + won = FALSE + if(won) + to_chat(world, "[team.name] team fulfilled its mission!") else - to_chat(world, "[team_name] team failed its mission.") + to_chat(world, "[team.name] team failed its mission.") ..() - return 1 + return TRUE /datum/game_mode/proc/auto_declare_completion_abduction() var/text = "" @@ -200,40 +123,28 @@ text += "
" to_chat(world, text) -//Landmarks -// TODO: Split into separate landmarks for prettier ships +// LANDMARKS /obj/effect/landmark/abductor - var/team = 1 + var/team_number = 1 /obj/effect/landmark/abductor/agent /obj/effect/landmark/abductor/scientist - // OBJECTIVES /datum/objective/experiment target_amount = 6 - var/team_number /datum/objective/experiment/New() explanation_text = "Experiment on [target_amount] humans." /datum/objective/experiment/check_completion() - var/ab_team = team_number - if(owner) - if(!owner.current || !ishuman(owner.current)) - return 0 - var/mob/living/carbon/human/H = owner.current - if(H.dna.species.id != "abductor") - return 0 - var/datum/species/abductor/S = H.dna.species - ab_team = S.team for(var/obj/machinery/abductor/experiment/E in GLOB.machines) - if(E.team == ab_team) - if(E.points >= target_amount) - return 1 - else - return 0 - return 0 + if(!istype(team, /datum/objective_team/abductor_team)) + return FALSE + var/datum/objective_team/abductor_team/T = team + if(E.team_number == T.team_number) + return E.points >= target_amount + return FALSE /datum/game_mode/proc/update_abductor_icons_added(datum/mind/alien_mind) var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_ABDUCTOR] diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index c55b4db4075..36168a58d22 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -328,7 +328,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} return /obj/item/paper/guides/antag/abductor/AltClick() - return + return //otherwise it would fold into a paperplane. #define BATON_STUN 0 #define BATON_SLEEP 1 @@ -532,7 +532,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} flags_2 = BANG_PROTECT_2 /obj/item/device/radio/headset/abductor/Initialize(mapload) - ..() + . = ..() make_syndie() /obj/item/device/radio/headset/abductor/attackby(obj/item/W, mob/user, params) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm index aa97d1e2d86..b24bef04333 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm @@ -5,20 +5,14 @@ back = /obj/item/storage/backpack ears = /obj/item/device/radio/headset/abductor -/datum/outfit/abductor/proc/get_team_console(team_number) - for(var/obj/machinery/abductor/console/C in GLOB.machines) - if(C.team == team_number) - return C - /datum/outfit/abductor/proc/link_to_console(mob/living/carbon/human/H, team_number) - if(!team_number && isabductor(H)) - var/datum/species/abductor/S = H.dna.species - team_number = S.team - + var/datum/antagonist/abductor/A = H.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR) + if(!team_number && A) + team_number = A.team.team_number if(!team_number) team_number = 1 - var/obj/machinery/abductor/console/console = get_team_console(team_number) + var/obj/machinery/abductor/console/console = get_abductor_console(team_number) if(console) var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H if(V) diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index a3d69c45b94..20bd7c9df27 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -218,7 +218,7 @@ /obj/structure/spider/cocoon/abductor/proc/Copy(mob/living/carbon/human/H) var/mob/living/carbon/human/interactive/greytide/clone = new(src) - clone.hardset_dna(H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species.type, H.dna.features) + clone.hardset_dna(H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species, H.dna.features) /obj/structure/spider/cocoon/abductor/proc/Start() hatch_time = world.time + 600 diff --git a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm index 97893d6d2ee..fd9ca0a6584 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/camera_advanced/abductor name = "Human Observation Console" - var/team = 0 + var/team_number = 0 networks = list("SS13","Abductor") var/datum/action/innate/teleport_in/tele_in_action = new var/datum/action/innate/teleport_out/tele_out_action = new @@ -9,7 +9,7 @@ var/datum/action/innate/vest_disguise_swap/vest_disguise_action = new var/datum/action/innate/set_droppoint/set_droppoint_action = new var/obj/machinery/abductor/console/console - z_lock = ZLEVEL_STATION_PRIMARY + station_lock_override = TRUE icon = 'icons/obj/abductor.dmi' icon_state = "camera" diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index f3deebc6b74..d44ff57c964 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -1,8 +1,13 @@ +/proc/get_abductor_console(team_number) + for(var/obj/machinery/abductor/console/C in GLOB.machines) + if(C.team_number == team_number) + return C + //Common /obj/machinery/abductor resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - var/team = 0 + var/team_number = 0 //Console @@ -139,21 +144,21 @@ return INITIALIZE_HINT_LATELOAD /obj/machinery/abductor/console/LateInitialize() - if(!team) + if(!team_number) return for(var/obj/machinery/abductor/pad/p in GLOB.machines) - if(p.team == team) + if(p.team_number == team_number) pad = p break for(var/obj/machinery/abductor/experiment/e in GLOB.machines) - if(e.team == team) + if(e.team_number == team_number) experiment = e e.console = src for(var/obj/machinery/computer/camera_advanced/abductor/c in GLOB.machines) - if(c.team == team) + if(c.team_number == team_number) camera = c c.console = src diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 88bb84fc4a8..2b012e5f811 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -60,9 +60,8 @@ /obj/machinery/abductor/gland_dispenser/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/organ/heart/gland)) - if(!user.drop_item()) + if(!user.transferItemToLoc(W, src)) return - W.loc = src for(var/i=1,i<=gland_colors.len,i++) if(gland_types[i] == W.type) amounts[i]++ diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 182b7e27560..99059e7a251 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -13,7 +13,7 @@ var/flash = " - || - " var/obj/machinery/abductor/console/console var/message_cooldown = 0 - var/breakout_time = 0.75 + var/breakout_time = 450 /obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user) if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) @@ -50,9 +50,9 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ "You hear a metallic creaking from [src].") - if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return user.visible_message("[user] successfully broke out of [src]!", \ @@ -62,7 +62,7 @@ /obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H) var/icon/photo = null var/g = (H.gender == FEMALE) ? "f" : "m" - if(!config.mutant_races || H.dna.species.use_skintones) + if(!CONFIG_GET(flag/join_with_mutant_race) || H.dna.species.use_skintones) photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]") else photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]") diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 8979fb8c784..c125f7648d5 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -468,11 +468,8 @@ return var/turf/open/floor/F - switch(z) //Only the station/lavaland - if(ZLEVEL_STATION_PRIMARY) - F =find_safe_turf(zlevels = ZLEVEL_STATION_PRIMARY, extended_safety_checks = TRUE) - if(ZLEVEL_LAVALAND) - F = find_safe_turf(zlevels = ZLEVEL_LAVALAND, extended_safety_checks = TRUE) + F = find_safe_turf(zlevels = z, extended_safety_checks = TRUE) + if(!F) return // If we're getting rid of a human, slap some energy cuffs on @@ -502,7 +499,7 @@ var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc) M.amount = 5 for(var/obj/item/I in target.component_parts) - I.loc = M.loc + I.forceMove(M.drop_location()) var/obj/effect/temp_visual/swarmer/disintegration/N = new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target)) N.pixel_x = target.pixel_x N.pixel_y = target.pixel_y @@ -511,7 +508,7 @@ if(istype(target, /obj/machinery/computer)) var/obj/machinery/computer/C = target if(C.circuit) - C.circuit.loc = M.loc + C.circuit.forceMove(M.drop_location()) qdel(target) diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index f763f742f7f..5e1a97675b9 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -77,7 +77,7 @@ /mob/living/simple_animal/hostile/morph/proc/eat(atom/movable/A) if(A && A.loc != src) visible_message("[src] swallows [A] whole!") - A.loc = src + A.forceMove(src) return 1 return 0 @@ -153,7 +153,7 @@ /mob/living/simple_animal/hostile/morph/proc/barf_contents() for(var/atom/movable/AM in src) - AM.loc = loc + AM.forceMove(loc) if(prob(90)) step(AM, pick(GLOB.alldirs)) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm index 783cfdd9307..fb0bdfb6f93 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm @@ -34,17 +34,13 @@ var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/revenantspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("revenantspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs.len) //If we can't find any revenant spawns, try the carp spawns - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("carpspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs.len) //If we can't find either, just spawn the revenant at the player's location spawn_locs += get_turf(selected) if(!spawn_locs.len) //If we can't find THAT, then just give up and cry diff --git a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm index bcb2218fe69..4d85744738a 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm @@ -23,17 +23,15 @@ player_mind.active = 1 var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("carpspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs) message_admins("No valid spawn locations found, aborting...") return MAP_ERROR - var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs))) + var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs))) var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder) S.holder = holder player_mind.transfer_to(S) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index d48628ddd14..2179177fc1e 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -22,27 +22,17 @@ var/nukes_left = 1 // Call 3714-PRAY right now and order more nukes! Limited offer! var/nuke_off_station = 0 //Used for tracking if the syndies actually haul the nuke to the station var/syndies_didnt_escape = 0 //Used for tracking if the syndies got the shuttle off of the z-level + var/list/pre_nukeops = list() /datum/game_mode/nuclear/pre_setup() - var/n_players = num_players() - var/n_agents = min(round(n_players / 10, 1), agents_possible) - - if(antag_candidates.len < n_agents) //In the case of having less candidates than the selected number of agents - n_agents = antag_candidates.len - - while(n_agents > 0) - var/datum/mind/new_syndicate = pick(antag_candidates) - syndicates += new_syndicate - antag_candidates -= new_syndicate //So it doesn't pick the same guy each time. - n_agents-- - - for(var/datum/mind/synd_mind in syndicates) - synd_mind.assigned_role = "Syndicate" - synd_mind.special_role = "Syndicate"//So they actually have a special role/N - log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative") - - return 1 - + var/n_agents = min(round(num_players() / 10), antag_candidates.len, agents_possible) + for(var/i = 0, i < n_agents, ++i) + var/datum/mind/new_op = pick_n_take(antag_candidates) + pre_nukeops += new_op + new_op.assigned_role = "Nuclear Operative" + new_op.special_role = "Nuclear Operative" + log_game("[new_op.key] (ckey) has been selected as a nuclear operative") + return TRUE //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -60,48 +50,36 @@ //////////////////////////////////////////////////////////////////////////////////////// /datum/game_mode/nuclear/post_setup() - - var/list/turf/synd_spawn = list() - - for(var/obj/effect/landmark/A in GLOB.landmarks_list) - if(A.name == "Syndicate-Spawn") - synd_spawn += get_turf(A) - continue - var/nuke_code = random_nukecode() - var/leader_selected = 0 var/agent_number = 1 - var/spawnpos = 1 + var/datum/mind/leader = pick(pre_nukeops) + syndicates += pre_nukeops + for(var/i = 1 to pre_nukeops.len) + var/datum/mind/op = pre_nukeops[i] - for(var/datum/mind/synd_mind in syndicates) - if(spawnpos > synd_spawn.len) - spawnpos = 2 - synd_mind.current.loc = synd_spawn[spawnpos] - - forge_syndicate_objectives(synd_mind) - greet_syndicate(synd_mind) - equip_syndicate(synd_mind.current) + forge_syndicate_objectives(op) + greet_syndicate(op) + equip_syndicate(op.current) if(nuke_code) - synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) - to_chat(synd_mind.current, "The nuclear authorization code is: [nuke_code]") + op.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) + to_chat(op.current, "The nuclear authorization code is: [nuke_code]") - if(!leader_selected) - prepare_syndicate_leader(synd_mind, nuke_code) - leader_selected = 1 + if(op == leader) + op.current.forceMove(pick(GLOB.nukeop_leader_start)) + prepare_syndicate_leader(op, nuke_code) else - synd_mind.current.real_name = "[syndicate_name()] Operative #[agent_number]" - agent_number++ - spawnpos++ - update_synd_icons_added(synd_mind) - synd_mind.current.playsound_local(get_turf(synd_mind.current), 'sound/ambience/antag/ops.ogg',100,0) - var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list + op.current.forceMove(GLOB.nukeop_start[((i - 1) % GLOB.nukeop_start.len) + 1]) + op.current.real_name = "[syndicate_name()] Operative #[agent_number++]" + update_synd_icons_added(op) + op.current.playsound_local(get_turf(op.current), 'sound/ambience/antag/ops.ogg',100,0) + + var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list if(nuke) nuke.r_code = nuke_code return ..() - /datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, nuke_code) var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord") spawn(1) @@ -132,7 +110,7 @@ P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" var/mob/living/carbon/human/H = synd_mind.current - P.loc = H.loc + P.forceMove(H.drop_location()) H.put_in_hands_or_del(P) H.update_icons() else @@ -161,6 +139,12 @@ synd_mob.equipOutfit(/datum/outfit/syndicate/no_crystals) return 1 +/datum/game_mode/nuclear/OnNukeExplosion(off_station) + ..() + nukes_left-- + var/obj/docking_port/mobile/Shuttle = SSshuttle.getShuttle("syndicate") + syndies_didnt_escape = (Shuttle && (Shuttle.z == ZLEVEL_CENTCOM || Shuttle.z == ZLEVEL_TRANSIT)) ? 0 : 1 + nuke_off_station = off_station /datum/game_mode/nuclear/check_win() if (nukes_left == 0) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 7b2a20a2976..6e7a5673248 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -19,7 +19,7 @@ return 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-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide", "Declare war?", "Yes", "No") + 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 [DisplayTimeText(world.time-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)] to decide", "Declare war?", "Yes", "No") declaring_war = FALSE if(!check_allowed(user)) @@ -58,7 +58,7 @@ U.hidden_uplink.owner = "[user.key]" U.hidden_uplink.telecrystals = CHALLENGE_TELECRYSTALS U.hidden_uplink.set_gamemode(/datum/game_mode/nuclear) - config.shuttle_refuel_delay = max(config.shuttle_refuel_delay, CHALLENGE_SHUTTLE_DELAY) + CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY)) SSblackbox.set_val("nuclear_challenge_mode",1) qdel(src) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 7642801a6a6..8870399f248 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -81,6 +81,20 @@ /obj/machinery/nuclearbomb/syndicate //ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb +/obj/machinery/nuclearbomb/syndicate/get_cinematic_type(off_station) + var/datum/game_mode/nuclear/NM = SSticker.mode + switch(off_station) + if(0) + if(istype(NM) && NM.syndies_didnt_escape) + return CINEMATIC_ANNIHILATION + else + return CINEMATIC_NUKE_WIN + if(1) + return CINEMATIC_NUKE_MISS + if(2) + return CINEMATIC_NUKE_FAR + return CINEMATIC_NUKE_FAR + /obj/machinery/nuclearbomb/syndicate/Initialize() . = ..() var/obj/machinery/nuclearbomb/existing = locate("syndienuke") in GLOB.nuke_list @@ -422,12 +436,12 @@ update_icon() sound_to_playing_players('sound/machines/alarm.ogg') if(SSticker && SSticker.mode) - SSticker.mode.explosion_in_progress = 1 + SSticker.roundend_check_paused = TRUE sleep(100) if(!core) - SSticker.station_explosion_cinematic(3,"no_core",src) - SSticker.mode.explosion_in_progress = 0 + Cinematic(CINEMATIC_NUKE_NO_CORE,world) + SSticker.roundend_check_paused = FALSE return GLOB.enter_allowed = 0 @@ -437,28 +451,37 @@ var/area/A = get_area(bomb_location) if(bomb_location && (bomb_location.z in GLOB.station_z_levels)) if(istype(A, /area/space)) - off_station = NUKE_MISS_STATION + off_station = NUKE_NEAR_MISS if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE))) - off_station = NUKE_MISS_STATION + off_station = NUKE_NEAR_MISS else if((istype(A, /area/syndicate_mothership) || (istype(A, /area/shuttle/syndicate)) && bomb_location.z == ZLEVEL_CENTCOM)) off_station = NUKE_SYNDICATE_BASE else - off_station = NUKE_NEAR_MISS + off_station = NUKE_MISS_STATION - if(istype(SSticker.mode, /datum/game_mode/nuclear)) - var/obj/docking_port/mobile/Shuttle = SSshuttle.getShuttle("syndicate") - var/datum/game_mode/nuclear/NM = SSticker.mode - NM.syndies_didnt_escape = (Shuttle && (Shuttle.z == ZLEVEL_CENTCOM || Shuttle.z == ZLEVEL_TRANSIT)) ? 0 : 1 - NM.nuke_off_station = off_station + if(off_station < 2) + SSshuttle.registerHostileEnvironment(src) + SSshuttle.lockdown = TRUE - SSticker.station_explosion_cinematic(off_station,null,src) - if(SSticker.mode) - if(istype(SSticker.mode, /datum/game_mode/nuclear)) - var/datum/game_mode/nuclear/NM = SSticker.mode - NM.nukes_left -- - if(!SSticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is - SSticker.Reboot("Station destroyed by Nuclear Device.", "nuke - unhandled ending") + //Cinematic + SSticker.mode.OnNukeExplosion(off_station) + var/bombz = z + Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,/datum/controller/subsystem/ticker/proc/station_explosion_detonation,src)) + INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel,bombz) + SSticker.roundend_check_paused = FALSE +/obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station) + if(off_station < 2) + return CINEMATIC_SELFDESTRUCT + else + return CINEMATIC_SELFDESTRUCT_MISS + +/proc/KillEveryoneOnZLevel(z) + if(!z) + return + for(var/mob/M in GLOB.mob_list) + if(M.stat != DEAD && M.z == z) + M.gib() /* This is here to make the tiles around the station mininuke change when it's armed. diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b65cea8bfc1..13161e9cc6c 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -17,14 +17,6 @@ if(owner) . += owner -/datum/objective/proc/considered_alive(var/datum/mind/M) - if(M && M.current) - var/mob/living/carbon/human/H - if(ishuman(M.current)) - H = M.current - return M.current.stat != DEAD && !issilicon(M.current) && !isbrain(M.current) && (!H || H.dna.species.id != "memezombies") - return FALSE - /datum/objective/proc/considered_escaped(datum/mind/M) if(!considered_alive(M)) return FALSE @@ -37,9 +29,6 @@ return FALSE return location.onCentCom() || location.onSyndieBase() -/datum/objective/proc/considered_afk(datum/mind/M) - return !M || !M.current || !M.current.client || M.current.client.is_afk() - /datum/objective/proc/check_completion() return completed @@ -121,7 +110,7 @@ return target /datum/objective/assassinate/check_completion() - return !target || !considered_alive(target) + return !considered_alive(target) || considered_afk(target) /datum/objective/assassinate/update_explanation_text() ..() @@ -348,6 +337,15 @@ return FALSE return TRUE +/datum/objective/survive/exist //Like survive, but works for silicons and zombies and such. + +/datum/objective/survive/exist/check_completion() + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!considered_alive(M, FALSE)) + return FALSE + return TRUE + /datum/objective/martyr explanation_text = "Die a glorious death." @@ -501,24 +499,31 @@ GLOBAL_LIST_EMPTY(possible_items_special) explanation_text = "Download [target_amount] research level\s." return target_amount -/datum/objective/download/check_completion()//NINJACODE. - var/current_amount = 0 +/datum/objective/download/check_completion() + var/list/current_tech = list() var/list/datum/mind/owners = get_owners() - for(var/datum/mind/M in owners) - if(!ishuman(owner.current)) - continue - var/mob/living/carbon/human/H = owner.current - if(!H || H.stat == DEAD || !istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja)) - continue - var/obj/item/clothing/suit/space/space_ninja/SN = H.wear_suit - if(!SN.s_initialized) - continue - for(var/datum/tech/current_data in SN.stored_research) - if(current_data.level) - current_amount += (current_data.level-1) - return current_amount >= target_amount - - + for(var/datum/mind/owner in owners) + if(ismob(owner.current)) + var/mob/M = owner.current //Yeah if you get morphed and you eat a quantum tech disk with the RD's latest backup good on you soldier. + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H && (H.stat != DEAD) && istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja)) + var/obj/item/clothing/suit/space/space_ninja/S = H.wear_suit + for(var/datum/tech/T in S.stored_research) + current_tech[T.id] = T.level? T.level : 0 + var/list/otherwise = M.GetAllContents() + for(var/obj/item/disk/tech_disk/TD in otherwise) + for(var/datum/tech/T in TD.tech_stored) + if(!T.id || !T.level) + continue + else if(!current_tech[T.id]) + current_tech[T.id] = T.level + else if(T.level > current_tech[T.id]) + current_tech[T.id] = T.level + var/total = 0 + for(var/i in current_tech) + total += current_tech[i] + return total >= target_amount /datum/objective/capture diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 43c1b335f4a..c1b6d13456c 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -44,10 +44,10 @@ /////////////////////////////////////////////////////////////////////////////// /datum/game_mode/revolution/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" for (var/i=1 to max_headrevs) @@ -154,8 +154,7 @@ var/obj/item/device/assembly/flash/T = new(mob) - var/obj/item/toy/crayon/spraycan/R = new(mob) - var/obj/item/clothing/glasses/hud/security/chameleon/C = new(mob) + var/obj/item/organ/cyberimp/eyes/hud/security/syndicate/S = new(mob) var/list/slots = list ( "backpack" = slot_in_backpack, @@ -163,13 +162,8 @@ "right pocket" = slot_r_store ) var/where = mob.equip_in_one_of_slots(T, slots) - var/where2 = mob.equip_in_one_of_slots(C, slots) - mob.equip_in_one_of_slots(R,slots) - - if (!where2) - to_chat(mob, "The Syndicate were unfortunately unable to get you a chameleon security HUD.") - else - to_chat(mob, "The chameleon security HUD in your [where2] will help you keep track of who is mindshield-implanted, and unable to be recruited.") + S.Insert(mob, special = FALSE, drop_if_replaced = FALSE) + to_chat(mob, "Your eyes have been implanted with a cybernetic security HUD which will help you keep track of who is mindshield-implanted, and therefore unable to be recruited.") if (!where) to_chat(mob, "The Syndicate were unfortunately unable to get you a flash.") @@ -236,7 +230,7 @@ //Checks if the round is over// /////////////////////////////// /datum/game_mode/revolution/check_finished() - if(config.continuous["revolution"]) + if(CONFIG_GET(keyed_flag_list/continuous)["revolution"]) if(finished) SSshuttle.clearHostileEnvironment(src) return ..() @@ -259,12 +253,14 @@ /datum/game_mode/proc/add_revolutionary(datum/mind/rev_mind) if(rev_mind.assigned_role in GLOB.command_positions) - return 0 + return FALSE var/mob/living/carbon/human/H = rev_mind.current//Check to see if the potential rev is implanted if(H.isloyal()) - return 0 + return FALSE if((rev_mind in revolutionaries) || (rev_mind in head_revolutionaries)) - return 0 + return FALSE + if(rev_mind.unconvertable) + return FALSE revolutionaries += rev_mind if(iscarbon(rev_mind.current)) var/mob/living/carbon/carbon_mob = rev_mind.current @@ -277,11 +273,11 @@ update_rev_icons_added(rev_mind) if(jobban_isbanned(rev_mind.current, ROLE_REV)) INVOKE_ASYNC(src, .proc/replace_jobbaned_player, rev_mind.current, ROLE_REV, ROLE_REV) - return 1 + return TRUE ////////////////////////////////////////////////////////////////////////////// //Deals with players being converted from the revolution (Not a rev anymore)// // Modified to handle borged MMIs. Accepts another var if the target is being borged at the time -- Polymorph. ////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/remove_revolutionary(datum/mind/rev_mind , beingborged) +/datum/game_mode/proc/remove_revolutionary(datum/mind/rev_mind , beingborged, deconverter) var/remove_head = 0 if(beingborged && (rev_mind in head_revolutionaries)) head_revolutionaries -= rev_mind @@ -290,17 +286,16 @@ if((rev_mind in revolutionaries) || remove_head) revolutionaries -= rev_mind rev_mind.special_role = null - rev_mind.current.log_message("Has renounced the revolution!", INDIVIDUAL_ATTACK_LOG) + log_attack("[rev_mind.current] (Key: [key_name(rev_mind.current)]) has been deconverted from the revolution by [deconverter] (Key: [key_name(deconverter)])!") if(beingborged) - rev_mind.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.",\ - "The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]") + rev_mind.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", \ + "The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]") message_admins("[ADMIN_LOOKUPFLW(rev_mind.current)] has been borged while being a [remove_head ? "leader" : " member"] of the revolution.") - else + rev_mind.current.visible_message("[rev_mind.current] looks like they just remembered their real allegiance!", \ + "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") rev_mind.current.Unconscious(100) - rev_mind.current.visible_message("[rev_mind.current] looks like they just remembered their real allegiance!",\ - "You have been brainwashed! You are no longer a revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") update_rev_icons_removed(rev_mind) ///////////////////////////////////// @@ -336,7 +331,7 @@ /datum/game_mode/revolution/proc/check_heads_victory() for(var/datum/mind/rev_mind in head_revolutionaries) var/turf/T = get_turf(rev_mind.current) - if((rev_mind) && (rev_mind.current) && (rev_mind.current.stat != DEAD) && T && (T.z in GLOB.station_z_levels)) + if(!considered_afk(rev_mind) && considered_alive(rev_mind) && (T.z in GLOB.station_z_levels)) if(ishuman(rev_mind.current)) return 0 return 1 diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 177e051ff99..15cd346b2de 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -112,8 +112,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Admin: toggle spawning // if("hsbtobj") - if(!admin) - return + if(!admin) return if(GLOB.hsboxspawn) to_chat(world, "Sandbox: \black[usr.key] has disabled object spawning!") GLOB.hsboxspawn = FALSE @@ -126,24 +125,22 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Admin: Toggle auto-close // if("hsbtac") - if(!admin) - return - if(config.sandbox_autoclose) + if(!admin) return + var/sbac = CONFIG_GET(flag/sandbox_autoclose) + if(sbac) to_chat(world, "Sandbox: \black [usr.key] has removed the object spawn limiter.") - config.sandbox_autoclose = FALSE else to_chat(world, "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use.") - config.sandbox_autoclose = TRUE + CONFIG_SET(flag/sandbox_autoclose, !sbac) return // // Spacesuit with full air jetpack set as internals // if("hsbsuit") var/mob/living/carbon/human/P = usr - if(!istype(P)) - return + if(!istype(P)) return if(P.wear_suit) - P.wear_suit.loc = P.loc + P.wear_suit.forceMove(P.drop_location()) P.wear_suit.layer = initial(P.wear_suit.layer) P.wear_suit.plane = initial(P.wear_suit.plane) P.wear_suit = null @@ -152,7 +149,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.wear_suit.plane = ABOVE_HUD_PLANE P.update_inv_wear_suit() if(P.head) - P.head.loc = P.loc + P.head.forceMove(P.drop_location()) P.head.layer = initial(P.head.layer) P.head.plane = initial(P.head.plane) P.head = null @@ -161,7 +158,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.head.plane = ABOVE_HUD_PLANE P.update_inv_head() if(P.wear_mask) - P.wear_mask.loc = P.loc + P.wear_mask.forceMove(P.drop_location()) P.wear_mask.layer = initial(P.wear_mask.layer) P.wear_mask.plane = initial(P.wear_mask.plane) P.wear_mask = null @@ -170,7 +167,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.wear_mask.plane = ABOVE_HUD_PLANE P.update_inv_wear_mask() if(P.back) - P.back.loc = P.loc + P.back.forceMove(P.drop_location()) P.back.layer = initial(P.back.layer) P.back.plane = initial(P.back.plane) P.back = null @@ -219,8 +216,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Spawn check due to grief potential (destroying floors, walls, etc) // if("hsbrcd") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return new/obj/item/construction/rcd/combat(usr.loc) @@ -236,8 +232,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Clothing if("hsbcloth") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return if(!clothinfo) clothinfo = "Clothing (Reagent Containers) (Other Items)
" @@ -251,8 +246,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Reagent containers if("hsbreag") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return if(!reaginfo) reaginfo = "Reagent Containers (Clothing) (Other Items)
" @@ -266,8 +260,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // Other items if("hsbobj") - if(!GLOB.hsboxspawn) - return + if(!GLOB.hsboxspawn) return if(!objinfo) objinfo = "Other Items (Clothing) (Reagent Containers)
" @@ -294,7 +287,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) return new typepath(usr.loc) - if(config.sandbox_autoclose) + if(CONFIG_GET(flag/sandbox_autoclose)) usr << browse(null,"window=sandbox") // // For everything else in the href list @@ -306,5 +299,5 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) return new typepath(usr.loc) - if(config.sandbox_autoclose) + if(CONFIG_GET(flag/sandbox_autoclose)) usr << browse(null,"window=sandbox") diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 77b91a85717..64d4f84eec1 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -31,16 +31,17 @@ /datum/game_mode/traitor/pre_setup() - if(config.protect_roles_from_antagonist) + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs - if(config.protect_assistant_from_antagonist) + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) restricted_jobs += "Assistant" var/num_traitors = 1 - if(config.traitor_scaling_coeff) - num_traitors = max(1, min( round(num_players()/(config.traitor_scaling_coeff*2))+ 2 + num_modifier, round(num_players()/(config.traitor_scaling_coeff)) + num_modifier )) + var/tsc = CONFIG_GET(number/traitor_scaling_coeff) + if(tsc) + num_traitors = max(1, min(round(num_players() / (tsc * 2)) + 2 + num_modifier, round(num_players() / tsc) + num_modifier)) else num_traitors = max(1, min(num_players(), traitors_possible)) @@ -68,10 +69,11 @@ return 1 /datum/game_mode/traitor/make_antag_chance(mob/living/carbon/human/character) //Assigns traitor to latejoiners - var/traitorcap = min(round(GLOB.joined_player_list.len / (config.traitor_scaling_coeff * 2)) + 2 + num_modifier, round(GLOB.joined_player_list.len/config.traitor_scaling_coeff) + num_modifier ) + var/tsc = CONFIG_GET(number/traitor_scaling_coeff) + var/traitorcap = min(round(GLOB.joined_player_list.len / (tsc * 2)) + 2 + num_modifier, round(GLOB.joined_player_list.len / tsc) + num_modifier) if((SSticker.mode.traitors.len + pre_traitors.len) >= traitorcap) //Upper cap for number of latejoin antagonists return - if((SSticker.mode.traitors.len + pre_traitors.len) <= (traitorcap - 2) || prob(100 / (config.traitor_scaling_coeff * 2))) + if((SSticker.mode.traitors.len + pre_traitors.len) <= (traitorcap - 2) || prob(100 / (tsc * 2))) if(ROLE_TRAITOR in character.client.prefs.be_special) if(!jobban_isbanned(character, ROLE_TRAITOR) && !jobban_isbanned(character, "Syndicate")) if(age_check(character.client)) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index f4847e30a7e..42d676c29b2 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -234,11 +234,10 @@ if(!link) if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL) - user.drop_item() - I.loc = src - link = I - to_chat(user, "You attach [I] to the doll.") - update_targets() + if (user.transferItemToLoc(I,src)) + link = I + to_chat(user, "You attach [I] to the doll.") + update_targets() /obj/item/voodoo/check_eye(mob/user) if(loc != user) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 130839a3737..aa630548b0a 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -60,7 +60,6 @@ to_chat(user, "\"Come now, do not capture your bretheren's soul.\"") return add_logs(user, M, "captured [M.name]'s soul", src) - transfer_soul("VICTIM", M, user) ///////////////////Options for using captured souls/////////////////////////////////////// @@ -119,7 +118,7 @@ ////////////////////////////Proc for moving soul in and out off stone////////////////////////////////////// -/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user). +/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user) switch(choice) if("FORCE") if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul @@ -164,7 +163,7 @@ if(contents.len) to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") else - T.loc = src //put shade in stone + T.forceMove(src) //put shade in stone T.status_flags |= GODMODE T.canmove = 0 T.health = T.maxHealth @@ -199,7 +198,6 @@ SSticker.mode.cult -= A.mind SSticker.mode.update_cult_icons_removed(A.mind) qdel(T) - user.drop_item() qdel(src) else to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!") @@ -237,6 +235,7 @@ S.name = "Shade of [T.real_name]" S.real_name = "Shade of [T.real_name]" S.key = T.key + S.language_holder = U.language_holder.copy(S) if(U) S.faction |= "\ref[U]" //Add the master as a faction, allowing inter-mob cooperation if(U && iscultist(U)) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 31060fffc35..5e22aaac421 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -478,7 +478,7 @@ /datum/spellbook_entry/summon/guns/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (!config.no_summon_guns) + return !CONFIG_GET(flag/no_summon_guns) /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) @@ -495,7 +495,7 @@ /datum/spellbook_entry/summon/magic/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (!config.no_summon_magic) + return !CONFIG_GET(flag/no_summon_magic) /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) @@ -513,7 +513,7 @@ /datum/spellbook_entry/summon/events/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (!config.no_summon_events) + return !CONFIG_GET(flag/no_summon_events) /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index eea7afcb4b6..d25c7613bca 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -30,7 +30,7 @@ to_chat(wizard.current, "A starting location for you could not be found, please report this bug!") return 0 for(var/datum/mind/wiz in wizards) - wiz.current.loc = pick(GLOB.wizardstart) + wiz.current.forceMove(pick(GLOB.wizardstart)) return 1 @@ -111,10 +111,7 @@ if (!newname) newname = randomname - wizard_mob.real_name = newname - wizard_mob.name = newname - if(wizard_mob.mind) - wizard_mob.mind.name = newname + wizard_mob.fully_replace_character_name(wizard_mob.real_name, newname) /* Wizards by nature cannot be too young. */ if(wizard_mob.age < WIZARD_AGE_MIN) @@ -245,15 +242,6 @@ //OTHER PROCS -//To batch-remove wizard spells. Linked to mind.dm. -/mob/proc/spellremove(mob/M) - if(!mind) - return - for(var/X in src.mind.spell_list) - var/obj/effect/proc_holder/spell/spell_to_remove = X - qdel(spell_to_remove) - mind.spell_list -= spell_to_remove - //returns whether the mob is a wizard (or apprentice) /proc/iswizard(mob/living/M) return istype(M) && M.mind && SSticker && SSticker.mode && ((M.mind in SSticker.mode.wizards) || (M.mind in SSticker.mode.apprentices)) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 80400fee053..48eafce3c58 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -44,10 +44,10 @@ var/turf/T = loc Beacon = new /obj/item/device/radio/beacon Beacon.invisibility = INVISIBILITY_MAXIMUM - Beacon.loc = T + Beacon.forceMove(T) if(Beacon) if(Beacon.loc != loc) - Beacon.loc = loc + Beacon.forceMove(loc) updateicon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 65a0e1e5239..94025dae31c 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -26,6 +26,7 @@ ) var/list/chem_buttons //Used when emagged to scramble which chem is used, eg: antitoxin -> morphine var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning + var/enter_message = "You feel cool air surround you. You go numb as your senses turn inward." /obj/machinery/sleeper/Initialize() . = ..() @@ -69,7 +70,7 @@ ..(user) var/mob/living/mob_occupant = occupant if(mob_occupant && mob_occupant.stat != DEAD) - to_chat(occupant, "You feel cool air surround you. You go numb as your senses turn inward.") + to_chat(occupant, "[enter_message]") /obj/machinery/sleeper/emp_act(severity) if(is_operational() && occupant) @@ -205,6 +206,21 @@ icon_state = "sleeper_s" controls_inside = TRUE +/obj/machinery/sleeper/clockwork + name = "soothing sleeper" + desc = "A large cryogenics unit built from brass. Its surface is pleasantly cool the touch." + icon_state = "sleeper_clockwork" + enter_message = "You hear the gentle hum and click of machinery, and are lulled into a sense of peace." + possible_chems = list(list("epinephrine", "salbutamol", "bicaridine", "kelotane", "oculine", "inacusiate", "mannitol")) + +/obj/machinery/sleeper/clockwork/process() + if(occupant && isliving(occupant)) + var/mob/living/L = occupant + if(GLOB.clockwork_vitality) //If there's Vitality, the sleeper has passive healing + GLOB.clockwork_vitality = max(0, GLOB.clockwork_vitality - 1) + L.adjustBruteLoss(-1) + L.adjustFireLoss(-1) + L.adjustOxyLoss(-5) /obj/machinery/sleeper/old icon_state = "oldpod" diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 5bca39780b2..ef50e61e58f 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -95,6 +95,7 @@ Class Procs: /obj/machinery name = "machinery" icon = 'icons/obj/stationobjs.dmi' + desc = "Some kind of machine." verb_say = "beeps" verb_yell = "blares" pressure_resistance = 15 @@ -429,7 +430,7 @@ Class Procs: W.handle_item_insertion(A, 1) component_parts -= A component_parts += B - B.loc = null + B.moveToNullspace() to_chat(user, "[A.name] replaced with [B.name].") shouldplaysound = 1 //Only play the sound when parts are actually replaced! break diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 4f691e053f1..8a4c854d764 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -43,7 +43,7 @@ to_chat(user, "[src] is out of foam and cannot be activated.") return if(cooldown_time > world.time) - to_chat(user, "[src] cannot be activated for another [round((world.time - cooldown_time) * 0.1)] second\s.") + to_chat(user, "[src] cannot be activated for [DisplayTimeText(world.time - cooldown_time)].") return new /obj/effect/particle_effect/foam(loc) uses-- diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 3717501db16..2f89993fdbf 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -147,7 +147,7 @@ radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_AIRLOCK) /obj/machinery/airlock_sensor/Initialize() - ..() + . = ..() set_frequency(frequency) /obj/machinery/airlock_sensor/Destroy() diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index ff072fd0109..299b0500cef 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -11,6 +11,9 @@ var/initial_icon_state var/static/list/style_list_icons = list("standard" = 'icons/mob/augmentation/augments.dmi', "engineer" = 'icons/mob/augmentation/augments_engineer.dmi', "security" = 'icons/mob/augmentation/augments_security.dmi', "mining" = 'icons/mob/augmentation/augments_mining.dmi') +/obj/machinery/aug_manipulator/examine(mob/user) + ..() + to_chat(user, "Alt-click to eject the limb.") /obj/machinery/aug_manipulator/Initialize() initial_icon_state = initial(icon_state) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 9fa53765ed5..4894952a694 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -134,12 +134,11 @@ if(ispath(lit, /obj/item/ore/bluespace_crystal)) use_power(max(500,M.last_amount_inserted/10)) else - var/obj/item/stack/S = lit - var/list/initmats = initial(S.materials) - if (initmats[MAT_METAL]) - flick("autolathe_o",src)//plays metal insertion animation - if (initmats[MAT_GLASS]) - flick("autolathe_r",src)//plays glass insertion animation + switch(M.last_inserted_id) + if (MAT_METAL) + flick("autolathe_o",src)//plays metal insertion animation + if (MAT_GLASS) + flick("autolathe_r",src)//plays glass insertion animation use_power(M.last_amount_inserted*100) updateUsrDialog() diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index de07fc9c2dc..9d446aa77cf 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -43,7 +43,7 @@ say("Station funds depleted. Halting siphon.") siphoning = FALSE else - new /obj/item/stack/spacecash/c200(get_turf(src)) // will autostack + new /obj/item/stack/spacecash/c200(drop_location()) // will autostack playsound(src.loc, 'sound/items/poster_being_created.ogg', 100, 1) SSshuttle.points -= 200 if(next_warning < world.time && prob(15)) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 7c1904d2fe7..8a118b8d08c 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -127,10 +127,10 @@ if(panel_open) if(device || board) if(device) - device.loc = get_turf(src) + device.forceMove(drop_location()) device = null if(board) - board.loc = get_turf(src) + board.forceMove(drop_location()) req_access = list() req_one_access = list() board = null diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index bc6833f84a1..7d3c40a0d93 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -39,6 +39,8 @@ // Upgrades bitflag var/upgrades = 0 + var/internal_light = TRUE //Whether it can light up when an AI views it + /obj/machinery/camera/Initialize(mapload) . = ..() assembly = new(src) @@ -244,7 +246,7 @@ if(disassembled) if(!assembly) assembly = new() - assembly.loc = src.loc + assembly.forceMove(drop_location()) assembly.state = 1 assembly.setDir(dir) assembly = null diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 93e64683060..1e6fe4c5321 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -91,7 +91,7 @@ state = 4 var/obj/machinery/camera/C = new(src.loc) - src.loc = C + forceMove(C) C.assembly = src C.setDir(src.dir) @@ -122,7 +122,7 @@ if(U) to_chat(user, "You unattach an upgrade from the assembly.") playsound(src.loc, W.usesound, 50, 1) - U.loc = get_turf(src) + U.forceMove(drop_location()) upgrades -= U return diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 3f95d2a7804..63c63ce1204 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -45,14 +45,13 @@ if(!isarea(a)) return if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power! - to_chat(user, "The [name] blinks red as you try to insert the cell!") + to_chat(user, "The [src] blinks red as you try to insert the cell!") return - if(!user.drop_item()) + if(!user.transferItemToLoc(W,src)) return - W.loc = src charging = W - user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.") + user.visible_message("[user] inserts a cell into [src].", "You insert a cell into [src].") chargelevel = -1 updateicon() else if(istype(W, /obj/item/wrench)) @@ -61,7 +60,7 @@ return anchored = !anchored - to_chat(user, "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground") + to_chat(user, "You [anchored ? "attach" : "detach"] [src] [anchored ? "to" : "from"] the ground") playsound(src.loc, W.usesound, 75, 1) else return ..() @@ -80,7 +79,7 @@ user.put_in_hands(charging) charging.add_fingerprint(user) - user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.") + user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].") removecell() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 2276b5154b5..bc0bdf8524b 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -229,9 +229,9 @@ else if(mob_occupant.cloneloss > (100 - heal_level)) mob_occupant.Unconscious(80) - + var/dmg_mult = CONFIG_GET(number/damage_multiplier) //Slowly get that clone healed and finished. - mob_occupant.adjustCloneLoss(-((speed_coeff/2) * config.damage_multiplier)) + mob_occupant.adjustCloneLoss(-((speed_coeff / 2) * dmg_mult)) var/progress = CLONE_INITIAL_DAMAGE - mob_occupant.getCloneLoss() // To avoid the default cloner making incomplete clones progress += (100 - MINIMUM_HEAL_LEVEL) @@ -249,7 +249,7 @@ BP.attach_limb(mob_occupant) //Premature clones may have brain damage. - mob_occupant.adjustBrainLoss(-((speed_coeff/2) * config.damage_multiplier)) + mob_occupant.adjustBrainLoss(-((speed_coeff / 2) * dmg_mult)) check_brine() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index ec679567963..24c897ff5ce 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -10,7 +10,7 @@ light_color = LIGHT_COLOR_BLUE /obj/machinery/computer/operating/Initialize() - ..() + . = ..() find_table() /obj/machinery/computer/operating/proc/find_table() diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 3d13e8a748b..b590763ffe6 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -136,7 +136,7 @@ if(occupier && !active) to_chat(occupier, "You have been downloaded to a mobile storage device. Still no remote access.") to_chat(user, "Transfer successful: [occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") - occupier.loc = card + occupier.forceMove(card) card.AI = occupier occupier = null update_icon() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 8131dbd4a69..5c993f0bdea 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -84,7 +84,7 @@ light_color = LIGHT_COLOR_CYAN /obj/machinery/computer/atmos_control/Initialize() - ..() + . = ..() set_frequency(frequency) /obj/machinery/computer/atmos_control/Destroy() diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 2d6c03eebb5..58d29d0698f 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -19,7 +19,7 @@ var/obj/item/weldingtool/WT = P if(!WT.remove_fuel(0, user)) if(!WT.isOn()) - to_chat(user, "The welding tool must be on to complete this task!") + to_chat(user, "[WT] must be on to complete this task!") return playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You start deconstructing the frame...") @@ -41,14 +41,13 @@ state = 0 return if(istype(P, /obj/item/circuitboard/computer) && !circuit) - if(!user.drop_item()) + if(!user.transferItemToLoc(P, null)) return playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) - to_chat(user, "You place the circuit board inside the frame.") + to_chat(user, "You place [P] inside the frame.") icon_state = "1" circuit = P circuit.add_fingerprint(user) - P.loc = null return else if(istype(P, /obj/item/circuitboard) && !circuit) @@ -56,16 +55,16 @@ return if(istype(P, /obj/item/screwdriver) && circuit) playsound(src.loc, P.usesound, 50, 1) - to_chat(user, "You screw the circuit board into place.") + to_chat(user, "You screw [circuit] into place.") state = 2 icon_state = "2" return if(istype(P, /obj/item/crowbar) && circuit) playsound(src.loc, P.usesound, 50, 1) - to_chat(user, "You remove the circuit board.") + to_chat(user, "You remove [circuit].") state = 1 icon_state = "0" - circuit.loc = src.loc + circuit.forceMove(drop_location()) circuit.add_fingerprint(user) circuit = null return diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 3d5b8f026b1..9f252effa69 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -3,7 +3,8 @@ desc = "Used to access the various cameras on the station." icon_screen = "cameras" icon_keyboard = "security_key" - var/z_lock = null // Lock use to this zlevel + var/list/z_lock = list() // Lock use to these z levels + var/station_lock_override = FALSE var/mob/camera/aiEye/remote/eyeobj var/mob/living/current_user = null var/list/networks = list("SS13") @@ -13,6 +14,11 @@ light_color = LIGHT_COLOR_RED +/obj/machinery/computer/camera_advanced/Initialize() + . = ..() + if(station_lock_override) + z_lock = GLOB.station_z_levels.Copy() + /obj/machinery/computer/camera_advanced/syndie icon_keyboard = "syndie_key" @@ -76,7 +82,7 @@ if(!eyeobj.eye_initialized) var/camera_location for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) - if(!C.can_use() || z_lock && C.z != z_lock) + if(!C.can_use() || z_lock.len && !(C.z in z_lock)) continue if(C.network & networks) camera_location = get_turf(C) @@ -201,7 +207,7 @@ var/list/L = list() for (var/obj/machinery/camera/cam in GLOB.cameranet.cameras) - if(origin.z_lock && cam.z != origin.z_lock) + if(origin.z_lock.len && !(cam.z in origin.z_lock)) continue L.Add(cam) @@ -225,3 +231,89 @@ 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) + + +//Used by servants of Ratvar! They let you beam to the station. +/obj/machinery/computer/camera_advanced/ratvar + name = "ratvarian camera observer" + desc = "A console used to snoop on the station's goings-on. A jet of steam occasionally whooshes out from slats on its sides." + use_power = FALSE + networks = list("SS13", "MiniSat") //:eye: + var/datum/action/innate/servant_warp/warp_action = new + +/obj/machinery/computer/camera_advanced/ratvar/Initialize() + . = ..() + ratvar_act() + +/obj/machinery/computer/camera_advanced/ratvar/process() + if(prob(1)) + playsound(src, 'sound/machines/clockcult/steam_whoosh.ogg', 25, TRUE) + new/obj/effect/temp_visual/steam_release(get_turf(src)) + +/obj/machinery/computer/camera_advanced/ratvar/CreateEye() + ..() + eyeobj.visible_icon = 1 + eyeobj.icon = 'icons/obj/abductor.dmi' //in case you still had any doubts + eyeobj.icon_state = "camera_target" + +/obj/machinery/computer/camera_advanced/ratvar/GrantActions(mob/living/carbon/user) + ..() + if(warp_action) + warp_action.Grant(user) + warp_action.target = src + actions += warp_action + +/obj/machinery/computer/camera_advanced/ratvar/attack_hand(mob/living/user) + if(!is_servant_of_ratvar(user)) + to_chat(user, "[src]'s keys are in a language foreign to you, and you don't understand anything on its screen.") + return + . = ..() + +/datum/action/innate/servant_warp + name = "Warp" + desc = "Warps to the tile you're viewing. You can use the Abscond scripture to return." + icon_icon = 'icons/mob/actions/actions_clockcult.dmi' + button_icon_state = "warp_down" + background_icon_state = "bg_clock" + buttontooltipstyle = "clockcult" + var/obj/effect/temp_visual/ratvar/warp_marker/warping + +/datum/action/innate/servant_warp/Activate() + if(QDELETED(target) || !(ishuman(owner) || iscyborg(owner)) || !owner.canUseTopic(target) || warping) + return + if(!istype(SSticker.mode, /datum/game_mode/clockwork_cult)) //No leaving unless there's servants from the get-go + return + var/mob/living/carbon/human/user = owner + var/mob/camera/aiEye/remote/remote_eye = user.remote_control + var/obj/machinery/computer/camera_advanced/ratvar/R = target + var/turf/T = get_turf(remote_eye) + if(user.z != ZLEVEL_CITYOFCOGS || !(T.z in GLOB.station_z_levels)) + return + if(isclosedturf(T)) + to_chat(user, "You can't teleport into a wall.") + return + else if(isspaceturf(T)) + to_chat(user, "[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]") + return + var/area/AR = get_area(T) + if(istype(AR, /area/ai_monitored)) + to_chat(user, "The structure there is too dense for [src] to pierce. (This is normal in high-security areas.)") + return + if(alert(user, "Are you sure you want to warp to [AR]?", target.name, "Warp", "Cancel") == "Cancel" || QDELETED(R) || !user.canUseTopic(R)) + return + do_sparks(5, TRUE, user) + do_sparks(5, TRUE, T) + warping = new(T) + user.visible_message("[user]'s [target.name] flares!", "You begin warping to [AR]...") + if(!do_after(user, 50, target = warping)) + to_chat(user, "Warp interrupted.") + QDEL_NULL(warping) + return + T.visible_message("[user] warps in!") + playsound(user, 'sound/magic/magic_missile.ogg', 50, TRUE) + playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE) + user.forceMove(get_turf(T)) + user.setDir(SOUTH) + flash_color(user, flash_color = "#AF0AAF", flash_time = 5) + R.remove_eye_control(user) + QDEL_NULL(warping) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 0548d94f3d1..e5869310ade 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -47,29 +47,26 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/Initialize() . = ..() - change_position_cooldown = config.id_console_jobslot_delay + change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay) /obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY if(istype(O, /obj/item/card/id)) var/obj/item/card/id/idcard = O if(check_access(idcard)) if(!scan) - if(!usr.drop_item()) + if (!user.transferItemToLoc(idcard,src)) return - idcard.loc = src scan = idcard playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(!modify) - if(!usr.drop_item()) + if (!user.transferItemToLoc(idcard,src)) return - idcard.loc = src modify = idcard playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(!modify) - if(!usr.drop_item()) + if (!user.transferItemToLoc(idcard,src)) return - idcard.loc = src modify = idcard playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else @@ -95,10 +92,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/on_deconstruction() if(scan) - scan.forceMove(loc) + scan.forceMove(drop_location()) scan = null if(modify) - modify.forceMove(loc) + modify.forceMove(drop_location()) modify = null //Check if you can't open a new position for a certain job @@ -355,7 +352,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if (modify) GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment) modify.update_label() - modify.loc = loc + modify.forceMove(drop_location()) modify.verb_pickup() playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) modify = null @@ -364,26 +361,24 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) else var/obj/item/I = usr.get_active_held_item() if (istype(I, /obj/item/card/id)) - if(!usr.drop_item()) + if (!usr.transferItemToLoc(I,src)) return playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) - I.loc = src modify = I authenticated = 0 if ("scan") if (scan) - scan.loc = src.loc + scan.forceMove(drop_location()) scan.verb_pickup() playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) scan = null else var/obj/item/I = usr.get_active_held_item() if (istype(I, /obj/item/card/id)) - if(!usr.drop_item()) + if (!usr.transferItemToLoc(I,src)) return playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) - I.loc = src scan = I authenticated = 0 if ("auth") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index b035ef154f2..31126a6c08c 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -117,9 +117,8 @@ /obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) - if(!user.drop_item()) + if (!user.transferItemToLoc(W,src)) return - W.loc = src src.diskette = W to_chat(user, "You insert [W].") playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) @@ -373,7 +372,7 @@ if("eject") if(src.diskette) - src.diskette.loc = src.loc + src.diskette.forceMove(drop_location()) src.diskette = null playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) if("save") @@ -404,7 +403,7 @@ else if(!pod) temp = "No Clonepods available." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else if(!config.revival_cloning) + else if(!CONFIG_GET(flag/revival_cloning)) temp = "Unable to initiate cloning cycle." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) else if(pod.occupant) @@ -471,7 +470,7 @@ // species datums R.fields["mrace"] = dna.species else - var/datum/species/rando_race = pick(config.roundstart_races) + var/datum/species/rando_race = pick(CONFIG_GET(keyed_flag_list/roundstart_races)) R.fields["mrace"] = rando_race.type R.fields["ckey"] = mob_occupant.ckey diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 7de64f8aa79..77f6e08c7db 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -462,7 +462,7 @@ if (src.authenticated==2) dat += "
Captain Functions" dat += "
\[ Make a Captain's Announcement \]" - if(config.cross_allowed) + if(CONFIG_GET(string/cross_server_address)) dat += "
\[ Send a message to an allied station \]" if(SSmapping.config.allow_custom_shuttles == "yes") dat += "
\[ Purchase Shuttle \]" diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 913d6f63261..27ac682b865 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -43,9 +43,8 @@ /obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) - if(!user.drop_item()) + if (!user.transferItemToLoc(I,src)) return - I.loc = src src.diskette = I to_chat(user, "You insert [I].") src.updateUsrDialog() @@ -170,7 +169,7 @@ if("working") temp_html += status temp_html += "
System Busy
" - temp_html += "Working ... Please wait ([radduration] Seconds)" + temp_html += "Working ... Please wait ([DisplayTimeText(radduration*10)])" if("buffer") temp_html += status temp_html += buttons @@ -449,7 +448,7 @@ diskette.fields = buffer_slot.Copy() if("ejectdisk") if(diskette) - diskette.loc = get_turf(src) + diskette.forceMove(drop_location()) diskette = null if("setdelayed") if(num) diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm index c416d93e58a..d80dc73f15b 100644 --- a/code/game/machinery/computer/gulag_teleporter.dm +++ b/code/game/machinery/computer/gulag_teleporter.dm @@ -27,9 +27,8 @@ /obj/machinery/computer/gulag_teleporter_computer/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/card/id/prisoner)) if(!id) - if(!user.drop_item()) + if (!user.transferItemToLoc(W,src)) return - W.forceMove(src) id = W to_chat(user, "You insert [W].") return diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index f2ea3238efb..6ec144d2575 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -124,7 +124,7 @@ dat += "" if(active1 in GLOB.data_core.general) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"]) - if(config.mutant_races) + if(CONFIG_GET(flag/join_with_mutant_race)) P.info += "\nSpecies: [active1.fields["species"]]
" P.info += text("\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", src.active1.fields["fingerprint"], src.active1.fields["p_stat"], src.active1.fields["m_stat"]) else diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 5470380ca5a..260fbaf4de4 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -58,7 +58,7 @@ to_chat(user, "A no server error appears on the screen.") /obj/machinery/computer/message_monitor/Initialize() - ..() + . = ..() //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. if(!linkedServer) if(GLOB.message_servers && GLOB.message_servers.len > 0) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 2023de1cd90..7cb13043261 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -10,7 +10,7 @@ /obj/machinery/computer/pod/Initialize() - ..() + . = ..() for(var/obj/machinery/mass_driver/M in range(range, src)) if(M.id == id) connected = M @@ -51,9 +51,7 @@ d2 = "Stop Time Launch" else d2 = "Initiate Time Launch" - var/second = time % 60 - var/minute = (time - second) / 60 - dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] - - + +" + dat += "
\nTimer System: [d2]\nTime Left: [DisplayTimeText(time)] - - + +" var/temp = "" var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) for(var/t in L) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 00787f10e29..1a74c44c30e 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -186,7 +186,7 @@
" if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1))) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
", active1.fields["name"], active1.fields["id"], active1.fields["sex"], active1.fields["age"]) - if(config.mutant_races) + if(CONFIG_GET(flag/join_with_mutant_race)) P.info += "\nSpecies: [active1.fields["species"]]
" P.info += text("\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", active1.fields["fingerprint"], active1.fields["p_stat"], active1.fields["m_stat"]) else @@ -519,7 +519,7 @@ What a mess.*/ G.fields["rank"] = "Unassigned" G.fields["sex"] = "Male" G.fields["age"] = "Unknown" - if(config.mutant_races) + if(CONFIG_GET(flag/join_with_mutant_race)) G.fields["species"] = "Human" G.fields["photo_front"] = new /icon() G.fields["photo_side"] = new /icon() @@ -604,7 +604,7 @@ What a mess.*/ active1.fields["age"] = t1 if("species") if(istype(active1, /datum/data/record)) - var/t1 = input("Select a species", "Species Selection") as null|anything in GLOB.roundstart_species + var/t1 = input("Select a species", "Species Selection") as null|anything in CONFIG_GET(keyed_flag_list/roundstart_races) if(!canUseSecurityRecordsConsole(usr, t1, a1)) return active1.fields["species"] = t1 @@ -772,7 +772,7 @@ What a mess.*/ if(6) R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") if(7) - R.fields["species"] = pick(GLOB.roundstart_species) + R.fields["species"] = pick(CONFIG_GET(keyed_flag_list/roundstart_races)) if(8) var/datum/data/record/G = pick(GLOB.data_core.general) R.fields["photo_front"] = G.fields["photo_front"] diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 678d856dcea..3c183456bed 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E var/obj/machinery/computer/telecrystals/boss/linkedboss = null /obj/machinery/computer/telecrystals/uplinker/Initialize() - ..() + . = ..() var/ID = pick_n_take(GLOB.possible_uplinker_IDs) if(!ID) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 9ba8e1d34d9..f919bdbab89 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -96,7 +96,7 @@ dat += "
" dat += " Select Track
" dat += "Track Selected: [selection.song_name]
" - dat += "Track Length: [selection.song_length/10] seconds
" + dat += "Track Length: [DisplayTimeText(selection.song_length)]
" dat += "
DJ's Soundboard:
" dat +="
"
dat += "Air Horn "
@@ -122,7 +122,7 @@
return
if(!active)
if(stop > world.time)
- to_chat(usr, "Error: The device is still resetting from the last activation, it will be ready again in [round((stop-world.time)/10)] seconds.")
+ to_chat(usr, "Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].")
playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1)
return
active = TRUE
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 333aa6ac551..f0e1e8a18a2 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -110,13 +110,17 @@
/obj/item/grenade/barrier
name = "barrier grenade"
- desc = "Instant cover. Alt+click to toggle modes."
+ desc = "Instant cover."
icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
item_state = "flashbang"
actions_types = list(/datum/action/item_action/toggle_barrier_spread)
var/mode = SINGLE
+/obj/item/grenade/barrier/examine(mob/user)
+ ..()
+ to_chat(user, "Alt-click to toggle modes.")
+
/obj/item/grenade/barrier/AltClick(mob/living/user)
if(!istype(user) || user.incapacitated())
return
diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm
index 4085b4edb4c..034a260925f 100644
--- a/code/game/machinery/dna_scanner.dm
+++ b/code/game/machinery/dna_scanner.dm
@@ -15,7 +15,7 @@
var/scan_level
var/precision_coeff
var/message_cooldown
- var/breakout_time = 2
+ var/breakout_time = 1200
/obj/machinery/dna_scannernew/RefreshParts()
scan_level = 0
@@ -73,9 +73,9 @@
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
user.visible_message("You see [user] kicking against the door of [src]!", \
- "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \
+ "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \
"You hear a metallic creaking from [src].")
- if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+ if(do_after(user,(breakout_time), target = src))
if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked)
return
locked = FALSE
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 20380dc5303..9e9a449974e 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1347,19 +1347,19 @@
return TRUE
operating = TRUE
update_icon(AIRLOCK_OPENING, 1)
- src.set_opacity(0)
- sleep(5)
- density = FALSE
- sleep(9)
- src.layer = OPEN_DOOR_LAYER
- update_icon(AIRLOCK_OPEN, 1)
+ sleep(1)
set_opacity(0)
- operating = FALSE
- air_update_turf(1)
update_freelook_sight()
+ sleep(4)
+ density = FALSE
+ air_update_turf(1)
+ sleep(1)
+ layer = OPEN_DOOR_LAYER
+ update_icon(AIRLOCK_OPEN, 1)
+ operating = FALSE
if(delayed_close_requested)
delayed_close_requested = FALSE
- addtimer(CALLBACK(src, .proc/close), 2)
+ addtimer(CALLBACK(src, .proc/close), 1)
return TRUE
@@ -1391,21 +1391,24 @@
return TRUE
operating = TRUE
update_icon(AIRLOCK_CLOSING, 1)
- src.layer = CLOSED_DOOR_LAYER
+ layer = CLOSED_DOOR_LAYER
if(air_tight)
density = TRUE
- sleep(5)
- density = TRUE
+ air_update_turf(1)
+ sleep(1)
+ if(!air_tight)
+ density = TRUE
+ air_update_turf(1)
+ sleep(4)
if(!safe)
crush()
- sleep(9)
- update_icon(AIRLOCK_CLOSED, 1)
if(visible && !glass)
set_opacity(1)
+ update_freelook_sight()
+ sleep(1)
+ update_icon(AIRLOCK_CLOSED, 1)
operating = FALSE
delayed_close_requested = FALSE
- air_update_turf(1)
- update_freelook_sight()
if(safe)
CheckForMobs()
return TRUE
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index f27e3da2dcd..f52ffd42fe8 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -5,6 +5,10 @@
var/list/accesses = list()
var/one_access = 0
+/obj/item/electronics/airlock/examine(mob/user)
+ ..()
+ to_chat(user, "Has a neat selection menu for modifying airlock access levels.")
+
/obj/item/electronics/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
SStgui.try_update_ui(user, src, ui_key, ui, force_open)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 65a92c0b1a7..883cc3986f1 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -33,6 +33,10 @@
var/damage_deflection = 10
var/real_explosion_block //ignore this, just use explosion_block
+/obj/machinery/door/examine(mob/user)
+ ..()
+ to_chat(user, "Its maintenance panel is screwed in place.")
+
/obj/machinery/door/New()
..()
if(density)
@@ -79,7 +83,7 @@
bumpopen(M)
return
- if(istype(AM, /obj/mecha))
+ if(ismecha(AM))
var/obj/mecha/mecha = AM
if(density)
if(mecha.occupant)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 02f3f03b917..95adf12875d 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -434,6 +434,15 @@
constructionStep = CONSTRUCTION_GUTTED
update_icon()
return
+ if(istype(C, /obj/item/device/electroadaptive_pseudocircuit))
+ var/obj/item/device/electroadaptive_pseudocircuit/P = C
+ if(!P.adapt_circuit(user, 30))
+ return
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt a firelock circuit and slot it into the assembly.")
+ constructionStep = CONSTRUCTION_GUTTED
+ update_icon()
+ return
return ..()
/obj/structure/firelock_frame/heavy
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index f76412199c4..4809f3ff49f 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -62,7 +62,7 @@
if( operating || !src.density )
return
if (!( ismob(AM) ))
- if(istype(AM, /obj/mecha))
+ if(ismecha(AM))
var/obj/mecha/mecha = AM
if(mecha.occupant && src.allowed(mecha.occupant))
open_and_close()
diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm
index c23f4d0ba86..5e0d0185548 100644
--- a/code/game/machinery/embedded_controller/access_controller.dm
+++ b/code/game/machinery/embedded_controller/access_controller.dm
@@ -42,6 +42,7 @@
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_button_standby"
name = "access button"
+ desc = "A button used for the explicit purpose of opening an airlock."
var/idDoor
var/obj/machinery/door/airlock/door
var/obj/machinery/doorButtons/airlock_controller/controller
@@ -107,6 +108,7 @@
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_control_standby"
name = "access console"
+ desc = "A small console that can cycle opening between two airlocks."
var/obj/machinery/door/airlock/interiorAirlock
var/obj/machinery/door/airlock/exteriorAirlock
var/idInterior
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 518cd8ab091..ebbeb1bee2a 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -220,6 +220,16 @@
update_icon()
return
+ else if(istype(W, /obj/item/device/electroadaptive_pseudocircuit))
+ var/obj/item/device/electroadaptive_pseudocircuit/P = W
+ if(!P.adapt_circuit(user, 15))
+ return
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt a fire alarm circuit and slot it into the assembly.")
+ buildstage = 1
+ update_icon()
+ return
+
else if(istype(W, /obj/item/wrench))
user.visible_message("[user] removes the fire alarm assembly from the wall.", \
"You remove the fire alarm assembly from the wall.")
diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm
index d77e91af90e..2d7c7708b35 100644
--- a/code/game/machinery/gulag_teleporter.dm
+++ b/code/game/machinery/gulag_teleporter.dm
@@ -20,7 +20,7 @@ The console is located at computer/gulag_teleporter.dm
circuit = /obj/item/circuitboard/machine/gulag_teleporter
var/locked = FALSE
var/message_cooldown
- var/breakout_time = 1
+ var/breakout_time = 600
var/jumpsuit_type = /obj/item/clothing/under/rank/prisoner
var/shoes_type = /obj/item/clothing/shoes/sneakers/orange
var/obj/machinery/gulag_item_reclaimer/linked_reclaimer
@@ -104,9 +104,9 @@ The console is located at computer/gulag_teleporter.dm
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
user.visible_message("You see [user] kicking against the door of [src]!", \
- "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \
+ "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \
"You hear a metallic creaking from [src].")
- if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+ if(do_after(user,(breakout_time), target = src))
if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked)
return
locked = FALSE
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 31cc08f6250..41652ff7612 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -6,6 +6,7 @@
icon = 'icons/obj/power.dmi'
icon_state = "light1"
anchored = TRUE
+ desc = "Make dark."
var/on = TRUE
var/area/area = null
var/otherarea = null
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 051c26bee6f..9429e82c6c4 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -216,7 +216,7 @@
/obj/machinery/magnetic_controller/Initialize()
- ..()
+ . = ..()
if(autolink)
for(var/obj/machinery/magnetic_module/M in GLOB.machines)
if(M.freq == frequency && M.code == code)
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 17f573fe6d4..9acd4730d87 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -20,7 +20,7 @@
var/O_limit
var/atom/target = get_edge_target_turf(src, dir)
for(var/atom/movable/O in loc)
- if(!O.anchored || istype(O, /obj/mecha)) //Mechs need their launch platforms.
+ if(!O.anchored || ismecha(O)) //Mechs need their launch platforms.
O_limit++
if(O_limit >= 20)
audible_message("[src] lets out a screech, it doesn't seem to be able to handle the load.")
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index f50ddbdf7e3..204ae83c9d9 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -305,7 +305,7 @@ GLOBAL_LIST_EMPTY(allCasters)
dat+="Creating new Feed Message..."
dat+="
Receiving Channel: [channel_name]
" dat+="Message Author: [scanned_user]
" - dat+="Message Body:
[parsepencode(msg, user, SIGNFONT)]
" + dat+="Message Body:
[parsemarkdown(msg, user)]
" dat+="Attach Photo: [(photo ? "Photo Attached" : "No Photo")]" dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" @@ -555,7 +555,7 @@ GLOBAL_LIST_EMPTY(allCasters) if(msg =="" || msg=="\[REDACTED\]" || scanned_user == "Unknown" || channel_name == "" ) screen=6 else - GLOB.news_network.SubmitArticle("[parsepencode(msg, usr, SIGNFONT)]", scanned_user, channel_name, photo, 0, allow_comments) + GLOB.news_network.SubmitArticle("[parsemarkdown(msg, usr)]", scanned_user, channel_name, photo, 0, allow_comments) SSblackbox.inc("newscaster_stories",1) screen=4 msg = "" diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 545414577e4..f8003091312 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -31,8 +31,6 @@ imap += icon('icons/misc/imap.dmi', "blank") imap += icon('icons/misc/imap.dmi', "blank") - //to_chat(world, "[icount] images in list") - for(var/wx = 1 ; wx <= world.maxx; wx++) @@ -142,13 +140,10 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") var/icon/I = imap[1+(ix + icx*iy)*2] var/icon/I2 = imap[2+(ix + icx*iy)*2] - //to_chat(world, "icon: [icon2html(I, world)]") - I.DrawBox(colour, rx, ry, rx+1, ry+1) I2.DrawBox(colour2, rx, ry, rx+1, ry+1) @@ -164,8 +159,6 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //to_chat(world, "[icon2html(I, world)] at [H.screen_loc]") - H.name = (i==0)?"maprefresh":"map" var/icon/HI = new/icon @@ -272,12 +265,8 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") var/icon/I = imap[1+(ix + icx*iy)] - - //to_chat(world, "icon: [icon2html(I, world)]") - I.DrawBox(colour, rx, ry, rx, ry) @@ -291,8 +280,6 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //to_chat(world, "[icon2html(I, world)] at [H.screen_loc]") - H.name = (i==0)?"maprefresh":"map" var/icon/I = imap[i+1] diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 4a5e32d4e85..34d2edc56c1 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -30,6 +30,7 @@ Buildable meters PIPE_HE_MANIFOLD, \ PIPE_HE_4WAYMANIFOLD, \ PIPE_JUNCTION, \ + PIPE_BLUESPACE, \ \ PIPE_CONNECTOR, \ PIPE_UVENT, \ @@ -90,6 +91,7 @@ GLOBAL_LIST_INIT(pipeID2State, list( "[PIPE_HE_MANIFOLD]" = "he_manifold", \ "[PIPE_HE_4WAYMANIFOLD]" = "he_manifold4w", \ "[PIPE_JUNCTION]" = "junction", \ + "[PIPE_BLUESPACE]" = "bluespace", \ \ "[PIPE_CONNECTOR]" = "connector", \ "[PIPE_UVENT]" = "uvent", \ @@ -118,6 +120,7 @@ GLOBAL_LIST_INIT(pipeID2State, list( "[PIPE_HE_MANIFOLD]" = "h/e manifold", \ "[PIPE_HE_4WAYMANIFOLD]"= "h/e 4-way manifold", \ "[PIPE_JUNCTION]" = "junction", \ + "[PIPE_BLUESPACE]" = "bluespace pipe", \ \ "[PIPE_CONNECTOR]" = "connector", \ "[PIPE_UVENT]" = "vent", \ @@ -210,6 +213,8 @@ GLOBAL_LIST_INIT(pipeID2State, list( return ..() if (!isturf(src.loc)) return 1 + + add_fingerprint(user) fixdir() if(pipe_type in list(PIPE_GAS_MIXER, PIPE_GAS_FILTER)) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 456fc1d0bd4..cedb94b7b32 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -2,6 +2,7 @@ name = "pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" + desc = "Dispenses countless types of pipes. Very useful if you need pipes." density = TRUE anchored = TRUE var/wait = 0 @@ -13,13 +14,14 @@ if(..()) return 1 var/dat = {" -Regular pipes:
+Pipes:
Pipe
Bent Pipe
Manifold
4-Way Manifold
Manual Valve
Digital Valve
+Bluespace Pipe
Devices:
Connector
Vent
@@ -107,6 +109,7 @@ name = "disposal pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" + desc = "Dispenses pipes that will ultimately be used to move trash around." density = TRUE anchored = TRUE @@ -182,6 +185,7 @@ Nah icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = TRUE + desc = "Dispenses pipes that will move beings around." anchored = TRUE /obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(mob/user) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index b84de7cf186..8f8202fe199 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -12,6 +12,7 @@ layer = OBJ_LAYER invisibility = INVISIBILITY_OBSERVER //the turret is invisible if it's inside its cover density = TRUE + desc = "A covered turret that shoots at its enemies." use_power = IDLE_POWER_USE //this turret uses and requires power idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power @@ -389,7 +390,7 @@ if(!in_faction(C)) targets += C - if(istype(A, /obj/mecha)) + if(ismecha(A)) var/obj/mecha/M = A //If there is a user and they're not in our faction if(M.occupant && !in_faction(M.occupant)) @@ -552,6 +553,7 @@ base_icon_state = "syndie" faction = "syndicate" emp_vunerable = 0 + desc = "A ballistic machine gun auto-turret." /obj/machinery/porta_turret/syndicate/energy icon_state = "standard_stun" @@ -560,6 +562,7 @@ stun_projectile_sound = 'sound/weapons/taser.ogg' lethal_projectile = /obj/item/projectile/beam/laser/heavylaser lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' + desc = "An energy blaster auto-turret." /obj/machinery/porta_turret/syndicate/setup() return diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 1dbdc52b1e7..7eace086360 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -12,6 +12,7 @@ name = "turret frame" icon = 'icons/obj/turrets.dmi' icon_state = "turret_frame" + desc = "An unfinished covered turret frame." density = TRUE var/build_step = PTURRET_UNSECURED //the current step in the building process var/finish_name = "turret" //the name applied to the product turret diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index c8959ec5512..ef26b59aa59 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -79,7 +79,7 @@ return if(world.time < last_teleport + teleport_cooldown) - to_chat(user, "[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time) / 10)] seconds.") + to_chat(user, "[src] is recharging power. Please wait [DisplayTimeText(last_teleport + teleport_cooldown - world.time)].") return if(teleporting) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 46eb3145e07..d2ea1a4fd68 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -107,24 +107,25 @@ var/obj/item/bodypart/head/as_head = AM var/obj/item/device/mmi/as_mmi = AM var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /mob/living/brain) - if(isliving(AM) || brain_holder) + if(brain_holder) + emergency_stop(AM) + else if(isliving(AM)) if(emagged) - if(!brain_holder) - crush_living(AM) + crush_living(AM) else emergency_stop(AM) else if(istype(AM, /obj/item)) recycle_item(AM) items_recycled++ else - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) - AM.loc = src.loc + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) + AM.forceMove(loc) if(items_recycled && sound) - playsound(src.loc, item_recycle_sound, 50, 1) + playsound(src, item_recycle_sound, 50, 1) /obj/machinery/recycler/proc/recycle_item(obj/item/I) - I.loc = src.loc + I.forceMove(loc) GET_COMPONENT(materials, /datum/component/material_container) var/material_amount = materials.get_item_material_amount(I) @@ -137,25 +138,25 @@ /obj/machinery/recycler/proc/emergency_stop(mob/living/L) - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) safety_mode = TRUE update_icon() - L.loc = src.loc + L.forceMove(loc) addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN) /obj/machinery/recycler/proc/reboot() - playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + playsound(src, 'sound/machines/ping.ogg', 50, 0) safety_mode = FALSE update_icon() /obj/machinery/recycler/proc/crush_living(mob/living/L) - L.loc = src.loc + L.forceMove(loc) if(issilicon(L)) - playsound(src.loc, 'sound/items/welder.ogg', 50, 1) + playsound(src, 'sound/items/welder.ogg', 50, 1) else - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) var/gib = TRUE // By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index a78fa50a6a1..7c51c383fab 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -27,7 +27,7 @@ var/uv_super = FALSE var/uv_cycles = 6 var/message_cooldown - var/breakout_time = 0.5 + var/breakout_time = 300 /obj/machinery/suit_storage_unit/standard_unit suit_type = /obj/item/clothing/suit/space/eva @@ -267,9 +267,9 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message("You see [user] kicking against the doors of [src]!", \ - "You start kicking against the doors... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)", \ "You hear a thump from [src].") - if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src ) return user.visible_message("[user] successfully broke out of [src]!", \ diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 92a4edfcd24..590c8d03a5c 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -3,6 +3,7 @@ /obj/machinery/computer/telecomms/server name = "telecommunications server monitoring console" icon_screen = "comm_logs" + desc = "Has full access to all details and record of the telecommunications network it's monitoring." var/screen = 0 // the screen number: var/list/servers = list() // the servers located by the computer diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index bccbfd96fd3..cb3ae78e72b 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -8,6 +8,7 @@ /obj/machinery/computer/telecomms/monitor name = "telecommunications monitoring console" icon_screen = "comm_monitor" + desc = "Monitors the details of the telecommunications network it's synced with." var/screen = 0 // the screen number: var/list/machinelist = list() // the machines located by the computer diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 4019d970022..bec9c5dfc7c 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -37,7 +37,7 @@ /obj/machinery/telecomms/hub/preset id = "Hub" network = "tcommsat" - autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical", + autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "h_relay", "science", "medical", "supply", "service", "common", "command", "engineering", "security", "receiverA", "receiverB", "broadcasterA", "broadcasterB") diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index ca333b9a6c5..ffe99c243c5 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -68,3 +68,10 @@ hide = 1 toggled = FALSE autolinkers = list("r_relay") + +/obj/machinery/telecomms/relay/preset/reebe + name = "hierophant relay" + desc = "A stolen telecommunications relay that ingeniously combines bluespace technology with the Hierophant network to send and receive messages to and from Reebe." + id = "Hierophant Relay" + hide = TRUE + autolinkers = list("h_relay") diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d90e91a4282..9157173fdee 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -706,7 +706,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C ..() var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random) new T(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/snack/blue icon_state = "snackblue" @@ -758,7 +758,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C . = ..() var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random) new T(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/cola/blue icon_state = "Cola_Machine" diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index efe32c0134e..5e7ddb64979 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -3,15 +3,6 @@ internal_damage_threshold = 50 armor = list(melee = 30, bullet = 30, laser = 15, energy = 20, bomb = 20, bio = 0, rad = 0, fire = 100, acid = 100) -/obj/mecha/combat/CheckParts(list/parts_list) - ..() - var/obj/item/stock_parts/capacitor/C = locate() in contents - var/obj/item/stock_parts/scanning_module/SM = locate() in contents - step_energy_drain = 20 - (5 * SM.rating) //10 is normal, so on lowest part its worse, on second its ok and on higher its real good up to 0 on best - armor["energy"] += (C.rating * 10) //Each level of capacitor protects the mech against emp by 10% - qdel(C) - qdel(SM) - /obj/mecha/combat/moved_inside(mob/living/carbon/human/H) if(..()) if(H.client && H.client.mouse_pointer_icon == initial(H.client.mouse_pointer_icon)) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 8909e6463e1..701b5e15f0d 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -198,6 +198,7 @@ equip_cooldown = 10 energy_drain = 250 range = MELEE|RANGED + flags_2 = NO_MAT_REDEMPTION_2 var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock. /obj/item/mecha_parts/mecha_equipment/rcd/New() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 8efc14d9662..747647b1a54 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -420,13 +420,7 @@ var/datum/component/material_container/M = C if(!M.last_insert_success) return - var/lit = M.last_inserted_type - var/stack_name - if(ispath(lit, /obj/item/ore/bluespace_crystal)) - stack_name = "bluespace" - else - var/obj/item/stack/S = lit - stack_name = material2name(initial(S.materials)[1]) + var/stack_name = material2name(M.last_inserted_id) add_overlay("fab-load-[stack_name]") addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[stack_name]"), 10) updateUsrDialog() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index a1c3bf6ca56..6d9c3f25734 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -202,6 +202,19 @@ GLOB.mechas_list -= src //global mech list return ..() +/obj/mecha/CheckParts(list/parts_list) + ..() + var/obj/item/C = locate(/obj/item/stock_parts/cell) in contents + cell = C + var/obj/item/stock_parts/scanning_module/SM = locate() in contents + var/obj/item/stock_parts/capacitor/CP = locate() in contents + if(SM) + step_energy_drain = 20 - (5 * SM.rating) //10 is normal, so on lowest part its worse, on second its ok and on higher its real good up to 0 on best + qdel(SM) + if(CP) + armor["energy"] += (CP.rating * 10) //Each level of capacitor protects the mech against emp by 10% + qdel(CP) + //////////////////////// ////// Helpers ///////// //////////////////////// @@ -767,7 +780,7 @@ . = t_air.return_pressure() return -/obj/mecha/proc/return_temperature() +/obj/mecha/return_temperature() var/datum/gas_mixture/t_air = return_air() if(t_air) . = t_air.return_temperature() diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 24c1c513c3e..27aeea4c09d 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -102,8 +102,11 @@ /datum/construction/reversible/mecha/ripley - result = "/obj/mecha/working/ripley" + result = /obj/mecha/working/ripley steps = list( + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + //1 list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, @@ -127,38 +130,47 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //10 + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //11 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //12 list("key"=/obj/item/circuitboard/mecha/ripley/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //11 + //13 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //12 + //14 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //13 + //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //14 + //16 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") + ) /datum/construction/reversible/mecha/ripley/action(atom/used_atom,mob/user) @@ -170,24 +182,24 @@ //TODO: better messages. switch(index) - if(14) + if(17) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "ripley1" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "ripley2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "ripley0" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "ripley3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "ripley1" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "ripley4" @@ -196,7 +208,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "ripley2" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -204,7 +216,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "ripley3" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "ripley6" @@ -212,7 +224,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "ripley4" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -220,7 +232,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "ripley5" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "ripley8" @@ -228,54 +240,73 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "ripley6" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "ripley9" else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "ripley7" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "ripley10" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "ripley8" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "ripley11" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "ripley9" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "ripley10" + holder.icon_state = "ripley12" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "ripley8" - if(4) + holder.icon_state = "ripley10" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "ripley11" + holder.icon_state = "ripley13" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "ripley9" - if(3) + holder.icon_state = "ripley11" + if(4) if(diff==FORWARD) user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") - holder.icon_state = "ripley12" + holder.icon_state = "ripley14" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "ripley10" - if(2) + holder.icon_state = "ripley12" + if(3) if(diff==FORWARD) user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") - holder.icon_state = "ripley13" + holder.icon_state = "ripley15" else user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "ripley11" - if(1) + holder.icon_state = "ripley13" + if(2) if(diff==FORWARD) user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") - holder.icon_state = "ripley12" + holder.icon_state = "ripley14" return 1 -/datum/construction/reversible/mecha/ripley/spawn_result() +/datum/construction/reversible/mecha/ripley/spawn_mecha_result() ..() SSblackbox.inc("mecha_ripley_created",1) return @@ -311,8 +342,11 @@ /datum/construction/reversible/mecha/gygax - result = "/obj/mecha/combat/gygax" + result = /obj/mecha/combat/gygax steps = list( + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + //1 list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, @@ -336,60 +370,68 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Advanced capacitor is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Advanced capacitor is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/stock_parts/capacitor, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Advanced scanner module is secured."), + "desc"="Advanced capacitor is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Advanced scanner module is installed."), + "desc"="Advanced capacitor is installed."), //10 - list("key"=/obj/item/stock_parts/scanning_module, + list("key"=/obj/item/stock_parts/capacitor, "backkey"=/obj/item/screwdriver, - "desc"="Weapon control module is secured."), + "desc"="Advanced scanner module is secured."), //11 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Weapon control module is installed."), + "desc"="Advanced scanner module is installed."), //12 - list("key"=/obj/item/circuitboard/mecha/gygax/targeting, + list("key"=/obj/item/stock_parts/scanning_module, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="Weapon control module is secured."), //13 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="Weapon control module is installed."), //14 - list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, + list("key"=/obj/item/circuitboard/mecha/gygax/targeting, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //16 + list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //17 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //18 list("key"=/obj/item/circuitboard/mecha/gygax/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //17 + //19 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //18 + //20 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //19 + //21 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //20 + //22 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -403,24 +445,24 @@ //TODO: better messages. switch(index) - if(20) + if(23) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "gygax1" - if(19) + if(22) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "gygax2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "gygax0" - if(18) + if(21) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "gygax3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "gygax1" - if(17) + if(20) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "gygax4" @@ -429,7 +471,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "gygax2" - if(16) + if(19) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -437,7 +479,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "gygax3" - if(15) + if(18) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "gygax6" @@ -445,7 +487,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/gygax/main(get_turf(holder)) holder.icon_state = "gygax4" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -453,7 +495,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "gygax5" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "gygax8" @@ -461,7 +503,7 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/gygax/peripherals(get_turf(holder)) holder.icon_state = "gygax6" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) @@ -469,7 +511,7 @@ else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "gygax7" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "gygax10" @@ -477,7 +519,7 @@ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/circuitboard/mecha/gygax/targeting(get_turf(holder)) holder.icon_state = "gygax8" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs scanner module to the [holder].", "You install scanner module to the [holder].") var/obj/item/I = used_atom @@ -486,7 +528,7 @@ else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "gygax9" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the advanced scanner module.", "You secure the scanner module.") holder.icon_state = "gygax12" @@ -495,7 +537,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "gygax10" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom @@ -504,7 +546,7 @@ else user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") holder.icon_state = "gygax11" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") holder.icon_state = "gygax14" @@ -513,57 +555,74 @@ var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "gygax12" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "gygax15" else user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") holder.icon_state = "gygax13" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "gygax16" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "gygax14" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "gygax17" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "gygax15" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "gygax16" + holder.icon_state = "gygax18" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "gygax14" - if(4) + holder.icon_state = "gygax16" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "gygax17" + holder.icon_state = "gygax19" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "gygax15" - if(3) + holder.icon_state = "gygax17" + if(4) if(diff==FORWARD) user.visible_message("[user] installs Gygax Armor Plates to the [holder].", "You install Gygax Armor Plates to the [holder].") qdel(used_atom) - holder.icon_state = "gygax18" + holder.icon_state = "gygax20" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "gygax16" - if(2) + holder.icon_state = "gygax18" + if(3) if(diff==FORWARD) user.visible_message("[user] secures Gygax Armor Plates.", "You secure Gygax Armor Plates.") - holder.icon_state = "gygax19" + holder.icon_state = "gygax21" else user.visible_message("[user] pries Gygax Armor Plates from the [holder].", "You pry Gygax Armor Plates from the [holder].") new /obj/item/mecha_parts/part/gygax_armor(get_turf(holder)) - holder.icon_state = "gygax17" - if(1) + holder.icon_state = "gygax19" + if(2) if(diff==FORWARD) user.visible_message("[user] welds Gygax Armor Plates to the [holder].", "You weld Gygax Armor Plates to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens Gygax Armor Plates.", "You unfasten Gygax Armor Plates.") - holder.icon_state = "gygax18" + holder.icon_state = "gygax20" return 1 -/datum/construction/reversible/mecha/gygax/spawn_result() - var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder.contents) - qdel(holder) +/datum/construction/reversible/mecha/gygax/spawn_mecha_result() + ..() SSblackbox.inc("mecha_gygax_created",1) return @@ -596,13 +655,16 @@ /datum/construction/reversible/mecha/firefighter - result = "/obj/mecha/working/ripley/firefighter" + result = /obj/mecha/working/ripley/firefighter steps = list( - //1 - list("key"=/obj/item/weldingtool, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), - //2 + //2 list("key"=/obj/item/wrench, "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), @@ -622,40 +684,47 @@ list("key"=/obj/item/wrench, "backkey"=/obj/item/crowbar, "desc"="Internal armor is installed."), - //7 list("key"=/obj/item/stack/sheet/plasteel, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="The power cell is secured."), //8 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="The power cell is installed."), //9 - list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //10 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //11 + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //12 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //13 list("key"=/obj/item/circuitboard/mecha/ripley/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //12 + //14 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //13 + //15 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //14 + //16 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //15 + //17 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -669,24 +738,24 @@ //TODO: better messages. switch(index) - if(15) + if(18) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "fireripley1" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "fireripley2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "fireripley0" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "fireripley3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "fireripley1" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "fireripley4" @@ -695,7 +764,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "fireripley2" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -703,7 +772,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "fireripley3" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "fireripley6" @@ -711,7 +780,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "fireripley4" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -719,7 +788,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "fireripley5" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "fireripley8" @@ -727,64 +796,82 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "fireripley6" - if(7) + if(10) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "fireripley9" else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "fireripley7" - - if(6) + if(9) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "fireripley10" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "fireripley8" + if(8) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "fireripley11" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "fireripley9" + if(7) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "fireripley10" + holder.icon_state = "fireripley12" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "fireripley8" - if(5) + holder.icon_state = "fireripley10" + if(6) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "fireripley11" + holder.icon_state = "fireripley13" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "fireripley9" - if(4) + holder.icon_state = "fireripley11" + if(5) if(diff==FORWARD) user.visible_message("[user] starts to install the external armor layer to the [holder].", "You install the external armor layer to the [holder].") - holder.icon_state = "fireripley12" + holder.icon_state = "fireripley14" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "fireripley10" - if(3) + holder.icon_state = "fireripley12" + if(4) if(diff==FORWARD) user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") - holder.icon_state = "fireripley13" + holder.icon_state = "fireripley15" else user.visible_message("[user] removes the external armor from the [holder].", "You remove the external armor from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "fireripley11" - if(2) + holder.icon_state = "fireripley13" + if(3) if(diff==FORWARD) user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") - holder.icon_state = "fireripley14" + holder.icon_state = "fireripley16" else user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "fireripley12" - if(1) + holder.icon_state = "fireripley14" + if(2) if(diff==FORWARD) user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") - holder.icon_state = "fireripley13" + holder.icon_state = "fireripley15" return 1 -/datum/construction/reversible/mecha/firefighter/spawn_result() +/datum/construction/reversible/mecha/firefighter/spawn_mecha_result() ..() SSblackbox.inc("mecha_firefighter_created",1) return @@ -818,19 +905,23 @@ /datum/construction/mecha/honker - result = "/obj/mecha/combat/honker" - steps = list(list("key"=/obj/item/bikehorn), //1 + result = /obj/mecha/combat/honker + steps = list( + list("desc"="You shouldn't be able to see this."), //0, note steps in the construction path are +1 to the ones here + list("key"=/obj/item/bikehorn), //1 list("key"=/obj/item/clothing/shoes/clown_shoes), //2 list("key"=/obj/item/bikehorn), //3 list("key"=/obj/item/clothing/mask/gas/clown_hat), //4 list("key"=/obj/item/bikehorn), //5 - list("key"=/obj/item/circuitboard/mecha/honker/targeting), //6 + list("key"=/obj/item/stock_parts/cell), //6 list("key"=/obj/item/bikehorn), //7 - list("key"=/obj/item/circuitboard/mecha/honker/peripherals), //8 + list("key"=/obj/item/circuitboard/mecha/honker/targeting), //8 list("key"=/obj/item/bikehorn), //9 - list("key"=/obj/item/circuitboard/mecha/honker/main), //10 + list("key"=/obj/item/circuitboard/mecha/honker/peripherals), //10 list("key"=/obj/item/bikehorn), //11 - ) + list("key"=/obj/item/circuitboard/mecha/honker/main), //12 + list("key"=/obj/item/bikehorn), //13 + ) /datum/construction/mecha/honker/action(atom/used_atom,mob/user) return check_step(used_atom,user) @@ -842,27 +933,34 @@ if(istype(used_atom, /obj/item/bikehorn)) playsound(holder, 'sound/items/bikehorn.ogg', 50, 1) user.visible_message("HONK!") + if(step==2) + spawn_mecha_result() + //TODO: better messages. switch(step) - if(10) + if(13) user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].") qdel(used_atom) - if(8) + if(11) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) - if(6) + if(9) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) - if(4) + if(7) + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) + if(5) user.visible_message("[user] puts clown wig and mask on the [holder].", "You put clown wig and mask on the [holder].") qdel(used_atom) - if(2) + if(3) user.visible_message("[user] puts clown boots on the [holder].", "You put clown boots on the [holder].") qdel(used_atom) return 1 -/datum/construction/mecha/honker/spawn_result() +/datum/construction/mecha/honker/spawn_mecha_result() ..() SSblackbox.inc("mecha_honker_created",1) return @@ -895,10 +993,13 @@ return /datum/construction/reversible/mecha/durand - result = "/obj/mecha/combat/durand" + result = /obj/mecha/combat/durand steps = list( - //1 - list("key"=/obj/item/weldingtool, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //2 @@ -920,60 +1021,68 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Super capacitor is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Super capacitor is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/stock_parts/capacitor, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Phasic scanner module is secured."), + "desc"="Super capacitor is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Phasic scanner module is installed."), + "desc"="Super capacitor is installed."), //10 - list("key"=/obj/item/stock_parts/scanning_module, + list("key"=/obj/item/stock_parts/capacitor, "backkey"=/obj/item/screwdriver, - "desc"="Weapon control module is secured."), + "desc"="Phasic scanner module is secured."), //11 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Weapon control module is installed."), + "desc"="Phasic scanner module is installed."), //12 - list("key"=/obj/item/circuitboard/mecha/durand/targeting, + list("key"=/obj/item/stock_parts/scanning_module, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="Weapon control module is secured."), //13 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="Weapon control module is installed."), //14 - list("key"=/obj/item/circuitboard/mecha/durand/peripherals, + list("key"=/obj/item/circuitboard/mecha/durand/targeting, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //16 + list("key"=/obj/item/circuitboard/mecha/durand/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //17 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //18 list("key"=/obj/item/circuitboard/mecha/durand/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //17 + //19 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //18 + //20 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //19 + //21 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //20 + //22 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -988,24 +1097,24 @@ //TODO: better messages. switch(index) - if(20) + if(23) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "durand1" - if(19) + if(22) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "durand2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "durand0" - if(18) + if(21) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "durand3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "durand1" - if(17) + if(20) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "durand4" @@ -1014,7 +1123,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "durand2" - if(16) + if(19) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -1022,7 +1131,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "durand3" - if(15) + if(18) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "durand6" @@ -1030,7 +1139,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/durand/main(get_turf(holder)) holder.icon_state = "durand4" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -1038,7 +1147,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "durand5" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "durand8" @@ -1046,7 +1155,7 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/durand/peripherals(get_turf(holder)) holder.icon_state = "durand6" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) @@ -1054,7 +1163,7 @@ else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "durand7" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "durand10" @@ -1062,7 +1171,7 @@ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/circuitboard/mecha/durand/targeting(get_turf(holder)) holder.icon_state = "durand8" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs scanner module to the [holder].", "You install phasic scanner module to the [holder].") var/obj/item/I = used_atom @@ -1071,7 +1180,7 @@ else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "durand9" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") holder.icon_state = "durand12" @@ -1080,7 +1189,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "durand10" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom @@ -1089,7 +1198,7 @@ else user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") holder.icon_state = "durand11" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") holder.icon_state = "durand14" @@ -1098,64 +1207,80 @@ var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "durand12" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "durand15" else - user.visible_message("[user] unfastens the super capacitor.", "You unfasten the capacitor.") + user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") holder.icon_state = "durand13" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "durand16" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "durand14" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "durand17" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "durand15" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "durand16" + holder.icon_state = "durand18" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "durand14" - if(4) + holder.icon_state = "durand16" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "durand17" + holder.icon_state = "durand19" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "durand15" - if(3) + holder.icon_state = "durand17" + if(4) if(diff==FORWARD) user.visible_message("[user] installs Durand Armor Plates to the [holder].", "You install Durand Armor Plates to the [holder].") qdel(used_atom) - holder.icon_state = "durand18" + holder.icon_state = "durand20" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "durand16" - if(2) + holder.icon_state = "durand18" + if(3) if(diff==FORWARD) user.visible_message("[user] secures Durand Armor Plates.", "You secure Durand Armor Plates.") - holder.icon_state = "durand19" + holder.icon_state = "durand21" else user.visible_message("[user] pries Durand Armor Plates from the [holder].", "You pry Durand Armor Plates from the [holder].") new /obj/item/mecha_parts/part/durand_armor(get_turf(holder)) - holder.icon_state = "durand17" - if(1) + holder.icon_state = "durand19" + if(2) if(diff==FORWARD) user.visible_message("[user] welds Durand Armor Plates to the [holder].", "You weld Durand Armor Plates to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens Durand Armor Plates.", "You unfasten Durand Armor Plates.") - holder.icon_state = "durand18" + holder.icon_state = "durand20" return 1 -/datum/construction/reversible/mecha/durand/spawn_result() - var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder.contents) - qdel(holder) +/datum/construction/reversible/mecha/durand/spawn_mecha_result() + ..() SSblackbox.inc("mecha_durand_created",1) return //PHAZON /datum/construction/mecha/phazon_chassis - result = "/obj/mecha/combat/phazon" steps = list(list("key"=/obj/item/mecha_parts/part/phazon_torso), //1 list("key"=/obj/item/mecha_parts/part/phazon_left_arm), //2 list("key"=/obj/item/mecha_parts/part/phazon_right_arm), //3 @@ -1183,15 +1308,17 @@ return /datum/construction/reversible/mecha/phazon - result = "/obj/mecha/combat/phazon" + result = /obj/mecha/combat/phazon steps = list( - //1 - list("key"=/obj/item/device/assembly/signaler/anomaly, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/device/assembly/signaler/anomaly, "backkey"=null, //Cannot remove the anomaly core once it's in "desc"="Anomaly core socket is open and awaiting connection."), - - //2 - list("key"=/obj/item/weldingtool, + //2 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //3 @@ -1213,72 +1340,80 @@ //7 list("key"=/obj/item/stack/sheet/plasteel, "backkey"=/obj/item/screwdriver, - "desc"="The bluespace crystal is engaged."), + "desc"="The power cell is secured."), //8 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="The power cell is installed."), + //9 + list("key"=/obj/item/stock_parts/cell, + "backkey"=/obj/item/screwdriver, + "desc"="The bluespace crystal is engaged."), + //10 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wirecutters, "desc"="The bluespace crystal is connected."), - //9 + //11 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/crowbar, "desc"="The bluespace crystal is installed."), - //10 + //12 list("key"=/obj/item/ore/bluespace_crystal, "backkey"=/obj/item/screwdriver, "desc"="Super capacitor is secured."), - //12 - list("key"=/obj/item/screwdriver, - "backkey"=/obj/item/crowbar, - "desc"="Super capacitor is installed."), - //12 - list("key"=/obj/item/stock_parts/capacitor, - "backkey"=/obj/item/screwdriver, - "desc"="Phasic scanner module is secured."), //13 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Phasic scanner module is installed."), + "desc"="Super capacitor is installed."), //14 - list("key"=/obj/item/stock_parts/scanning_module, + list("key"=/obj/item/stock_parts/capacitor, "backkey"=/obj/item/screwdriver, - "desc"="Weapon control module is secured."), + "desc"="Phasic scanner module is secured."), //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Weapon control is installed."), + "desc"="Phasic scanner module is installed."), //16 - list("key"=/obj/item/circuitboard/mecha/phazon/targeting, + list("key"=/obj/item/stock_parts/scanning_module, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="Weapon control module is secured."), //17 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed"), + "desc"="Weapon control is installed."), //18 - list("key"=/obj/item/circuitboard/mecha/phazon/peripherals, + list("key"=/obj/item/circuitboard/mecha/phazon/targeting, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //19 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed"), //20 + list("key"=/obj/item/circuitboard/mecha/phazon/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //21 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //22 list("key"=/obj/item/circuitboard/mecha/phazon/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //21 + //23 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //22 + //24 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //23 + //25 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //24 + //26 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -1293,24 +1428,24 @@ //TODO: better messages. switch(index) - if(24) + if(27) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "phazon1" - if(23) + if(26) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "phazon2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "phazon0" - if(22) + if(25) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "phazon3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "phazon1" - if(21) + if(24) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "phazon4" @@ -1319,7 +1454,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "phazon2" - if(20) + if(23) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -1327,7 +1462,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "phazon3" - if(19) + if(22) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "phazon6" @@ -1335,7 +1470,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/phazon/main(get_turf(holder)) holder.icon_state = "phazon4" - if(18) + if(21) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -1343,7 +1478,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "phazon5" - if(17) + if(20) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "phazon8" @@ -1351,7 +1486,7 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/phazon/peripherals(get_turf(holder)) holder.icon_state = "phazon6" - if(16) + if(19) if(diff==FORWARD) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) @@ -1359,7 +1494,7 @@ else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "phazon7" - if(15) + if(18) if(diff==FORWARD) user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "phazon10" @@ -1367,7 +1502,7 @@ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/circuitboard/mecha/phazon/targeting(get_turf(holder)) holder.icon_state = "phazon8" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] installs phasic scanner module to the [holder].", "You install scanner module to the [holder].") var/obj/item/I = used_atom @@ -1376,7 +1511,7 @@ else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "phazon9" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] secures the phasic scanner module.", "You secure the scanner module.") holder.icon_state = "phazon12" @@ -1385,7 +1520,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "phazon10" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] installs super capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom @@ -1394,7 +1529,7 @@ else user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the scanner module.") holder.icon_state = "phazon11" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] secures the super capacitor.", "You secure the capacitor.") holder.icon_state = "phazon14" @@ -1403,7 +1538,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "phazon12" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs the bluespace crystal.", "You install the bluespace crystal.") qdel(used_atom) @@ -1411,7 +1546,7 @@ else user.visible_message("[user] unsecures the super capacitor from the [holder].", "You unsecure the capacitor from the [holder].") holder.icon_state = "phazon13" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] connects the bluespace crystal.", "You connect the bluespace crystal.") holder.icon_state = "phazon16" @@ -1419,68 +1554,85 @@ user.visible_message("[user] removes the bluespace crystal from the [holder].", "You remove the bluespace crystal from the [holder].") new /obj/item/ore/bluespace_crystal(get_turf(holder)) holder.icon_state = "phazon14" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] engages the bluespace crystal.", "You engage the bluespace crystal.") holder.icon_state = "phazon17" else user.visible_message("[user] disconnects the bluespace crystal from the [holder].", "You disconnect the bluespace crystal from the [holder].") holder.icon_state = "phazon15" - if(7) + if(10) if(diff==FORWARD) - user.visible_message("[user] installs the phase armor layer to the [holder].", "You install the phase armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "phazon18" else user.visible_message("[user] disengages the bluespace crystal.", "You disengage the bluespace crystal.") holder.icon_state = "phazon16" - if(6) + if(9) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "phazon19" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "phazon17" + if(8) + if(diff==FORWARD) + user.visible_message("[user] installs the phase armor layer to the [holder].", "You install the phase armor layer to the [holder].") + holder.icon_state = "phazon20" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "durand18" + if(7) if(diff==FORWARD) user.visible_message("[user] secures the phase armor layer.", "You secure the phase armor layer.") - holder.icon_state = "phazon19" + holder.icon_state = "phazon21" else user.visible_message("[user] pries the phase armor layer from the [holder].", "You pry the phase armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "phazon17" - if(5) + holder.icon_state = "phazon19" + if(6) if(diff==FORWARD) user.visible_message("[user] welds the phase armor layer to the [holder].", "You weld the phase armor layer to the [holder].") - holder.icon_state = "phazon20" + holder.icon_state = "phazon22" else user.visible_message("[user] unfastens the phase armor layer.", "You unfasten the phase armor layer.") - holder.icon_state = "phazon18" - if(4) + holder.icon_state = "phazon20" + if(5) if(diff==FORWARD) user.visible_message("[user] installs Phazon Armor Plates to the [holder].", "You install Phazon Armor Plates to the [holder].") qdel(used_atom) - holder.icon_state = "phazon21" + holder.icon_state = "phazon23" else user.visible_message("[user] cuts phase armor layer from the [holder].", "You cut the phase armor layer from the [holder].") - holder.icon_state = "phazon19" - if(3) + holder.icon_state = "phazon21" + if(4) if(diff==FORWARD) user.visible_message("[user] secures Phazon Armor Plates.", "You secure Phazon Armor Plates.") - holder.icon_state = "phazon22" + holder.icon_state = "phazon24" else user.visible_message("[user] pries Phazon Armor Plates from the [holder].", "You pry Phazon Armor Plates from the [holder].") new /obj/item/mecha_parts/part/phazon_armor(get_turf(holder)) - holder.icon_state = "phazon20" - if(2) + holder.icon_state = "phazon22" + if(3) if(diff==FORWARD) user.visible_message("[user] welds Phazon Armor Plates to the [holder].", "You weld Phazon Armor Plates to the [holder].") else user.visible_message("[user] unfastens Phazon Armor Plates.", "You unfasten Phazon Armor Plates.") - holder.icon_state = "phazon21" - if(1) + holder.icon_state = "phazon23" + if(2) if(diff==FORWARD) user.visible_message("[user] carefully inserts the anomaly core into \the [holder] and secures it.", "You slowly place the anomaly core into its socket and close its chamber.") qdel(used_atom) + spawn_mecha_result() return 1 -/datum/construction/reversible/mecha/phazon/spawn_result() - var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder.contents) - qdel(holder) +/datum/construction/reversible/mecha/phazon/spawn_mecha_result() + ..() SSblackbox.inc("mecha_phazon_created",1) return @@ -1515,13 +1667,16 @@ /datum/construction/reversible/mecha/odysseus - result = "/obj/mecha/medical/odysseus" + result = /obj/mecha/medical/odysseus steps = list( - //1 - list("key"=/obj/item/weldingtool, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), - //2 + //2 list("key"=/obj/item/wrench, "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), @@ -1540,36 +1695,44 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //10 + list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //11 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //12 list("key"=/obj/item/circuitboard/mecha/odysseus/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //11 + //13 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //12 + //14 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //13 + //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //14 + //16 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -1583,24 +1746,24 @@ //TODO: better messages. switch(index) - if(14) + if(17) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "odysseus1" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "odysseus2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "odysseus0" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "odysseus3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "odysseus1" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "odysseus4" @@ -1609,7 +1772,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "odysseus2" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -1617,7 +1780,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "odysseus3" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "odysseus6" @@ -1625,7 +1788,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/odysseus/main(get_turf(holder)) holder.icon_state = "odysseus4" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -1633,7 +1796,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "odysseus5" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "odysseus8" @@ -1641,56 +1804,74 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/odysseus/peripherals(get_turf(holder)) holder.icon_state = "odysseus6" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "odysseus9" else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "odysseus7" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "odysseus10" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "odysseus8" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "odysseus11" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "odysseus9" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "odysseus10" + holder.icon_state = "odysseus12" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "odysseus8" - if(4) + holder.icon_state = "odysseus10" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "odysseus11" + holder.icon_state = "odysseus13" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "odysseus9" - if(3) + holder.icon_state = "odysseus11" + if(4) if(diff==FORWARD) user.visible_message("[user] installs [used_atom] layer to the [holder].", "You install the external reinforced armor layer to the [holder].") - holder.icon_state = "odysseus12" + holder.icon_state = "odysseus14" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "odysseus10" - if(2) + holder.icon_state = "odysseus12" + if(3) if(diff==FORWARD) user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") - holder.icon_state = "odysseus13" + holder.icon_state = "odysseus15" else var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 user.visible_message("[user] pries [MS] from the [holder].", "You pry [MS] from the [holder].") - holder.icon_state = "odysseus11" - if(1) + holder.icon_state = "odysseus13" + if(2) if(diff==FORWARD) user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") - holder.icon_state = "odysseus14" + spawn_mecha_result() else user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") - holder.icon_state = "odysseus12" + holder.icon_state = "odysseus14" return 1 -/datum/construction/reversible/mecha/odysseus/spawn_result() +/datum/construction/reversible/mecha/odysseus/spawn_mecha_result() ..() SSblackbox.inc("mecha_odysseus_created",1) return diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 5b9aa28174c..431768500e6 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -92,15 +92,15 @@ qdel(src) /obj/item/mecha_parts/mecha_tracking/Destroy() - if(istype(loc, /obj/mecha)) + if(ismecha(loc)) var/obj/mecha/M = loc if(src in M.trackers) M.trackers -= src return ..() /obj/item/mecha_parts/mecha_tracking/proc/in_mecha() - if(istype(src.loc, /obj/mecha)) - return src.loc + if(ismecha(loc)) + return loc return 0 /obj/item/mecha_parts/mecha_tracking/proc/shock() @@ -110,7 +110,7 @@ qdel(src) /obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log() - if(!istype(loc, /obj/mecha)) + if(!ismecha(loc)) return 0 var/obj/mecha/M = src.loc return M.get_log_html() diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index f09ae53e316..3f32b18178c 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -283,13 +283,13 @@ var/area/A = get_area(location) var/where = "[A.name] | [location.x], [location.y]" - var/whereLink = "[where]" + var/whereLink = "[where]" if(carry.my_atom.fingerprintslast) var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast) var/more = "" if(M) - more = "(?) (FLW) " + more = "(?) (FLW) " message_admins("Smoke: ([whereLink])[contained]. Key: [carry.my_atom.fingerprintslast][more].", 0, 1) log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].") else diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index e0cec3af026..30aa68dcadf 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -157,10 +157,26 @@ /obj/effect/landmark/start/wizard name = "wizard" -/obj/effect/landmark/start/wizard/Initialize(mapload) +/obj/effect/landmark/start/wizard/Initialize() ..() GLOB.wizardstart += loc - qdel(src) + return INITIALIZE_HINT_QDEL + +/obj/effect/landmark/start/nukeop + name = "nukeop" + +/obj/effect/landmark/start/nukeop/Initialize() + ..() + GLOB.nukeop_start += loc + return INITIALIZE_HINT_QDEL + +/obj/effect/landmark/start/nukeop_leader + name = "nukeop leader" + +/obj/effect/landmark/start/nukeop_leader/Initialize() + ..() + GLOB.nukeop_leader_start += loc + return INITIALIZE_HINT_QDEL /obj/effect/landmark/start/new_player name = "New Player" @@ -173,7 +189,7 @@ /obj/effect/landmark/start/new_player/Initialize(mapload) ..() - qdel(src) + return INITIALIZE_HINT_QDEL @@ -183,7 +199,7 @@ /obj/effect/landmark/latejoin/Initialize(mapload) ..() SSjob.latejoin_trackers += loc - qdel(src) + return INITIALIZE_HINT_QDEL // carp. /obj/effect/landmark/carpspawn @@ -205,23 +221,6 @@ /obj/effect/landmark/tripai name = "tripai" -// marauder entry (XXX WTF IS MAURADER ENTRY???) - -/obj/effect/landmark/marauder_entry - name = "Marauder Entry" - -// syndicate breach area (XXX I DON'T KNOW WHAT THIS IS EITHER) - -/obj/effect/landmark/syndicate_breach_area - name = "Syndicate Breach Area" - -// teleport scroll landmark, XXX DOES THIS DO ANYTHING? -/obj/effect/landmark/teleport_scroll - name = "Teleport-Scroll" - -/obj/effect/landmark/syndicate_spawn - name = "Syndicate-Spawn" - // xenos. /obj/effect/landmark/xeno_spawn name = "xeno_spawn" @@ -229,7 +228,7 @@ /obj/effect/landmark/xeno_spawn/Initialize(mapload) ..() GLOB.xeno_spawn += loc - qdel(src) + return INITIALIZE_HINT_QDEL // blobs. /obj/effect/landmark/blobstart @@ -238,7 +237,7 @@ /obj/effect/landmark/blobstart/Initialize(mapload) ..() GLOB.blobstart += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/secequipment name = "secequipment" @@ -246,7 +245,7 @@ /obj/effect/landmark/secequipment/Initialize(mapload) ..() GLOB.secequipment += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/prisonwarp name = "prisonwarp" @@ -254,15 +253,15 @@ /obj/effect/landmark/prisonwarp/Initialize(mapload) ..() GLOB.prisonwarp += loc - qdel(src) - + return INITIALIZE_HINT_QDEL + /obj/effect/landmark/ert_spawn name = "Emergencyresponseteam" /obj/effect/landmark/ert_spawn/Initialize(mapload) ..() GLOB.emergencyresponseteamspawn += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/holding_facility name = "Holding Facility" @@ -270,7 +269,7 @@ /obj/effect/landmark/holding_facility/Initialize(mapload) ..() GLOB.holdingfacility += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/observe name = "tdomeobserve" @@ -278,7 +277,7 @@ /obj/effect/landmark/thunderdome/observe/Initialize(mapload) ..() GLOB.tdomeobserve += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/one name = "tdome1" @@ -286,7 +285,7 @@ /obj/effect/landmark/thunderdome/one/Initialize(mapload) ..() GLOB.tdome1 += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/two name = "tdome2" @@ -294,7 +293,7 @@ /obj/effect/landmark/thunderdome/two/Initialize(mapload) ..() GLOB.tdome2 += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/admin name = "tdomeadmin" @@ -302,6 +301,25 @@ /obj/effect/landmark/thunderdome/admin/Initialize(mapload) ..() GLOB.tdomeadmin += loc + return INITIALIZE_HINT_QDEL + +//Servant spawn locations +/obj/effect/landmark/servant_of_ratvar + name = "servant of ratvar spawn" + +/obj/effect/landmark/servant_of_ratvar/Initialize(mapload) + ..() + GLOB.servant_spawns += loc + qdel(src) + +//City of Cogs entrances +/obj/effect/landmark/city_of_cogs + name = "city of cogs entrance" + icon_state = "x4" + +/obj/effect/landmark/city_of_cogs/Initialize(mapload) + ..() + GLOB.city_of_cogs_spawns += loc qdel(src) //generic event spawns diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index f4155cfc926..6cc4200a15b 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -40,10 +40,10 @@ /obj/effect/portal/attackby(obj/item/W, mob/user, params) if(user && Adjacent(user)) - teleport(user) + user.forceMove(get_turf(src)) /obj/effect/portal/Crossed(atom/movable/AM, oldloc) - if(get_turf(oldloc) == get_turf(linked)) + if(linked && (get_turf(oldloc) == get_turf(linked))) return ..() if(!teleport(AM)) return ..() @@ -53,7 +53,7 @@ /obj/effect/portal/attack_hand(mob/user) if(Adjacent(user)) - teleport(user) + user.forceMove(get_turf(src)) /obj/effect/portal/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override) . = ..() @@ -125,7 +125,7 @@ return ..() /obj/effect/portal/proc/teleport(atom/movable/M) - if(!istype(M) || istype(M, /obj/effect) || (istype(M, /obj/mecha) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport. + if(!istype(M) || istype(M, /obj/effect) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport. return var/turf/real_target = get_link_target_turf() if(!istype(real_target)) diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm index 62471505d0e..70128be7ee1 100644 --- a/code/game/objects/effects/proximity.dm +++ b/code/game/objects/effects/proximity.dm @@ -33,7 +33,7 @@ if(!force_rebuild && range == current_range) return FALSE . = TRUE - + current_range = range var/list/checkers_local = checkers diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index cfe8761b84c..be32f0df199 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -12,7 +12,7 @@ var/turf/T = get_turf(src) for(var/path in items) new path(T) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/spawner/bundle/costume/chicken name = "chicken costume spawner" diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 94cabaf6e19..21843aee3e9 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -18,7 +18,7 @@ if(lootspawn) new lootspawn(T) lootcount-- - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/spawner/lootdrop/armory_contraband name = "armory contraband gun spawner" @@ -89,7 +89,7 @@ /obj/effect/spawner/lootdrop/maintenance/Initialize(mapload) loot = GLOB.maintenance_loot - ..() + . = ..() /obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF! @@ -130,7 +130,7 @@ loot = list() for(var/path in subtypesof(/obj/effect/spawner/bundle/costume)) loot[path] = TRUE - ..() + . = ..() // Minor lootdrops follow diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index a452dae7497..593c953adf1 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -17,4 +17,4 @@ log_game("An alien egg has been delivered to [A] at [COORD(T)]") var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen." SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time)) - qdel(src) + return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 84c75270f95..6722ffd89be 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -52,6 +52,7 @@ icon_state = "eggs" var/amount_grown = 0 var/player_spiders = 0 + var/directive = "" //Message from the mother var/poison_type = "toxin" var/poison_per_bite = 5 var/list/faction = list("spiders") @@ -71,6 +72,7 @@ S.poison_type = poison_type S.poison_per_bite = poison_per_bite S.faction = faction.Copy() + S.directive = directive if(player_spiders) S.player_spiders = 1 qdel(src) @@ -87,10 +89,15 @@ var/obj/machinery/atmospherics/components/unary/vent_pump/entry_vent var/travelling_in_vent = 0 var/player_spiders = 0 + var/directive = "" //Message from the mother var/poison_type = "toxin" var/poison_per_bite = 5 var/list/faction = list("spiders") +/obj/structure/spider/spiderling/Destroy() + new/obj/item/reagent_containers/food/snacks/spiderling(get_turf(src)) + . = ..() + /obj/structure/spider/spiderling/Initialize() pixel_x = rand(6,-6) pixel_y = rand(6,-6) @@ -103,6 +110,15 @@ /obj/structure/spider/spiderling/nurse grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse +/obj/structure/spider/spiderling/midwife + grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife + +/obj/structure/spider/spiderling/viper + grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper + +/obj/structure/spider/spiderling/tarantula + grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/tarantula + /obj/structure/spider/spiderling/Collide(atom/user) if(istype(user, /obj/structure/table)) src.loc = user.loc @@ -171,11 +187,15 @@ amount_grown += rand(0,2) if(amount_grown >= 100) if(!grow_as) - grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse) + if(prob(3)) + grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider/tarantula, /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper, /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife) + else + grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse) var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(src.loc) S.poison_per_bite = poison_per_bite S.poison_type = poison_type S.faction = faction.Copy() + S.directive = directive if(player_spiders) S.playable_spider = TRUE notify_ghosts("Spider [S.name] can be controlled", null, enter_link="(Click to play)", source=S, action=NOTIFY_ATTACK) @@ -194,12 +214,12 @@ . = ..() /obj/structure/spider/cocoon/container_resist(mob/living/user) - var/breakout_time = 1 + var/breakout_time = 600 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)") + to_chat(user, "You struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)") visible_message("You see something struggling and writhing in \the [src]!") - if(do_after(user,(breakout_time*60*10), target = src)) + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src) return qdel(src) diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index b1068b00384..95ec2b31bc8 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -199,3 +199,57 @@ duration = 80 icon_state = "sigilactiveoverlay" alpha = 0 + +/obj/effect/temp_visual/steam + name = "steam" + desc = "Steam! It's hot. It also serves as a game distribution platform." + icon_state = "smoke" + duration = 15 + +/obj/effect/temp_visual/steam/Initialize(mapload, steam_direction) + . = ..() + setDir(steam_direction) + var/x_offset = 0 + var/y_offset = 0 + switch(dir) + if(NORTH) + y_offset = 8 + if(EAST) + x_offset = 4 + y_offset = 4 + if(SOUTH) + y_offset = 2 + if(WEST) + x_offset = -4 + y_offset = 4 + animate(src, pixel_x = x_offset, pixel_y = y_offset, alpha = 50, time = 15) + +/obj/effect/temp_visual/steam_release + name = "all the steam" + +/obj/effect/temp_visual/steam_release/Initialize() + ..() + for(var/V in GLOB.cardinals) + var/turf/T = get_step(src, V) + new/obj/effect/temp_visual/steam(T, V) + return INITIALIZE_HINT_QDEL + +//Foreshadows a servant warping in. +/obj/effect/temp_visual/ratvar/warp_marker + name = "illuminant marker" + desc = "A silhouette of dim light. It's getting brighter!" + resistance_flags = INDESTRUCTIBLE + icon = 'icons/effects/genetics.dmi' + icon_state = "servitude" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE + alpha = 0 + light_color = "#FFE48E" + light_range = 2 + light_power = 0.7 + duration = 55 + +/obj/effect/temp_visual/ratvar/warp_marker/Initialize(mapload, mob/living/servant) + . = ..() + animate(src, alpha = 255, time = 50) + diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index b0049fc3fdf..376bb92fd9b 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -213,7 +213,7 @@ /obj/effect/temp_visual/fire icon = 'icons/effects/fire.dmi' icon_state = "3" - light_range = 3 + light_range = LIGHT_RANGE_FIRE light_color = LIGHT_COLOR_FIRE duration = 10 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c2b50f98cf8..c9b766573db 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -61,6 +61,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/equip_delay_other = 20 //In deciseconds, how long an item takes to put on another person var/strip_delay = 40 //In deciseconds, how long an item takes to remove from another person var/breakouttime = 0 + var/being_removed = FALSE var/list/materials var/origin_tech = null //Used by R&D to determine what research bonuses it grants. var/needs_permit = 0 //Used by security bots to determine if this item is safe for public use. diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index fd7a87ac8ce..45788b77b9a 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -54,7 +54,7 @@ AI MODULES for(var/mylaw in lawlist) if(mylaw != "") tot_laws++ - if(tot_laws > config.silicon_max_law_amount && !bypass_law_amt_check)//allows certain boards to avoid this check, eg: reset + if(tot_laws > CONFIG_GET(number/silicon_max_law_amount) && !bypass_law_amt_check)//allows certain boards to avoid this check, eg: reset to_chat(user, "Not enough memory allocated to [law_datum.owner ? law_datum.owner : "the AI core"]'s law processor to handle this amount of laws.") message_admins("[key_name_admin(user)] tried to upload laws to [law_datum.owner ? key_name_admin(law_datum.owner) : "an AI core"] that would exceed the law cap.") overflow = TRUE diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 4c4c5378596..a2f80a94a9f 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -31,7 +31,7 @@ obj/item/construction var/no_ammo_message = "The \'Low Ammo\' light on the device blinks yellow." /obj/item/construction/Initialize() - ..() + . = ..() desc = "A [src]. It currently holds [matter]/[max_matter] matter-units." spark_system = new /datum/effect_system/spark_spread spark_system.set_up(5, 0, src) @@ -123,6 +123,7 @@ obj/item/construction lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' max_matter = 160 + flags_2 = NO_MAT_REDEMPTION_2 var/mode = 1 var/canRturf = 0 var/ranged = FALSE @@ -144,7 +145,7 @@ obj/item/construction set category = "Object" set src in usr // What does this do? - var window_type_name + var/window_type_name if (window_type == /obj/structure/window/fulltile) window_type = /obj/structure/window/reinforced/fulltile @@ -240,11 +241,11 @@ obj/item/construction set category = "Object" set src in usr - var airlockcat = input(usr, "Select whether the airlock is solid or glass.") in list("Solid", "Glass") + var/airlockcat = input(usr, "Select whether the airlock is solid or glass.") in list("Solid", "Glass") switch(airlockcat) if("Solid") if(advanced_airlock_setting == 1) - var airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security") + var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security") switch(airlockpaint) if("Default") airlock_type = /obj/machinery/door/airlock @@ -275,7 +276,7 @@ obj/item/construction if("Glass") if(advanced_airlock_setting == 1) - var airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining") + var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining") switch(airlockpaint) if("Default") airlock_type = /obj/machinery/door/airlock/glass diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 4aa37253c4e..15abe72a524 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -79,13 +79,14 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( //find these defines in code\game\machinery\pipe\consruction.dm GLOBAL_LIST_INIT(RPD_recipes, list( - "Regular Pipes" = list( + "Pipes" = list( "Pipe" = new /datum/pipe_info(PIPE_SIMPLE, 1, PIPE_BENDABLE), //"Bent Pipe" = new /datum/pipe_info(PIPE_SIMPLE, 5, PIPE_BENT), "Manifold" = new /datum/pipe_info(PIPE_MANIFOLD, 1, PIPE_TRINARY), "Manual Valve" = new /datum/pipe_info(PIPE_MVALVE, 1, PIPE_BINARY), "Digital Valve" = new /datum/pipe_info(PIPE_DVALVE, 1, PIPE_BINARY), "4-Way Manifold" = new /datum/pipe_info(PIPE_4WAYMANIFOLD, 1, PIPE_QUAD), + "Bluespace Pipe" = new /datum/pipe_info(PIPE_BLUESPACE, 1, PIPE_UNARY), ), "Devices"=list( "Connector" = new /datum/pipe_info(PIPE_CONNECTOR, 1, PIPE_UNARY), diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index ac02746462f..8b7acabcce1 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -31,6 +31,7 @@ icon_state = "bluebodybag_folded" unfoldedbag_path = /obj/structure/closet/body_bag/bluespace w_class = WEIGHT_CLASS_SMALL + flags_2 = NO_MAT_REDEMPTION_2 origin_tech = "bluespace=4;materials=4;plasmatech=4" /obj/item/bodybag/bluespace/examine(mob/user) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index c7104588f30..2d14c7994fa 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -160,7 +160,7 @@ update_label("John Doe", "Clowny") var/anyone = FALSE //Can anyone forge the ID or just syndicate? /obj/item/card/id/syndicate/Initialize() - ..() + . = ..() var/datum/action/item_action/chameleon/change/chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/card/id chameleon_action.chameleon_name = "ID Card" @@ -180,14 +180,14 @@ update_label("John Doe", "Clowny") if(isliving(user) && user.mind) if(user.mind.special_role || anyone) if(alert(user, "Action", "Agent ID", "Show", "Forge") == "Forge") - var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26) + var/t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26) if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/dead/new_player/prefrences.dm if (t) alert("Invalid name.") return registered_name = t - var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN) + var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN) if(!u) registered_name = "" return @@ -220,7 +220,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/captains_spare/Initialize() var/datum/job/captain/J = new/datum/job/captain access = J.get_access() - ..() + . = ..() /obj/item/card/id/centcom name = "\improper CentCom ID" @@ -231,7 +231,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/centcom/Initialize() access = get_all_centcom_access() - ..() + . = ..() /obj/item/card/id/ert name = "\improper CentCom ID" @@ -242,7 +242,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Initialize() access = get_all_accesses()+get_ert_access("commander")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Security registered_name = "Security Response Officer" @@ -250,7 +250,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Security/Initialize() access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Engineer registered_name = "Engineer Response Officer" @@ -258,7 +258,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Engineer/Initialize() access = get_all_accesses()+get_ert_access("eng")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Medical registered_name = "Medical Response Officer" @@ -266,7 +266,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Medical/Initialize() access = get_all_accesses()+get_ert_access("med")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/prisoner name = "prisoner ID card" diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 3edb5be0909..ee7a91140c0 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -59,7 +59,7 @@ to_chat(user, "Your name has been sent to your employers for approval.") // Autoapproves after a certain time response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) - to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [approval_time / 10] seconds). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") + to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") /obj/item/station_charter/proc/reject_proposed(user) if(!user) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 15a7c1ab0ba..f04f8d44414 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -234,6 +234,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/attack(mob/living/carbon/M, mob/living/carbon/user) if(!istype(M)) return ..() + if(M.on_fire && !lit) + light("[user] lights [src] with [M]'s burning body. What a cold-blooded badass.") + return var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(lit && cig && user.a_intent == INTENT_HELP) if(cig.lit) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index f78da3b0498..39f75307441 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -125,6 +125,9 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M var/location = user.zone_selected + if((location in list("eyes", "mouth", "head")) && !H.get_bodypart("head")) + to_chat(user, "[H] doesn't have a head!") + return if(location == "mouth") if(!(FACEHAIR in H.dna.species.species_traits)) to_chat(user, "There is no facial hair to shave!") diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 803e62d05d3..4dcd9666889 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -72,16 +72,15 @@ user.visible_message("[user] is jamming [src] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!") return (BRUTELOSS|OXYLOSS) -/obj/item/toy/crayon/New() - ..() +/obj/item/toy/crayon/Initialize() + . = ..() // Makes crayons identifiable in things like grinders if(name == "crayon") name = "[item_color] crayon" - if(config) - if(config.mutant_races == 1) - graffiti |= "antilizard" - graffiti |= "prolizard" + if(CONFIG_GET(flag/join_with_mutant_race)) + graffiti |= "antilizard" + graffiti |= "prolizard" all_drawables = graffiti + letters + numerals + oriented + runes + graffiti_large_h drawtype = pick(all_drawables) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 721914966fb..cad7389f632 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -26,6 +26,18 @@ GLOBAL_LIST_EMPTY(PDAs) var/obj/item/cartridge/cartridge = null //current cartridge var/mode = 0 //Controls what menu the PDA will display. 0 is hub; the rest are either built in or based on cartridge. var/icon_alert = "pda-r" //Icon to be overlayed for message alerts. Taken from the pda icon file. + var/font_index = 0 //This int tells DM which font is currently selected and lets DM know when the last font has been selected so that it can cycle back to the first font when "toggle font" is pressed again. + var/font_mode = "font-family:monospace;" //The currently selected font. + var/background_color = "#808000" //The currently selected background color. + + #define FONT_MONO "font-family:monospace;" + #define FONT_SHARE "font-family:\"Share Tech Mono\", monospace;letter-spacing:0px;" + #define FONT_ORBITRON "font-family:\"Orbitron\", monospace;letter-spacing:0px; font-size:15px" + #define FONT_VT "font-family:\"VT323\", monospace;letter-spacing:1px;" + #define MODE_MONO 0 + #define MODE_SHARE 1 + #define MODE_ORBITRON 2 + #define MODE_VT 3 //Secondary variables var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner. @@ -46,6 +58,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/detonatable = TRUE // Can the PDA be blown up? var/hidden = 0 // Is the PDA hidden from the PDA list? var/emped = 0 + var/equipped = FALSE //used here to determine if this is the first time its been picked up var/obj/item/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above @@ -58,6 +71,13 @@ GLOBAL_LIST_EMPTY(PDAs) var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above. var/overlays_x_offset = 0 //x offset to use for certain overlays +/obj/item/device/pda/examine(mob/user) + ..() + if(!id && !inserted_item) + return + else + to_chat(user, "Alt-click to remove contents.") + /obj/item/device/pda/Initialize() . = ..() if(fon) @@ -72,6 +92,27 @@ GLOBAL_LIST_EMPTY(PDAs) inserted_item = new /obj/item/pen(src) update_icon() +/obj/item/device/pda/equipped(mob/user, slot) + if(!equipped) + if(user.client) + switch(user.client.prefs.pda_style) + if(MONO) + font_index = MODE_MONO + font_mode = FONT_MONO + if(SHARE) + font_index = MODE_SHARE + font_mode = FONT_SHARE + if(ORBITRON) + font_index = MODE_ORBITRON + font_mode = FONT_ORBITRON + if(VT) + font_index = MODE_VT + font_mode = FONT_VT + else + font_index = MODE_MONO + font_mode = FONT_MONO + equipped = TRUE + /obj/item/device/pda/proc/update_label() name = "PDA-[owner] ([ownjob])" //Name generalisation @@ -125,7 +166,8 @@ GLOBAL_LIST_EMPTY(PDAs) hidden_uplink.interact(user) return - var/dat = "Personal Data Assistant "
+ var/dat = "Personal Data Assistant "
+
dat += "
Refresh"
@@ -134,6 +176,12 @@ GLOBAL_LIST_EMPTY(PDAs)
if (mode)
dat += " | 
Return"
+ if (mode == 0)
+ dat += ""
+
dat += "
" if (!owner) @@ -311,6 +359,24 @@ GLOBAL_LIST_EMPTY(PDAs) //BASIC FUNCTIONS=================================== if("Refresh")//Refresh, goes to the end of the proc. + + if ("Toggle_Font") + //CODE REVISION 2 + font_index = (font_index + 1) % 4 + + switch(font_index) + if (MODE_MONO) + font_mode = FONT_MONO + if (MODE_SHARE) + font_mode = FONT_SHARE + if (MODE_ORBITRON) + font_mode = FONT_ORBITRON + if (MODE_VT) + font_mode = FONT_VT + if ("Change_Color") + var/new_color = input("Please enter a color name or hex value (Default is \'#808000\').")as color + background_color = new_color + if("Return")//Return if(mode<=9) mode = 0 @@ -404,7 +470,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (in_range(src, U) && loc == U) if (mode == 1 && n) note = n - notehtml = parsepencode(n, U, SIGNFONT) + notehtml = parsemarkdown(n, U) notescanned = 0 else U << browse(null, "window=pda") @@ -542,7 +608,7 @@ GLOBAL_LIST_EMPTY(PDAs) P.show_recieved_message(msg,src) if(!multiple) show_to_ghosts(user,msg) - log_talk(user,"[key_name(user)] (PDA: [name]) sent \"[message]\" to [key_name(P,null,TRUE)]",LOGPDA) + log_talk(user,"[key_name(user)] (PDA: [initial(name)]) sent \"[message]\" to [key_name(P,null,TRUE)]",LOGPDA) else if(!multiple) to_chat(user, "ERROR: Server isn't responding.") @@ -552,7 +618,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(multiple) show_to_sender(last_sucessful_msg,1) show_to_ghosts(user,last_sucessful_msg,1) - log_talk(user,"[user] (PDA: [name]) sent \"[message]\" to Everyone",LOGPDA) + log_talk(user,"[user] (PDA: [initial(name)]) sent \"[message]\" to Everyone",LOGPDA) /obj/item/device/pda/proc/show_to_sender(datum/data_pda_msg/msg,multiple = 0) tnote += "→ To [multiple ? "Everyone" : msg.recipient]:
[msg.message][msg.get_photo_ref()]
" diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm new file mode 100644 index 00000000000..204a1f81d92 --- /dev/null +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -0,0 +1,65 @@ +//Used by engineering cyborgs in place of generic circuits. +/obj/item/device/electroadaptive_pseudocircuit + name = "electroadaptive pseudocircuit" + desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction." + icon = 'icons/obj/module.dmi' + icon_state = "boris" + w_class = WEIGHT_CLASS_TINY + materials = list(MAT_METAL = 50, MAT_GLASS = 300) + origin_tech = "engineering=4" + var/recharging = FALSE + var/circuits = 5 //How many circuits the pseudocircuit has left + var/static/recycleable_circuits = typecacheof(list(/obj/item/electronics/firelock, /obj/item/electronics/airalarm, /obj/item/electronics/firealarm, \ + /obj/item/electronics/apc))//A typecache of circuits consumable for material + +/obj/item/device/electroadaptive_pseudocircuit/Initialize() + . = ..() + maptext = "[circuits]" + +/obj/item/device/electroadaptive_pseudocircuit/examine(mob/user) + ..() + if(iscyborg(user)) + to_chat(user, "It has material for [circuits] circuit[circuits == 1 ? "" : "s"]. Use the pseudocircuit on existing circuits to gain material.") + to_chat(user, "Serves as a substitute for fire/air alarm, firelock, and APC electronics.") + to_chat(user, "It can also be used on an APC with no power cell to fabricate a low-capacity cell at a high power cost.") + +/obj/item/device/electroadaptive_pseudocircuit/proc/adapt_circuit(mob/living/silicon/robot/R, circuit_cost = 0) + if(QDELETED(R) || !istype(R)) + return + if(!R.cell) + to_chat(R, "You need a power cell installed for that.") + return + if(!R.cell.use(circuit_cost)) + to_chat(R, "You don't have the power for that (you need [DisplayPower(circuit_cost)].)") + return + if(recharging) + to_chat(R, "[src] needs some time to recharge first.") + return + if(!circuits) + to_chat(R, "You need more material. Use [src] on existing simple circuits to break them down.") + return + playsound(R, 'sound/items/rped.ogg', 50, TRUE) + recharging = TRUE + circuits-- + maptext = "[circuits]" + icon_state = "[initial(icon_state)]_recharging" + var/recharge_time = min(600, circuit_cost * 5) //40W of cost for one fabrication = 20 seconds of recharge time; this is to prevent spamming + addtimer(CALLBACK(src, .proc/recharge), recharge_time) + return TRUE //The actual circuit magic itself is done on a per-object basis + +/obj/item/device/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity) + if(!proximity) + return + if(!is_type_in_typecache(target, recycleable_circuits)) + return + circuits++ + maptext = "[circuits]" + user.visible_message("User breaks down [target] with [src].", \ + "You recycle [target] into [src]. It now has material for [circuits] circuits.") + playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE) + qdel(target) + +/obj/item/device/electroadaptive_pseudocircuit/proc/recharge() + playsound(src, 'sound/machines/chime.ogg', 25, TRUE) + recharging = FALSE + icon_state = initial(icon_state) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 55c8bb5252a..6ba8425392f 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -1,7 +1,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/device/gps name = "global positioning system" - desc = "Helping lost spacemen find their way through the planets since 2016. Alt+click to toggle power." + desc = "Helping lost spacemen find their way through the planets since 2016." icon = 'icons/obj/telescience.dmi' icon_state = "gps-c" w_class = WEIGHT_CLASS_SMALL @@ -15,6 +15,9 @@ GLOBAL_LIST_EMPTY(GPS_list) var/updating = TRUE //Automatic updating of GPS list. Can be set to manual by user. var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown +/obj/item/device/gps/examine(mob/user) + ..() + to_chat(user, "Alt-click to switch it [tracking ? "off":"on"].") /obj/item/device/gps/Initialize() . = ..() @@ -209,4 +212,4 @@ GLOBAL_LIST_EMPTY(GPS_list) clear() tagged = null STOP_PROCESSING(SSfastprocess, src) - . = ..() \ No newline at end of file + . = ..() diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index fdcf781a4d2..19a81e8640f 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -1,3 +1,4 @@ +GLOBAL_LIST_INIT(pipe_paint_colors, list("grey"=rgb(255,255,255), "red"=rgb(255,0,0), "blue"=rgb(0,0,255), "cyan"=rgb(0,256,249), "green"=rgb(30,255,0), "yellow"=rgb(255,198,0), "purple"=rgb(130,43,255))) /obj/item/device/pipe_painter name = "pipe painter" @@ -5,16 +6,7 @@ icon_state = "labeler1" item_state = "flight" flags_1 = NOBLUDGEON_1 - var/list/modes = list( - "grey" = rgb(255,255,255), - "red" = rgb(255,0,0), - "blue" = rgb(0,0,255), - "cyan" = rgb(0,256,249), - "green" = rgb(30,255,0), - "yellow" = rgb(255,198,0), - "purple" = rgb(130,43,255) - ) - var/mode = "grey" + var/paint_color = "grey" materials = list(MAT_METAL=5000, MAT_GLASS=2000) @@ -27,14 +19,13 @@ return var/obj/machinery/atmospherics/pipe/P = A - P.add_atom_colour(modes[mode], FIXED_COLOUR_PRIORITY) - P.pipe_color = modes[mode] - user.visible_message("[user] paints \the [P] [mode].","You paint \the [P] [mode].") - P.update_node_icon() //updates the neighbors + if(P.paint(GLOB.pipe_paint_colors[paint_color])) + playsound(src, 'sound/machines/click.ogg', 50, 1) + user.visible_message("[user] paints \the [P] [paint_color].","You paint \the [P] [paint_color].") /obj/item/device/pipe_painter/attack_self(mob/user) - mode = input("Which colour do you want to use?","Pipe painter") in modes + paint_color = input("Which colour do you want to use?","Pipe painter") in GLOB.pipe_paint_colors -/obj/item/device/pipe_painter/examine() +/obj/item/device/pipe_painter/examine(mob/user) ..() - to_chat(usr, "It is set to [mode].") + to_chat(user, "It is set to [paint_color].") diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index e3f767f9fab..d32ae86090e 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -138,7 +138,7 @@ if(power_drained > max_power * 0.98) if (!admins_warned) admins_warned = TRUE - message_admins("Power sink at ([x],[y],[z] - JMP) is 95% full. Explosion imminent.") + message_admins("Power sink at ([x],[y],[z] - JMP) is 95% full. Explosion imminent.") playsound(src, 'sound/effects/screech.ogg', 100, 1, 1) if(power_drained >= max_power) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 331a9e60db2..82dba702c4b 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -20,7 +20,7 @@ return (FIRELOSS) /obj/item/device/electropack/Initialize() - ..() + . = ..() SSradio.add_object(src, frequency, GLOB.RADIO_CHAT) /obj/item/device/electropack/Destroy() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 4c309f4aa15..9817614e24c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -1,6 +1,6 @@ /obj/item/device/radio/headset name = "radio headset" - desc = "An updated, modular intercom that fits over the head. Takes encryption keys. \nTo speak on the general radio frequency, use ; before speaking." + desc = "An updated, modular intercom that fits over the head. Takes encryption keys." icon_state = "headset" item_state = "headset" materials = list(MAT_METAL=75) @@ -11,6 +11,12 @@ var/obj/item/device/encryptionkey/keyslot2 = null dog_fashion = null +/obj/item/device/radio/headset/examine(mob/user) + ..() + to_chat(user, "To speak on the general radio frequency, use ; before speaking.") + if (command) + to_chat(user, "Alt-click to toggle the high-volume mode.") + /obj/item/device/radio/headset/Initialize() . = ..() recalculateChannels() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 08b5f4b9dd9..3e9ce8c3412 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -15,6 +15,29 @@ /obj/item/device/radio/intercom/unscrewed unfastened = TRUE +/obj/item/device/radio/intercom/ratvar + name = "hierophant intercom" + desc = "A modified intercom that uses the Hierophant network instead of subspace tech. Can listen to and broadcast on any frequency." + icon_state = "intercom_ratvar" + freerange = TRUE + +/obj/item/device/radio/intercom/ratvar/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item/screwdriver)) + to_chat(user, "[src] is fastened to the wall with [is_servant_of_ratvar(user) ? "replicant alloy" : "some material you've never seen"], and can't be removed.") + return //no unfastening! + . = ..() + +/obj/item/device/radio/intercom/ratvar/process() + if(!istype(SSticker.mode, /datum/game_mode/clockwork_cult)) + invisibility = INVISIBILITY_OBSERVER + alpha = 125 + emped = TRUE + else + invisibility = initial(invisibility) + alpha = initial(alpha) + emped = FALSE + ..() + /obj/item/device/radio/intercom/Initialize(mapload, ndir, building) . = ..() if(building) @@ -114,7 +137,7 @@ if(!on) icon_state = "intercom-p" else - icon_state = "intercom" + icon_state = initial(icon_state) /obj/item/device/radio/intercom/add_blood(list/blood_dna) return 0 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 378ef6cde4e..aea0093a22f 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -4,6 +4,7 @@ suffix = "\[3\]" icon_state = "walkietalkie" item_state = "walkietalkie" + desc = "A basic handheld radio that communicates with local telecommunication networks." dog_fashion = /datum/dog_fashion/back var/on = TRUE // 0 for off var/last_transmission diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1d20d9ae106..97f2e865526 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -73,6 +73,7 @@ MASS SPECTROMETER origin_tech = "magnets=1;biotech=1" var/mode = 1 var/scanmode = 0 + var/advanced = FALSE /obj/item/device/healthanalyzer/attack_self(mob/user) if(!scanmode) @@ -97,7 +98,7 @@ MASS SPECTROMETER user.visible_message("[user] has analyzed [M]'s vitals.") if(scanmode == 0) - healthscan(user, M, mode) + healthscan(user, M, mode, advanced) else if(scanmode == 1) chemscan(user, M) @@ -105,7 +106,7 @@ MASS SPECTROMETER // Used by the PDA medical scanner too -/proc/healthscan(mob/living/user, mob/living/M, mode = 1) +/proc/healthscan(mob/living/user, mob/living/M, mode = 1, advanced = FALSE) if(user.incapacitated() || user.eye_blind) return //Damage specifics @@ -115,8 +116,8 @@ MASS SPECTROMETER var/brute_loss = M.getBruteLoss() var/mob_status = (M.stat == DEAD ? "Deceased" : "[round(M.health/M.maxHealth,0.01)*100] % healthy") - if(M.status_flags & FAKEDEATH) - mob_status = "Deceased" + if(M.status_flags & FAKEDEATH && !advanced) + mob_status = "Deceased" oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss if(ishuman(M)) @@ -136,19 +137,77 @@ MASS SPECTROMETER if(oxy_loss > 10) to_chat(user, "\t[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.") if(tox_loss > 10) - to_chat(user, "\t[tox_loss > 50 ? "Critical" : "Dangerous"] amount of toxins detected.") + to_chat(user, "\t[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.") if(M.getStaminaLoss()) to_chat(user, "\tSubject appears to be suffering from fatigue.") + if(advanced) + to_chat(user, "\tFatigue Level: [M.getStaminaLoss()]%.") if (M.getCloneLoss()) to_chat(user, "\tSubject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.") - if (M.reagents && M.reagents.get_reagent_amount("epinephrine")) - to_chat(user, "\tBloodstream analysis located [M.reagents.get_reagent_amount("epinephrine")] units of rejuvenation chemicals.") + if(advanced) + to_chat(user, "\tCellular Damage Level: [M.getCloneLoss()].") if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain)) to_chat(user, "\tSubject brain function is non-existent.") else if (M.getBrainLoss() >= 60) to_chat(user, "\tSevere brain damage detected. Subject likely to have mental retardation.") else if (M.getBrainLoss() >= 10) to_chat(user, "\tBrain damage detected. Subject may have had a concussion.") + if(advanced) + to_chat(user, "\tBrain Activity Level: [100 - M.getBrainLoss()]%.") + if (M.radiation) + to_chat(user, "\tSubject is irradiated.") + if(advanced) + to_chat(user, "\tRadiation Level: [M.radiation]%.") + + if(advanced && M.hallucinating()) + to_chat(user, "\tSubject is hallucinating.") + + //Eyes and ears + if(advanced) + if(iscarbon(M)) + var/mob/living/carbon/C = M + var/obj/item/organ/ears/ears = C.getorganslot("ears") + to_chat(user, "\t==EAR STATUS==") + if(istype(ears)) + var/healthy = TRUE + if(C.disabilities & DEAF) + healthy = FALSE + to_chat(user, "\tSubject is genetically deaf.") + else + if(ears.ear_damage) + to_chat(user, "\tSubject has [ears.ear_damage > UNHEALING_EAR_DAMAGE? "permanent ": "temporary "]hearing damage.") + healthy = FALSE + if(ears.deaf) + to_chat(user, "\tSubject is [ears.ear_damage > UNHEALING_EAR_DAMAGE ? "permanently ": "temporarily "] deaf.") + healthy = FALSE + if(healthy) + to_chat(user, "\tHealthy.") + else + to_chat(user, "\tSubject does not have ears.") + var/obj/item/organ/eyes/eyes = C.getorganslot("eye_sight") + to_chat(user, "\t==EYE STATUS==") + if(istype(eyes)) + var/healthy = TRUE + if(C.disabilities & BLIND) + to_chat(user, "\tSubject is blind.") + healthy = FALSE + if(C.disabilities & NEARSIGHT) + to_chat(user, "\tSubject is nearsighted.") + healthy = FALSE + if(eyes.eye_damage > 30) + to_chat(user, "\tSubject has severe eye damage.") + healthy = FALSE + else if(eyes.eye_damage > 20) + to_chat(user, "\tSubject has significant eye damage.") + healthy = FALSE + else if(eyes.eye_damage) + to_chat(user, "\tSubject has minor eye damage.") + healthy = FALSE + if(healthy) + to_chat(user, "\tHealthy.") + else + to_chat(user, "\tSubject does not have eyes.") + if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -172,11 +231,11 @@ MASS SPECTROMETER to_chat(user, "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)") // Time of death - if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) + if(M.tod && (M.stat == DEAD || ((M.status_flags & FAKEDEATH) && !advanced))) to_chat(user, "Time of Death: [M.tod]") var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) - to_chat(user, "Subject died [tdelta / 10] seconds ago, defibrillation may be possible!") + to_chat(user, "Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!") for(var/thing in M.viruses) var/datum/disease/D = thing @@ -209,7 +268,7 @@ MASS SPECTROMETER var/cyberimp_detect for(var/obj/item/organ/cyberimp/CI in C.internal_organs) - if(CI.status == ORGAN_ROBOTIC) + if(CI.status == ORGAN_ROBOTIC && !CI.syndicate_implant) cyberimp_detect += "[C.name] is modified with a [CI.name].
" if(cyberimp_detect) to_chat(user, "Detected cybernetic modifications:") @@ -246,6 +305,12 @@ MASS SPECTROMETER if(0) to_chat(usr, "The scanner no longer shows limb damage.") +/obj/item/device/healthanalyzer/advanced + name = "advanced health analyzer" + icon_state = "health_adv" + desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy." + origin_tech = "magnets=3;biotech=3" + advanced = TRUE /obj/item/device/analyzer desc = "A hand-held environmental scanner which reports current gas levels." diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 2cc0ab0417f..663eed0a8db 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -111,7 +111,6 @@ effective or pretty fucking useless. /obj/item/device/healthanalyzer/rad_laser/interact(mob/user) user.set_machine(src) - var/cooldown = GetCooldown() var/dat = "Irradiation: [irradiate ? "On" : "Off"]
" dat += "Stealth Mode (NOTE: Deactivates automatically while Irradiation is off): [stealth ? "On" : "Off"]
" dat += "Scan Mode: " @@ -133,7 +132,7 @@ effective or pretty fucking useless. -- [(wavelength+(intensity*4))] ++
- Laser Cooldown: [cooldown] Seconds
+ Laser Cooldown: [DisplayTimeText(GetCooldown())]
"} var/datum/browser/popup = new(user, "radlaser", "Radioactive Microlaser Interface", 400, 240) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 69fef254e87..045da484edd 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -165,7 +165,7 @@ var/attachment = "no device" if(attached_device) if(istype(attached_device, /obj/item/device/assembly/signaler)) - attachment = "[attached_device]" + attachment = "[attached_device]" else attachment = attached_device diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 82d4c3d99f9..15c6bcd4b19 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -37,10 +37,14 @@ "Very doubtful") /obj/item/toy/eightball/Initialize(mapload) - ..() - if(prob(1)) - new /obj/item/toy/eightball/haunted(get_turf(src)) - qdel(src) + . = ..() + if(MakeHaunted()) + return INITIALIZE_HINT_QDEL + +/obj/item/toy/eightball/proc/MakeHaunted() + . = prob(1) + if(.) + new /obj/item/toy/eightball/haunted(loc) /obj/item/toy/eightball/attack_self(mob/user) if(shaking) @@ -81,7 +85,7 @@ var/fixed_answer /obj/item/toy/eightball/broken/Initialize(mapload) - ..() + . = ..() fixed_answer = pick(possible_answers) /obj/item/toy/eightball/broken/get_answer() @@ -97,7 +101,7 @@ var/list/votes /obj/item/toy/eightball/haunted/Initialize(mapload) - ..() + . = ..() votes = list() GLOB.poi_list |= src @@ -105,6 +109,9 @@ GLOB.poi_list -= src . = ..() +/obj/item/toy/eightball/haunted/MakeHaunted() + return FALSE + /obj/item/toy/eightball/haunted/attack_ghost(mob/user) if(!shaking) to_chat(user, "[src] is not currently being shaken.") diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index a8807505030..a210c2a7142 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -68,6 +68,7 @@ ..() if(reagents.total_volume) to_chat(user, "It contains [round(reagents.total_volume)] units.") + to_chat(user, "Alt-click to empty it.") else to_chat(user, "It is empty.") diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index b352596e2f5..833d2151808 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -292,7 +292,7 @@ var/mob/last = get_mob_by_ckey(nadeassembly.fingerprintslast) var/turf/T = get_turf(src) var/area/A = get_area(T) - message_admins("grenade primed by an assembly, attached by [key_name_admin(M)](?) (FLW) and last touched by [key_name_admin(last)](?) (FLW) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] (JMP).") + message_admins("grenade primed by an assembly, attached by [key_name_admin(M)](?) (FLW) and last touched by [key_name_admin(last)](?) (FLW) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] (JMP).") log_game("grenade primed by an assembly, attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] ([T.x], [T.y], [T.z])") else addtimer(CALLBACK(src, .proc/prime), det_time) diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 6abe7fc33d9..a890f4d5a35 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -13,11 +13,6 @@ return for(var/mob/living/M in get_hearers_in_view(7, flashbang_turf)) bang(get_turf(M), M) - - for(var/obj/structure/blob/B in get_hear(8,flashbang_turf)) //Blob damage here - var/distance = get_dist(B, get_turf(src)) - var/damage = round(100/(distance*distance)+1) - B.take_damage(damage, BURN, "energy") qdel(src) /obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index fef017e612f..25b1a60955c 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -253,7 +253,7 @@ var/trap_damage = 20 /obj/item/restraints/legcuffs/beartrap/Initialize() - ..() + . = ..() icon_state = "[initial(icon_state)][armed]" /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 7f8d612e166..5ed9959d9db 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -244,6 +244,7 @@ S.name = name S.ckey = theghost.ckey S.status_flags |= GODMODE + S.language_holder = user.language_holder.copy(S) var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN) if(src && input) @@ -338,8 +339,8 @@ /obj/item/nullrod/carp name = "carp-sie plushie" desc = "An adorable stuffed toy that resembles the god of all carp. The teeth look pretty sharp. Activate it to receive the blessing of Carp-Sie." - icon = 'icons/obj/toy.dmi' - icon_state = "carpplushie" + icon = 'icons/obj/plushes.dmi' + icon_state = "carpplush" item_state = "carp_plushie" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' @@ -386,12 +387,10 @@ flags_2 = SLOWS_WHILE_IN_HAND_2 /obj/item/nullrod/tribal_knife/Initialize(mapload) - ..() - -/obj/item/nullrod/tribal_knife/New() - ..() + . = ..() START_PROCESSING(SSobj, src) + /obj/item/nullrod/tribal_knife/Destroy() STOP_PROCESSING(SSobj, src) . = ..() diff --git a/code/game/objects/items/implants/implant_abductor.dm b/code/game/objects/items/implants/implant_abductor.dm index 74642edd666..710e2d738e5 100644 --- a/code/game/objects/items/implants/implant_abductor.dm +++ b/code/game/objects/items/implants/implant_abductor.dm @@ -26,21 +26,15 @@ if(..()) var/obj/machinery/abductor/console/console if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(H.dna.species.id == "abductor") - var/datum/species/abductor/S = H.dna.species - console = get_team_console(S.team) + var/datum/antagonist/abductor/A = target.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR) + if(A) + console = get_abductor_console(A.team.team_number) home = console.pad if(!home) - console = get_team_console(pick(1, 2, 3, 4)) + var/list/consoles = list() + for(var/obj/machinery/abductor/console/C in GLOB.machines) + consoles += C + console = pick(consoles) home = console.pad - return 1 - -/obj/item/implant/abductor/proc/get_team_console(var/team) - var/obj/machinery/abductor/console/console - for(var/obj/machinery/abductor/console/c in GLOB.machines) - if(c.team == team) - console = c - break - return console + return TRUE diff --git a/code/game/objects/items/implants/implant_loyality.dm b/code/game/objects/items/implants/implant_loyality.dm index e25fc8dda69..ffaebf5a638 100644 --- a/code/game/objects/items/implants/implant_loyality.dm +++ b/code/game/objects/items/implants/implant_loyality.dm @@ -19,21 +19,21 @@ /obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = 0) if(..()) - if((target.mind in (SSticker.mode.head_revolutionaries))) + if((target.mind in (SSticker.mode.head_revolutionaries)) || target.mind.unconvertable) if(!silent) target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") removed(target, 1) qdel(src) - return 0 + return FALSE if(target.mind in SSticker.mode.revolutionaries) - SSticker.mode.remove_revolutionary(target.mind) + SSticker.mode.remove_revolutionary(target.mind, FALSE, user) if(!silent) if(target.mind in SSticker.mode.cult) to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!") else to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.") - return 1 - return 0 + return TRUE + return FALSE /obj/item/implant/mindshield/removed(mob/target, silent = 0, special = 0) if(..()) diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 81ef8afe12d..1b277d56828 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -61,7 +61,7 @@ return ..() /obj/item/implantcase/Initialize(mapload) - ..() + . = ..() if(imp_type) imp = new imp_type(src) update_icon() diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 2f59020cbe2..8d252cb5af1 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -20,7 +20,7 @@ var/special = FALSE var/special_name = "special function" var/message_cooldown - var/breakout_time = 1 + var/breakout_time = 600 /obj/machinery/implantchair/Initialize() . = ..() @@ -85,10 +85,17 @@ update_icon() /obj/machinery/implantchair/proc/implant_action(mob/living/M) - var/obj/item/implant/I = new implant_type - if(I.implant(M)) - visible_message("[M] has been implanted by the [name].") - return 1 + var/obj/item/I = new implant_type + if(istype(I, /obj/item/implant)) + var/obj/item/implant/P = I + if(P.implant(M)) + visible_message("[M] has been implanted by [src].") + return TRUE + else if(istype(I, /obj/item/organ)) + var/obj/item/organ/P = I + P.Insert(M, drop_if_replaced = FALSE) + visible_message("[M] has been implanted by [src].") + return TRUE /obj/machinery/implantchair/update_icon() icon_state = initial(icon_state) @@ -117,9 +124,9 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ "You hear a metallic creaking from [src].") - if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return user.visible_message("[user] successfully broke out of [src]!", \ diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 0daa8f1d4ee..8144017faa8 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -59,7 +59,7 @@ return ..() /obj/item/implanter/Initialize(mapload) - ..() + . = ..() if(imp_type) imp = new imp_type(src) update_icon() diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 1b4805ef4bc..8a5b4ada608 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -882,7 +882,8 @@ ..() /obj/item/book/manual/wiki/proc/initialize_wikibook() - if(config.wikiurl) + var/wikiurl = CONFIG_GET(string/wikiurl) + if(wikiurl) dat = {" @@ -900,7 +901,7 @@ }
\
You're yanked away from [src]!") + playsound(src, 'sound/magic/enter_blood.ogg', 50, TRUE) + playsound(L, 'sound/magic/exit_blood.ogg', 50, TRUE) + flash_color(L, flash_color = "#C80000", flash_time = 10) + /turf/open/Initalize_Atmos(times_fired) excited = 0 update_visuals() diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index da92d6b9dde..74150c64334 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -125,11 +125,10 @@ /turf/open/chasm/straight_down/Initialize() - ..() + . = ..() drop_x = x drop_y = y - if(z+1 <= world.maxz) - drop_z = z+1 + drop_z = z - 1 var/turf/T = locate(drop_x, drop_y, drop_z) T.visible_message("The ceiling gives way!") playsound(T, 'sound/effects/break_stone.ogg', 50, 1) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 9ff164f50b5..3978bc802d5 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -21,7 +21,7 @@ broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") if (!burnt_states) burnt_states = list() - ..() + . = ..() //This is so damaged or burnt tiles or platings don't get remembered as the default tile var/static/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","damaged4", "damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", "foam_plating", @@ -163,10 +163,10 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "You remove the broken plating.") + to_chat(user, "You remove the broken plating.") else if(user && !silent) - to_chat(user, "You remove the floor tile.") + to_chat(user, "You remove the floor tile.") if(floor_tile && make_tile) new floor_tile(src) return make_plating() diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 59e7bed8ca9..428c965197a 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -8,10 +8,15 @@ */ /turf/open/floor/wood + desc = "Stylish dark wood." icon_state = "wood" floor_tile = /obj/item/stack/tile/wood broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") +/turf/open/floor/wood/examine(mob/user) + ..() + to_chat(user, "There's a few screws and a small crack visible.") + /turf/open/floor/wood/attackby(obj/item/C, mob/user, params) if(..()) return @@ -42,16 +47,16 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "You remove the broken planks.") + to_chat(user, "You remove the broken planks.") else if(make_tile) if(user && !silent) - to_chat(user, "You unscrew the planks.") + to_chat(user, "You unscrew the planks.") if(floor_tile) new floor_tile(src) else if(user && !silent) - to_chat(user, "You forcefully pry off the planks, destroying them in the process.") + to_chat(user, "You forcefully pry off the planks, destroying them in the process.") return make_plating() /turf/open/floor/wood/cold @@ -71,14 +76,14 @@ var/turfverb = "uproot" /turf/open/floor/grass/Initialize() - ..() + . = ..() update_icon() /turf/open/floor/grass/attackby(obj/item/C, mob/user, params) if(istype(C, /obj/item/shovel) && params) new ore_type(src) new ore_type(src) //Make some sand if you shovel grass - user.visible_message("[user] digs up [src].", "You [src.turfverb] [src].") + user.visible_message("[user] digs up [src].", "You [src.turfverb] [src].") playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) make_plating() if(..()) @@ -109,7 +114,7 @@ slowdown = 0 /turf/open/floor/grass/snow/basalt/Initialize() - ..() + . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" set_basalt_light(src) @@ -126,7 +131,7 @@ slowdown = 0 /turf/open/floor/grass/fakebasalt/Initialize() - ..() + . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" set_basalt_light(src) @@ -143,8 +148,12 @@ canSmoothWith = list(/turf/open/floor/carpet) flags_1 = NONE -/turf/open/floor/carpet/Initialize() +/turf/open/floor/carpet/examine(mob/user) ..() + to_chat(user, "There's a small crack on the edge of it.") + +/turf/open/floor/carpet/Initialize() + . = ..() update_icon() /turf/open/floor/carpet/update_icon() @@ -205,7 +214,7 @@ plane = PLANE_SPACE /turf/open/floor/fakespace/Initialize() - ..() + . = ..() icon_state = SPACE_ICON_STATE /turf/open/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 542a0ed81d4..0dd3673f6a4 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -12,8 +12,12 @@ var/can_modify_colour = TRUE -/turf/open/floor/light/Initialize() +/turf/open/floor/light/examine(mob/user) ..() + to_chat(user, "There's a small crack on the edge of it.") + +/turf/open/floor/light/Initialize() + . = ..() update_icon() /turf/open/floor/light/break_tile() diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index c28232410da..6f863d4bd03 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -18,7 +18,7 @@ /turf/open/floor/mineral/Initialize() broken_states = list("[initial(icon_state)]_dam") - ..() + . = ..() if (!icons) icons = list() @@ -221,7 +221,7 @@ icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9") /turf/open/floor/mineral/abductor/Initialize() - ..() + . = ..() icon_state = "alienpod[rand(1,9)]" /turf/open/floor/mineral/abductor/break_tile() diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 1461abfcaff..794b886537b 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -20,7 +20,7 @@ /turf/open/floor/circuit/Initialize() SSmapping.nuke_tiles += src update_icon() - ..() + . = ..() /turf/open/floor/circuit/Destroy() SSmapping.nuke_tiles -= src @@ -142,25 +142,27 @@ name = "clockwork floor" desc = "Tightly-pressed brass tiles. They emit minute vibration." icon_state = "plating" + baseturf = /turf/open/floor/clockwork + var/uses_overlay = TRUE var/obj/effect/clockwork/overlay/floor/realappearence /turf/open/floor/clockwork/Initialize() - ..() - new /obj/effect/temp_visual/ratvar/floor(src) - new /obj/effect/temp_visual/ratvar/beam(src) - realappearence = new /obj/effect/clockwork/overlay/floor(src) - realappearence.linked = src - change_construction_value(1) + . = ..() + if(uses_overlay) + new /obj/effect/temp_visual/ratvar/floor(src) + new /obj/effect/temp_visual/ratvar/beam(src) + realappearence = new /obj/effect/clockwork/overlay/floor(src) + realappearence.linked = src /turf/open/floor/clockwork/Destroy() STOP_PROCESSING(SSobj, src) - change_construction_value(-1) - if(realappearence) - qdel(realappearence) - realappearence = null + if(uses_overlay && realappearence) + QDEL_NULL(realappearence) return ..() /turf/open/floor/clockwork/ReplaceWithLattice() + if(baseturf == type) + return ..() for(var/obj/structure/lattice/L in src) L.ratvar_act() @@ -194,6 +196,8 @@ L.adjustToxLoss(-3, TRUE, TRUE) /turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params) + if(baseturf == type) + return if(istype(I, /obj/item/crowbar)) user.visible_message("[user] begins slowly prying up [src]...", "You begin painstakingly prying up [src]...") playsound(src, I.usesound, 20, 1) @@ -217,6 +221,12 @@ animate(src, color = previouscolor, time = 8) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) +/turf/open/floor/clockwork/reebe + name = "cogplate" + desc = "Warm brass plating. You can feel it gently vibrating, as if machinery is on the other side." + icon_state = "reebe" + baseturf = /turf/open/floor/clockwork/reebe + uses_overlay = FALSE /turf/open/floor/bluespace slowdown = -1 diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 63c883f88c0..b194127de83 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -4,6 +4,10 @@ broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") burnt_states = list("floorscorched1", "floorscorched2") +/turf/open/floor/plasteel/examine(mob/user) + ..() + to_chat(user, "There's a small crack on the edge of it.") + /turf/open/floor/plasteel/update_icon() if(!..()) return 0 diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 3617759e99d..3e16da8b9f4 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -12,12 +12,19 @@ icon_state = "plating" intact = FALSE +/turf/open/floor/plating/examine(mob/user) + ..() + if(broken || burnt) + to_chat(user, "It looks like the dents could be welded smooth.") + return + to_chat(user, "There are few attachment holes for a new tile or reinforcement rods.") + /turf/open/floor/plating/Initialize() if (!broken_states) broken_states = list("platingdmg1", "platingdmg2", "platingdmg3") if (!burnt_states) burnt_states = list("panelscorched") - ..() + . = ..() icon_plating = icon_state /turf/open/floor/plating/update_icon() diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 2649a3a14de..848a7e82193 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -193,7 +193,7 @@ var/list/L = list(45) if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels. - L += -45 + L -= 45 // Expand the edges of our tunnel for(var/edge_angle in L) diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index eaf0e512f72..74354e78c77 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -1,11 +1,16 @@ /turf/open/floor/engine name = "reinforced floor" + desc = "Extremely sturdy." icon_state = "engine" thermal_conductivity = 0.025 heat_capacity = INFINITY floor_tile = /obj/item/stack/rods +/turf/open/floor/engine/examine(mob/user) + ..() + to_chat(user, "The reinforcement rods are wrenched firmly in place.") + /turf/open/floor/engine/airless initial_gas_mix = "TEMP=2.7" @@ -108,7 +113,7 @@ var/obj/effect/clockwork/overlay/floor/bloodcult/realappearence /turf/open/floor/engine/cult/Initialize() - ..() + . = ..() new /obj/effect/temp_visual/cult/turf/floor(src) realappearence = new /obj/effect/clockwork/overlay/floor/bloodcult(src) realappearence.linked = src diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 9e0d57d7825..1a5d0b78ec7 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -30,7 +30,7 @@ pixel_y = -4 pixel_x = -4 icon = smooth_icon - ..() + . = ..() if (mineralType && mineralAmt && spread && spreadChance) for(var/dir in GLOB.cardinals) if(prob(spreadChance)) @@ -38,10 +38,6 @@ if(istype(T, /turf/closed/mineral/random)) Spread(T) -/turf/closed/mineral/shuttleRotate(rotation) - setDir(angle2dir(rotation+dir2angle(dir))) - queue_smooth(src) - /turf/closed/mineral/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) if(turf_type) underlay_appearance.icon = initial(turf_type.icon) @@ -111,12 +107,6 @@ if(istype(R.module_active, /obj/item/pickaxe)) src.attackby(R.module_active,R) return -/* else if(istype(AM, /obj/mecha)) - var/obj/mecha/M = AM - if(istype(M.selected, /obj/item/mecha_parts/mecha_equipment/drill)) - src.attackby(M.selected,M) - return*/ -//Aparantly mechs are just TOO COOL to call Collide()) else return @@ -153,7 +143,7 @@ /turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1) if (display_icon_state) icon_state = display_icon_state - ..() + . = ..() if (prob(mineralChance)) var/path = pickweight(mineralSpawnChanceList) var/turf/T = ChangeTurf(path,FALSE,FALSE,TRUE) @@ -393,7 +383,7 @@ /turf/closed/mineral/gibtonite/Initialize() det_time = rand(8,10) //So you don't know exactly when the hot potato will explode - ..() + . = ..() /turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1) diff --git a/code/game/turfs/simulated/reebe_void.dm b/code/game/turfs/simulated/reebe_void.dm new file mode 100644 index 00000000000..2e0246df832 --- /dev/null +++ b/code/game/turfs/simulated/reebe_void.dm @@ -0,0 +1,47 @@ +/turf/open/indestructible/reebe_void + name = "void" + icon_state = "reebemap" + layer = SPACE_LAYER + baseturf = /turf/open/indestructible/reebe_void + planetary_atmos = TRUE + +/turf/open/indestructible/reebe_void/Initialize(mapload) + . = ..() + icon_state = "reebegame" + +/turf/open/indestructible/reebe_void/spawning + icon_state = "reebespawn" + +/turf/open/indestructible/reebe_void/spawning/Initialize(mapload) + . = ..() + if(mapload) + for(var/i in 1 to 3) + if(prob(1)) + new /obj/item/clockwork/alloy_shards/large(src) + if(prob(2)) + new /obj/item/clockwork/alloy_shards/medium(src) + if(prob(3)) + new /obj/item/clockwork/alloy_shards/small(src) + +/turf/open/indestructible/reebe_void/spawning/lattices + icon_state = "reebelattice" + +/turf/open/indestructible/reebe_void/spawning/lattices/Initialize(mapload) + . = ..() + if(mapload) + if(prob(2.5)) + new /obj/structure/lattice/catwalk/clockwork(src) + else if(prob(5)) + new /obj/structure/lattice/clockwork(src) + +/turf/open/indestructible/reebe_void/Enter(atom/movable/AM, atom/old_loc) + if(!..()) + return FALSE + else + if(istype(AM, /obj/structure/window)) + return FALSE + if(istype(AM, /obj/item/projectile)) + return TRUE + if((locate(/obj/structure/lattice) in src)) + return TRUE + return FALSE diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index d0eaad34e3a..e39c791cee8 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -55,8 +55,8 @@ sheet_type = /obj/item/stack/tile/brass sheet_amount = 1 girder_type = /obj/structure/destructible/clockwork/wall_gear + baseturf = /turf/open/floor/clockwork/reebe var/obj/effect/clockwork/overlay/wall/realappearence - var/obj/structure/destructible/clockwork/cache/linkedcache /turf/closed/wall/clockwork/Initialize() ..() @@ -64,18 +64,8 @@ new /obj/effect/temp_visual/ratvar/beam(src) realappearence = new /obj/effect/clockwork/overlay/wall(src) realappearence.linked = src - change_construction_value(5) - -/turf/closed/wall/clockwork/examine(mob/user) - ..() - if((is_servant_of_ratvar(user) || isobserver(user)) && linkedcache) - to_chat(user, "It is linked to a Tinkerer's Cache, generating components!") /turf/closed/wall/clockwork/Destroy() - if(linkedcache) - linkedcache.linkedwall = null - linkedcache = null - change_construction_value(-5) if(realappearence) qdel(realappearence) realappearence = null diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm index 5ebe1d632af..5c95d108b42 100644 --- a/code/game/turfs/simulated/wall/reinf_walls.dm +++ b/code/game/turfs/simulated/wall/reinf_walls.dm @@ -13,8 +13,7 @@ girder_type = /obj/structure/girder/reinforced explosion_block = 2 -/turf/closed/wall/r_wall/examine(mob/user) - ..() +/turf/closed/wall/r_wall/deconstruction_hints(mob/user) switch(d_state) if(INTACT) to_chat(user, "The outer grille is fully intact.") diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 9171c7f54c0..baee3b31c17 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -25,6 +25,13 @@ /turf/closed/wall/clockwork) smooth = SMOOTH_TRUE +/turf/closed/wall/examine(mob/user) + ..() + deconstruction_hints(user) + +/turf/closed/wall/proc/deconstruction_hints(mob/user) + to_chat(user, "The outer plating is welded firmly in place.") + /turf/closed/wall/attack_tk() return @@ -287,4 +294,4 @@ to_chat(user, "You deconstruct the wall.") ChangeTurf(/turf/open/floor/plating) return TRUE - return FALSE \ No newline at end of file + return FALSE diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 2c988c00cc0..126e2d0c66b 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -14,6 +14,7 @@ var/global/datum/gas_mixture/immutable/space/space_gas = new plane = PLANE_SPACE + layer = SPACE_LAYER light_power = 0.25 dynamic_lighting = DYNAMIC_LIGHTING_DISABLED @@ -66,7 +67,7 @@ return /turf/open/space/proc/update_starlight() - if(config.starlight) + if(CONFIG_GET(flag/starlight)) for(var/t in RANGE_TURFS(1,src)) //RANGE_TURFS is in code\__HELPERS\game.dm if(isspaceturf(t)) //let's NOT update this that much pls diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index f11735d6768..cf611560c30 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -73,7 +73,7 @@ /turf/open/space/transit/Initialize() - ..() + . = ..() update_icon() for(var/atom/movable/AM in src) throw_atom(AM) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 601cd6ccab8..15910adf47b 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -122,8 +122,6 @@ return FALSE /turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area) - if (!mover) - return TRUE // First, make sure it can leave its square if(isturf(mover.loc)) // Nothing but border objects stop you from leaving a tile, only one loop is needed @@ -132,32 +130,28 @@ mover.Collide(obstacle) return FALSE - var/list/large_dense = list() - - //Next, check objects to block entry that are on the border - for(var/atom/movable/border_obstacle in src) - if(border_obstacle.flags_1 & ON_BORDER_1) - if(!border_obstacle.CanPass(mover, mover.loc, 1) && (forget != border_obstacle)) - mover.Collide(border_obstacle) - return FALSE - else - large_dense += border_obstacle - //Then, check the turf itself if (!src.CanPass(mover, src)) mover.Collide(src) return FALSE - //Finally, check objects/mobs to block entry that are not on the border - var/atom/movable/tompost_bump + + var/atom/movable/topmost_bump var/top_layer = FALSE - for(var/atom/movable/obstacle in large_dense) + + //Next, check objects to block entry that are on the border + for(var/atom/movable/obstacle in src) if(!obstacle.CanPass(mover, mover.loc, 1) && (forget != obstacle)) - if(obstacle.layer > top_layer) - tompost_bump = obstacle - top_layer = obstacle.layer - if(tompost_bump) - mover.Collide(tompost_bump) + if(obstacle.flags_1 & ON_BORDER_1) + mover.Collide(obstacle) + return FALSE + else + if(obstacle.layer > top_layer) + topmost_bump = obstacle + top_layer = obstacle.layer + + if(topmost_bump) + mover.Collide(topmost_bump) return FALSE return TRUE //Nothing found to block so return success! @@ -446,7 +440,7 @@ /turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, forceop = FALSE) // Remove all atoms except observers, landmarks, docking ports var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object)) - var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(ignore_typecache), ignored_atoms) + var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(), ignored_atoms | ignore_typecache) allowed_contents -= src for(var/i in 1 to allowed_contents.len) var/thing = allowed_contents[i] @@ -512,7 +506,7 @@ return if(has_gravity(src)) playsound(src, "bodyfall", 50, 1) - + faller.drop_all_held_items() /turf/proc/add_decal(decal,group) LAZYINITLIST(decals) diff --git a/code/game/world.dm b/code/game/world.dm index 3763a408acc..65490a9a969 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -1,3 +1,6 @@ +#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round + //This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored + GLOBAL_VAR(security_mode) GLOBAL_PROTECT(security_mode) @@ -12,20 +15,19 @@ GLOBAL_PROTECT(security_mode) make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) - config = new + new /datum/controller/configuration CheckSchemaVersion() SetRoundID() SetupLogs() - if(!RunningService()) //tgs2 support - GLOB.revdata.DownloadPRDetails() + SERVER_TOOLS_ON_NEW load_motd() load_admins() LoadVerbs(/datum/verbs/menu) - if(config.usewhitelist) + if(CONFIG_GET(flag/usewhitelist)) load_whitelist() LoadBans() @@ -33,9 +35,6 @@ GLOBAL_PROTECT(security_mode) Master.Initialize(10, FALSE) - if(config.irc_announce_new_game) - IRCBroadcast("New round starting on [SSmapping.config.map_name]!") - /world/proc/SetupExternalRSC() #if (PRELOAD_RSC == 0) external_rsc_urls = world.file2list("config/external_rsc_urls.txt","\n") @@ -48,7 +47,7 @@ GLOBAL_PROTECT(security_mode) #endif /world/proc/CheckSchemaVersion() - if(config.sql_enabled) + if(CONFIG_GET(flag/sql_enabled)) if(SSdbcore.Connect()) log_world("Database connection established.") var/datum/DBQuery/query_db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_revision")] ORDER BY date DESC LIMIT 1") @@ -68,7 +67,7 @@ GLOBAL_PROTECT(security_mode) log_world("Your server failed to establish a connection with the database.") /world/proc/SetRoundID() - if(config.sql_enabled) + if(CONFIG_GET(flag/sql_enabled)) if(SSdbcore.Connect()) var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')") query_round_start.Execute() @@ -122,12 +121,13 @@ GLOBAL_PROTECT(security_mode) var/pinging = ("ping" in input) var/playing = ("players" in input) - if(!pinging && !playing && config && config.log_world_topic) + if(!pinging && !playing && config && CONFIG_GET(flag/log_world_topic)) WRITE_FILE(GLOB.world_game_log, "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]") - if(input[SERVICE_CMD_PARAM_KEY]) - return ServiceCommand(input) - var/key_valid = (global.comms_allowed && input["key"] == global.comms_key) + SERVER_TOOLS_ON_TOPIC //redirect to server tools if necessary + + var/comms_key = CONFIG_GET(string/comms_key) + var/key_valid = (comms_key && input["key"] == comms_key) if(pinging) var/x = 1 @@ -142,25 +142,14 @@ GLOBAL_PROTECT(security_mode) n++ return n - else if("ircstatus" in input) //tgs2 support - var/static/last_irc_status = 0 - if(world.time - last_irc_status < 50) - return - var/list/adm = get_admin_counts() - var/list/allmins = adm["total"] - var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). " - status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode.name]." - send2irc("Status", status) - last_irc_status = world.time - else if("status" in input) var/list/s = list() s["version"] = GLOB.game_version s["mode"] = GLOB.master_mode - s["respawn"] = config ? GLOB.abandon_allowed : 0 + s["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE s["enter"] = GLOB.enter_allowed - s["vote"] = config.allow_vote_mode - s["ai"] = config.allow_ai + s["vote"] = CONFIG_GET(flag/allow_vote_mode) + s["ai"] = CONFIG_GET(flag/allow_ai) s["host"] = host ? host : null s["active_players"] = get_active_player_count() s["players"] = GLOB.clients.len @@ -210,24 +199,6 @@ GLOBAL_PROTECT(security_mode) if(input["crossmessage"] == "News_Report") minor_announce(input["message"], "Breaking Update From [input["message_sender"]]") - else if("adminmsg" in input) //tgs2 support - if(!key_valid) - return "Bad Key" - else - return IrcPm(input["adminmsg"],input["msg"],input["sender"]) - - else if("namecheck" in input) //tgs2 support - if(!key_valid) - return "Bad Key" - else - log_admin("IRC Name Check: [input["sender"]] on [input["namecheck"]]") - message_admins("IRC name checking on [input["namecheck"]] from [input["sender"]]") - return keywords_lookup(input["namecheck"],1) - else if("adminwho" in input) //tgs2 support - if(!key_valid) - return "Bad Key" - else - return ircadminwho() else if("server_hop" in input) show_server_hop_transfer_screen(input["server_hop"]) @@ -246,7 +217,7 @@ GLOBAL_PROTECT(security_mode) C.AnnouncePR(final_composed) /world/Reboot(reason = 0, fast_track = FALSE) - ServiceReboot() //handles alternative actions if necessary + SERVER_TOOLS_ON_REBOOT if (reason || fast_track) //special reboot, do none of the normal stuff if (usr) log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools") @@ -262,17 +233,6 @@ GLOBAL_PROTECT(security_mode) GLOB.join_motd = file2text("config/motd.txt") + "
" + GLOB.revdata.GetTestMergeInfo() /world/proc/update_status() - var/s = "" - - if (config && config.server_name) - s += "[config.server_name] — " - - s += "[station_name()]"; - s += " (" - s += "" //Change this to wherever you want the hub to link to. - s += "Default" //Replace this with something else. Or ever better, delete it and uncomment the game version. - s += "" - s += ")" var/list/features = list() @@ -282,13 +242,25 @@ GLOBAL_PROTECT(security_mode) if (!GLOB.enter_allowed) features += "closed" - features += GLOB.abandon_allowed ? "respawn" : "no respawn" + var/s = "" + var/hostedby + if(config) + var/server_name = CONFIG_GET(string/servername) + if (server_name) + s += "[server_name] — " + features += "[CONFIG_GET(flag/norespawn) ? "no " : ""]respawn" + if(CONFIG_GET(flag/allow_vote_mode)) + features += "vote" + if(CONFIG_GET(flag/allow_ai)) + features += "AI allowed" + hostedby = CONFIG_GET(string/hostedby) - if (config && config.allow_vote_mode) - features += "vote" - - if (config && config.allow_ai) - features += "AI allowed" + s += "[station_name()]"; + s += " (" + s += "" //Change this to wherever you want the hub to link to. + s += "Default" //Replace this with something else. Or ever better, delete it and uncomment the game version. + s += "" + s += ")" var/n = 0 for (var/mob/M in GLOB.player_list) @@ -300,8 +272,8 @@ GLOBAL_PROTECT(security_mode) else if (n > 0) features += "~[n] player" - if (!host && config && config.hostedby) - features += "hosted by [config.hostedby]" + if (!host && hostedby) + features += "hosted by [hostedby]" if (features) s += ": [jointext(features, ", ")]" diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm index eb4d854d66e..eb81a0de9fd 100644 --- a/code/modules/admin/DB_ban/functions.dm +++ b/code/modules/admin/DB_ban/functions.dm @@ -362,6 +362,7 @@ output += "
Receiving Channel: [channel_name]
" dat+="Message Author: [scanned_user]
" - dat+="Message Body:
[parsepencode(msg, user, SIGNFONT)]
" + dat+="Message Body:
[parsemarkdown(msg, user)]
" dat+="Attach Photo: [(photo ? "Photo Attached" : "No Photo")]" dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" @@ -555,7 +555,7 @@ GLOBAL_LIST_EMPTY(allCasters) if(msg =="" || msg=="\[REDACTED\]" || scanned_user == "Unknown" || channel_name == "" ) screen=6 else - GLOB.news_network.SubmitArticle("[parsepencode(msg, usr, SIGNFONT)]", scanned_user, channel_name, photo, 0, allow_comments) + GLOB.news_network.SubmitArticle("[parsemarkdown(msg, usr)]", scanned_user, channel_name, photo, 0, allow_comments) SSblackbox.inc("newscaster_stories",1) screen=4 msg = "" diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 545414577e4..f8003091312 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -31,8 +31,6 @@ imap += icon('icons/misc/imap.dmi', "blank") imap += icon('icons/misc/imap.dmi', "blank") - //to_chat(world, "[icount] images in list") - for(var/wx = 1 ; wx <= world.maxx; wx++) @@ -142,13 +140,10 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") var/icon/I = imap[1+(ix + icx*iy)*2] var/icon/I2 = imap[2+(ix + icx*iy)*2] - //to_chat(world, "icon: [icon2html(I, world)]") - I.DrawBox(colour, rx, ry, rx+1, ry+1) I2.DrawBox(colour2, rx, ry, rx+1, ry+1) @@ -164,8 +159,6 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //to_chat(world, "[icon2html(I, world)] at [H.screen_loc]") - H.name = (i==0)?"maprefresh":"map" var/icon/HI = new/icon @@ -272,12 +265,8 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") var/icon/I = imap[1+(ix + icx*iy)] - - //to_chat(world, "icon: [icon2html(I, world)]") - I.DrawBox(colour, rx, ry, rx, ry) @@ -291,8 +280,6 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //to_chat(world, "[icon2html(I, world)] at [H.screen_loc]") - H.name = (i==0)?"maprefresh":"map" var/icon/I = imap[i+1] diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 4a5e32d4e85..34d2edc56c1 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -30,6 +30,7 @@ Buildable meters PIPE_HE_MANIFOLD, \ PIPE_HE_4WAYMANIFOLD, \ PIPE_JUNCTION, \ + PIPE_BLUESPACE, \ \ PIPE_CONNECTOR, \ PIPE_UVENT, \ @@ -90,6 +91,7 @@ GLOBAL_LIST_INIT(pipeID2State, list( "[PIPE_HE_MANIFOLD]" = "he_manifold", \ "[PIPE_HE_4WAYMANIFOLD]" = "he_manifold4w", \ "[PIPE_JUNCTION]" = "junction", \ + "[PIPE_BLUESPACE]" = "bluespace", \ \ "[PIPE_CONNECTOR]" = "connector", \ "[PIPE_UVENT]" = "uvent", \ @@ -118,6 +120,7 @@ GLOBAL_LIST_INIT(pipeID2State, list( "[PIPE_HE_MANIFOLD]" = "h/e manifold", \ "[PIPE_HE_4WAYMANIFOLD]"= "h/e 4-way manifold", \ "[PIPE_JUNCTION]" = "junction", \ + "[PIPE_BLUESPACE]" = "bluespace pipe", \ \ "[PIPE_CONNECTOR]" = "connector", \ "[PIPE_UVENT]" = "vent", \ @@ -210,6 +213,8 @@ GLOBAL_LIST_INIT(pipeID2State, list( return ..() if (!isturf(src.loc)) return 1 + + add_fingerprint(user) fixdir() if(pipe_type in list(PIPE_GAS_MIXER, PIPE_GAS_FILTER)) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 456fc1d0bd4..cedb94b7b32 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -2,6 +2,7 @@ name = "pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" + desc = "Dispenses countless types of pipes. Very useful if you need pipes." density = TRUE anchored = TRUE var/wait = 0 @@ -13,13 +14,14 @@ if(..()) return 1 var/dat = {" -Regular pipes:
+Pipes:
Pipe
Bent Pipe
Manifold
4-Way Manifold
Manual Valve
Digital Valve
+Bluespace Pipe
Devices:
Connector
Vent
@@ -107,6 +109,7 @@ name = "disposal pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" + desc = "Dispenses pipes that will ultimately be used to move trash around." density = TRUE anchored = TRUE @@ -182,6 +185,7 @@ Nah icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = TRUE + desc = "Dispenses pipes that will move beings around." anchored = TRUE /obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(mob/user) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index b84de7cf186..8f8202fe199 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -12,6 +12,7 @@ layer = OBJ_LAYER invisibility = INVISIBILITY_OBSERVER //the turret is invisible if it's inside its cover density = TRUE + desc = "A covered turret that shoots at its enemies." use_power = IDLE_POWER_USE //this turret uses and requires power idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power @@ -389,7 +390,7 @@ if(!in_faction(C)) targets += C - if(istype(A, /obj/mecha)) + if(ismecha(A)) var/obj/mecha/M = A //If there is a user and they're not in our faction if(M.occupant && !in_faction(M.occupant)) @@ -552,6 +553,7 @@ base_icon_state = "syndie" faction = "syndicate" emp_vunerable = 0 + desc = "A ballistic machine gun auto-turret." /obj/machinery/porta_turret/syndicate/energy icon_state = "standard_stun" @@ -560,6 +562,7 @@ stun_projectile_sound = 'sound/weapons/taser.ogg' lethal_projectile = /obj/item/projectile/beam/laser/heavylaser lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' + desc = "An energy blaster auto-turret." /obj/machinery/porta_turret/syndicate/setup() return diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 1dbdc52b1e7..7eace086360 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -12,6 +12,7 @@ name = "turret frame" icon = 'icons/obj/turrets.dmi' icon_state = "turret_frame" + desc = "An unfinished covered turret frame." density = TRUE var/build_step = PTURRET_UNSECURED //the current step in the building process var/finish_name = "turret" //the name applied to the product turret diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index c8959ec5512..ef26b59aa59 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -79,7 +79,7 @@ return if(world.time < last_teleport + teleport_cooldown) - to_chat(user, "[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time) / 10)] seconds.") + to_chat(user, "[src] is recharging power. Please wait [DisplayTimeText(last_teleport + teleport_cooldown - world.time)].") return if(teleporting) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 46eb3145e07..d2ea1a4fd68 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -107,24 +107,25 @@ var/obj/item/bodypart/head/as_head = AM var/obj/item/device/mmi/as_mmi = AM var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /mob/living/brain) - if(isliving(AM) || brain_holder) + if(brain_holder) + emergency_stop(AM) + else if(isliving(AM)) if(emagged) - if(!brain_holder) - crush_living(AM) + crush_living(AM) else emergency_stop(AM) else if(istype(AM, /obj/item)) recycle_item(AM) items_recycled++ else - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) - AM.loc = src.loc + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) + AM.forceMove(loc) if(items_recycled && sound) - playsound(src.loc, item_recycle_sound, 50, 1) + playsound(src, item_recycle_sound, 50, 1) /obj/machinery/recycler/proc/recycle_item(obj/item/I) - I.loc = src.loc + I.forceMove(loc) GET_COMPONENT(materials, /datum/component/material_container) var/material_amount = materials.get_item_material_amount(I) @@ -137,25 +138,25 @@ /obj/machinery/recycler/proc/emergency_stop(mob/living/L) - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) safety_mode = TRUE update_icon() - L.loc = src.loc + L.forceMove(loc) addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN) /obj/machinery/recycler/proc/reboot() - playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + playsound(src, 'sound/machines/ping.ogg', 50, 0) safety_mode = FALSE update_icon() /obj/machinery/recycler/proc/crush_living(mob/living/L) - L.loc = src.loc + L.forceMove(loc) if(issilicon(L)) - playsound(src.loc, 'sound/items/welder.ogg', 50, 1) + playsound(src, 'sound/items/welder.ogg', 50, 1) else - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) var/gib = TRUE // By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index a78fa50a6a1..7c51c383fab 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -27,7 +27,7 @@ var/uv_super = FALSE var/uv_cycles = 6 var/message_cooldown - var/breakout_time = 0.5 + var/breakout_time = 300 /obj/machinery/suit_storage_unit/standard_unit suit_type = /obj/item/clothing/suit/space/eva @@ -267,9 +267,9 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message("You see [user] kicking against the doors of [src]!", \ - "You start kicking against the doors... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)", \ "You hear a thump from [src].") - if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src ) return user.visible_message("[user] successfully broke out of [src]!", \ diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 92a4edfcd24..590c8d03a5c 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -3,6 +3,7 @@ /obj/machinery/computer/telecomms/server name = "telecommunications server monitoring console" icon_screen = "comm_logs" + desc = "Has full access to all details and record of the telecommunications network it's monitoring." var/screen = 0 // the screen number: var/list/servers = list() // the servers located by the computer diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index bccbfd96fd3..cb3ae78e72b 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -8,6 +8,7 @@ /obj/machinery/computer/telecomms/monitor name = "telecommunications monitoring console" icon_screen = "comm_monitor" + desc = "Monitors the details of the telecommunications network it's synced with." var/screen = 0 // the screen number: var/list/machinelist = list() // the machines located by the computer diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 4019d970022..bec9c5dfc7c 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -37,7 +37,7 @@ /obj/machinery/telecomms/hub/preset id = "Hub" network = "tcommsat" - autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical", + autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "h_relay", "science", "medical", "supply", "service", "common", "command", "engineering", "security", "receiverA", "receiverB", "broadcasterA", "broadcasterB") diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index ca333b9a6c5..ffe99c243c5 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -68,3 +68,10 @@ hide = 1 toggled = FALSE autolinkers = list("r_relay") + +/obj/machinery/telecomms/relay/preset/reebe + name = "hierophant relay" + desc = "A stolen telecommunications relay that ingeniously combines bluespace technology with the Hierophant network to send and receive messages to and from Reebe." + id = "Hierophant Relay" + hide = TRUE + autolinkers = list("h_relay") diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d90e91a4282..9157173fdee 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -706,7 +706,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C ..() var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random) new T(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/snack/blue icon_state = "snackblue" @@ -758,7 +758,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C . = ..() var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random) new T(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/cola/blue icon_state = "Cola_Machine" diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index efe32c0134e..5e7ddb64979 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -3,15 +3,6 @@ internal_damage_threshold = 50 armor = list(melee = 30, bullet = 30, laser = 15, energy = 20, bomb = 20, bio = 0, rad = 0, fire = 100, acid = 100) -/obj/mecha/combat/CheckParts(list/parts_list) - ..() - var/obj/item/stock_parts/capacitor/C = locate() in contents - var/obj/item/stock_parts/scanning_module/SM = locate() in contents - step_energy_drain = 20 - (5 * SM.rating) //10 is normal, so on lowest part its worse, on second its ok and on higher its real good up to 0 on best - armor["energy"] += (C.rating * 10) //Each level of capacitor protects the mech against emp by 10% - qdel(C) - qdel(SM) - /obj/mecha/combat/moved_inside(mob/living/carbon/human/H) if(..()) if(H.client && H.client.mouse_pointer_icon == initial(H.client.mouse_pointer_icon)) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 8909e6463e1..701b5e15f0d 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -198,6 +198,7 @@ equip_cooldown = 10 energy_drain = 250 range = MELEE|RANGED + flags_2 = NO_MAT_REDEMPTION_2 var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock. /obj/item/mecha_parts/mecha_equipment/rcd/New() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 8efc14d9662..747647b1a54 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -420,13 +420,7 @@ var/datum/component/material_container/M = C if(!M.last_insert_success) return - var/lit = M.last_inserted_type - var/stack_name - if(ispath(lit, /obj/item/ore/bluespace_crystal)) - stack_name = "bluespace" - else - var/obj/item/stack/S = lit - stack_name = material2name(initial(S.materials)[1]) + var/stack_name = material2name(M.last_inserted_id) add_overlay("fab-load-[stack_name]") addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[stack_name]"), 10) updateUsrDialog() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index a1c3bf6ca56..6d9c3f25734 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -202,6 +202,19 @@ GLOB.mechas_list -= src //global mech list return ..() +/obj/mecha/CheckParts(list/parts_list) + ..() + var/obj/item/C = locate(/obj/item/stock_parts/cell) in contents + cell = C + var/obj/item/stock_parts/scanning_module/SM = locate() in contents + var/obj/item/stock_parts/capacitor/CP = locate() in contents + if(SM) + step_energy_drain = 20 - (5 * SM.rating) //10 is normal, so on lowest part its worse, on second its ok and on higher its real good up to 0 on best + qdel(SM) + if(CP) + armor["energy"] += (CP.rating * 10) //Each level of capacitor protects the mech against emp by 10% + qdel(CP) + //////////////////////// ////// Helpers ///////// //////////////////////// @@ -767,7 +780,7 @@ . = t_air.return_pressure() return -/obj/mecha/proc/return_temperature() +/obj/mecha/return_temperature() var/datum/gas_mixture/t_air = return_air() if(t_air) . = t_air.return_temperature() diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 24c1c513c3e..27aeea4c09d 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -102,8 +102,11 @@ /datum/construction/reversible/mecha/ripley - result = "/obj/mecha/working/ripley" + result = /obj/mecha/working/ripley steps = list( + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + //1 list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, @@ -127,38 +130,47 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //10 + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //11 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //12 list("key"=/obj/item/circuitboard/mecha/ripley/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //11 + //13 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //12 + //14 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //13 + //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //14 + //16 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") + ) /datum/construction/reversible/mecha/ripley/action(atom/used_atom,mob/user) @@ -170,24 +182,24 @@ //TODO: better messages. switch(index) - if(14) + if(17) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "ripley1" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "ripley2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "ripley0" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "ripley3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "ripley1" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "ripley4" @@ -196,7 +208,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "ripley2" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -204,7 +216,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "ripley3" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "ripley6" @@ -212,7 +224,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "ripley4" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -220,7 +232,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "ripley5" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "ripley8" @@ -228,54 +240,73 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "ripley6" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "ripley9" else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "ripley7" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "ripley10" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "ripley8" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "ripley11" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "ripley9" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "ripley10" + holder.icon_state = "ripley12" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "ripley8" - if(4) + holder.icon_state = "ripley10" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "ripley11" + holder.icon_state = "ripley13" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "ripley9" - if(3) + holder.icon_state = "ripley11" + if(4) if(diff==FORWARD) user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") - holder.icon_state = "ripley12" + holder.icon_state = "ripley14" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "ripley10" - if(2) + holder.icon_state = "ripley12" + if(3) if(diff==FORWARD) user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") - holder.icon_state = "ripley13" + holder.icon_state = "ripley15" else user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "ripley11" - if(1) + holder.icon_state = "ripley13" + if(2) if(diff==FORWARD) user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") - holder.icon_state = "ripley12" + holder.icon_state = "ripley14" return 1 -/datum/construction/reversible/mecha/ripley/spawn_result() +/datum/construction/reversible/mecha/ripley/spawn_mecha_result() ..() SSblackbox.inc("mecha_ripley_created",1) return @@ -311,8 +342,11 @@ /datum/construction/reversible/mecha/gygax - result = "/obj/mecha/combat/gygax" + result = /obj/mecha/combat/gygax steps = list( + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + //1 list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, @@ -336,60 +370,68 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Advanced capacitor is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Advanced capacitor is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/stock_parts/capacitor, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Advanced scanner module is secured."), + "desc"="Advanced capacitor is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Advanced scanner module is installed."), + "desc"="Advanced capacitor is installed."), //10 - list("key"=/obj/item/stock_parts/scanning_module, + list("key"=/obj/item/stock_parts/capacitor, "backkey"=/obj/item/screwdriver, - "desc"="Weapon control module is secured."), + "desc"="Advanced scanner module is secured."), //11 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Weapon control module is installed."), + "desc"="Advanced scanner module is installed."), //12 - list("key"=/obj/item/circuitboard/mecha/gygax/targeting, + list("key"=/obj/item/stock_parts/scanning_module, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="Weapon control module is secured."), //13 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="Weapon control module is installed."), //14 - list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, + list("key"=/obj/item/circuitboard/mecha/gygax/targeting, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //16 + list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //17 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //18 list("key"=/obj/item/circuitboard/mecha/gygax/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //17 + //19 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //18 + //20 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //19 + //21 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //20 + //22 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -403,24 +445,24 @@ //TODO: better messages. switch(index) - if(20) + if(23) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "gygax1" - if(19) + if(22) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "gygax2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "gygax0" - if(18) + if(21) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "gygax3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "gygax1" - if(17) + if(20) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "gygax4" @@ -429,7 +471,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "gygax2" - if(16) + if(19) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -437,7 +479,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "gygax3" - if(15) + if(18) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "gygax6" @@ -445,7 +487,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/gygax/main(get_turf(holder)) holder.icon_state = "gygax4" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -453,7 +495,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "gygax5" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "gygax8" @@ -461,7 +503,7 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/gygax/peripherals(get_turf(holder)) holder.icon_state = "gygax6" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) @@ -469,7 +511,7 @@ else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "gygax7" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "gygax10" @@ -477,7 +519,7 @@ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/circuitboard/mecha/gygax/targeting(get_turf(holder)) holder.icon_state = "gygax8" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs scanner module to the [holder].", "You install scanner module to the [holder].") var/obj/item/I = used_atom @@ -486,7 +528,7 @@ else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "gygax9" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the advanced scanner module.", "You secure the scanner module.") holder.icon_state = "gygax12" @@ -495,7 +537,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "gygax10" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom @@ -504,7 +546,7 @@ else user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") holder.icon_state = "gygax11" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") holder.icon_state = "gygax14" @@ -513,57 +555,74 @@ var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "gygax12" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "gygax15" else user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") holder.icon_state = "gygax13" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "gygax16" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "gygax14" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "gygax17" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "gygax15" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "gygax16" + holder.icon_state = "gygax18" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "gygax14" - if(4) + holder.icon_state = "gygax16" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "gygax17" + holder.icon_state = "gygax19" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "gygax15" - if(3) + holder.icon_state = "gygax17" + if(4) if(diff==FORWARD) user.visible_message("[user] installs Gygax Armor Plates to the [holder].", "You install Gygax Armor Plates to the [holder].") qdel(used_atom) - holder.icon_state = "gygax18" + holder.icon_state = "gygax20" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "gygax16" - if(2) + holder.icon_state = "gygax18" + if(3) if(diff==FORWARD) user.visible_message("[user] secures Gygax Armor Plates.", "You secure Gygax Armor Plates.") - holder.icon_state = "gygax19" + holder.icon_state = "gygax21" else user.visible_message("[user] pries Gygax Armor Plates from the [holder].", "You pry Gygax Armor Plates from the [holder].") new /obj/item/mecha_parts/part/gygax_armor(get_turf(holder)) - holder.icon_state = "gygax17" - if(1) + holder.icon_state = "gygax19" + if(2) if(diff==FORWARD) user.visible_message("[user] welds Gygax Armor Plates to the [holder].", "You weld Gygax Armor Plates to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens Gygax Armor Plates.", "You unfasten Gygax Armor Plates.") - holder.icon_state = "gygax18" + holder.icon_state = "gygax20" return 1 -/datum/construction/reversible/mecha/gygax/spawn_result() - var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder.contents) - qdel(holder) +/datum/construction/reversible/mecha/gygax/spawn_mecha_result() + ..() SSblackbox.inc("mecha_gygax_created",1) return @@ -596,13 +655,16 @@ /datum/construction/reversible/mecha/firefighter - result = "/obj/mecha/working/ripley/firefighter" + result = /obj/mecha/working/ripley/firefighter steps = list( - //1 - list("key"=/obj/item/weldingtool, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), - //2 + //2 list("key"=/obj/item/wrench, "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), @@ -622,40 +684,47 @@ list("key"=/obj/item/wrench, "backkey"=/obj/item/crowbar, "desc"="Internal armor is installed."), - //7 list("key"=/obj/item/stack/sheet/plasteel, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="The power cell is secured."), //8 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="The power cell is installed."), //9 - list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //10 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //11 + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //12 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //13 list("key"=/obj/item/circuitboard/mecha/ripley/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //12 + //14 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //13 + //15 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //14 + //16 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //15 + //17 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -669,24 +738,24 @@ //TODO: better messages. switch(index) - if(15) + if(18) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "fireripley1" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "fireripley2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "fireripley0" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "fireripley3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "fireripley1" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "fireripley4" @@ -695,7 +764,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "fireripley2" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -703,7 +772,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "fireripley3" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "fireripley6" @@ -711,7 +780,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "fireripley4" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -719,7 +788,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "fireripley5" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "fireripley8" @@ -727,64 +796,82 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "fireripley6" - if(7) + if(10) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "fireripley9" else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "fireripley7" - - if(6) + if(9) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "fireripley10" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "fireripley8" + if(8) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "fireripley11" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "fireripley9" + if(7) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "fireripley10" + holder.icon_state = "fireripley12" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "fireripley8" - if(5) + holder.icon_state = "fireripley10" + if(6) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "fireripley11" + holder.icon_state = "fireripley13" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "fireripley9" - if(4) + holder.icon_state = "fireripley11" + if(5) if(diff==FORWARD) user.visible_message("[user] starts to install the external armor layer to the [holder].", "You install the external armor layer to the [holder].") - holder.icon_state = "fireripley12" + holder.icon_state = "fireripley14" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "fireripley10" - if(3) + holder.icon_state = "fireripley12" + if(4) if(diff==FORWARD) user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") - holder.icon_state = "fireripley13" + holder.icon_state = "fireripley15" else user.visible_message("[user] removes the external armor from the [holder].", "You remove the external armor from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "fireripley11" - if(2) + holder.icon_state = "fireripley13" + if(3) if(diff==FORWARD) user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") - holder.icon_state = "fireripley14" + holder.icon_state = "fireripley16" else user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "fireripley12" - if(1) + holder.icon_state = "fireripley14" + if(2) if(diff==FORWARD) user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") - holder.icon_state = "fireripley13" + holder.icon_state = "fireripley15" return 1 -/datum/construction/reversible/mecha/firefighter/spawn_result() +/datum/construction/reversible/mecha/firefighter/spawn_mecha_result() ..() SSblackbox.inc("mecha_firefighter_created",1) return @@ -818,19 +905,23 @@ /datum/construction/mecha/honker - result = "/obj/mecha/combat/honker" - steps = list(list("key"=/obj/item/bikehorn), //1 + result = /obj/mecha/combat/honker + steps = list( + list("desc"="You shouldn't be able to see this."), //0, note steps in the construction path are +1 to the ones here + list("key"=/obj/item/bikehorn), //1 list("key"=/obj/item/clothing/shoes/clown_shoes), //2 list("key"=/obj/item/bikehorn), //3 list("key"=/obj/item/clothing/mask/gas/clown_hat), //4 list("key"=/obj/item/bikehorn), //5 - list("key"=/obj/item/circuitboard/mecha/honker/targeting), //6 + list("key"=/obj/item/stock_parts/cell), //6 list("key"=/obj/item/bikehorn), //7 - list("key"=/obj/item/circuitboard/mecha/honker/peripherals), //8 + list("key"=/obj/item/circuitboard/mecha/honker/targeting), //8 list("key"=/obj/item/bikehorn), //9 - list("key"=/obj/item/circuitboard/mecha/honker/main), //10 + list("key"=/obj/item/circuitboard/mecha/honker/peripherals), //10 list("key"=/obj/item/bikehorn), //11 - ) + list("key"=/obj/item/circuitboard/mecha/honker/main), //12 + list("key"=/obj/item/bikehorn), //13 + ) /datum/construction/mecha/honker/action(atom/used_atom,mob/user) return check_step(used_atom,user) @@ -842,27 +933,34 @@ if(istype(used_atom, /obj/item/bikehorn)) playsound(holder, 'sound/items/bikehorn.ogg', 50, 1) user.visible_message("HONK!") + if(step==2) + spawn_mecha_result() + //TODO: better messages. switch(step) - if(10) + if(13) user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].") qdel(used_atom) - if(8) + if(11) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) - if(6) + if(9) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) - if(4) + if(7) + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) + if(5) user.visible_message("[user] puts clown wig and mask on the [holder].", "You put clown wig and mask on the [holder].") qdel(used_atom) - if(2) + if(3) user.visible_message("[user] puts clown boots on the [holder].", "You put clown boots on the [holder].") qdel(used_atom) return 1 -/datum/construction/mecha/honker/spawn_result() +/datum/construction/mecha/honker/spawn_mecha_result() ..() SSblackbox.inc("mecha_honker_created",1) return @@ -895,10 +993,13 @@ return /datum/construction/reversible/mecha/durand - result = "/obj/mecha/combat/durand" + result = /obj/mecha/combat/durand steps = list( - //1 - list("key"=/obj/item/weldingtool, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //2 @@ -920,60 +1021,68 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Super capacitor is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Super capacitor is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/stock_parts/capacitor, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Phasic scanner module is secured."), + "desc"="Super capacitor is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Phasic scanner module is installed."), + "desc"="Super capacitor is installed."), //10 - list("key"=/obj/item/stock_parts/scanning_module, + list("key"=/obj/item/stock_parts/capacitor, "backkey"=/obj/item/screwdriver, - "desc"="Weapon control module is secured."), + "desc"="Phasic scanner module is secured."), //11 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Weapon control module is installed."), + "desc"="Phasic scanner module is installed."), //12 - list("key"=/obj/item/circuitboard/mecha/durand/targeting, + list("key"=/obj/item/stock_parts/scanning_module, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="Weapon control module is secured."), //13 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="Weapon control module is installed."), //14 - list("key"=/obj/item/circuitboard/mecha/durand/peripherals, + list("key"=/obj/item/circuitboard/mecha/durand/targeting, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //16 + list("key"=/obj/item/circuitboard/mecha/durand/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //17 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //18 list("key"=/obj/item/circuitboard/mecha/durand/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //17 + //19 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //18 + //20 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //19 + //21 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //20 + //22 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -988,24 +1097,24 @@ //TODO: better messages. switch(index) - if(20) + if(23) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "durand1" - if(19) + if(22) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "durand2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "durand0" - if(18) + if(21) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "durand3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "durand1" - if(17) + if(20) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "durand4" @@ -1014,7 +1123,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "durand2" - if(16) + if(19) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -1022,7 +1131,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "durand3" - if(15) + if(18) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "durand6" @@ -1030,7 +1139,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/durand/main(get_turf(holder)) holder.icon_state = "durand4" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -1038,7 +1147,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "durand5" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "durand8" @@ -1046,7 +1155,7 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/durand/peripherals(get_turf(holder)) holder.icon_state = "durand6" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) @@ -1054,7 +1163,7 @@ else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "durand7" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "durand10" @@ -1062,7 +1171,7 @@ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/circuitboard/mecha/durand/targeting(get_turf(holder)) holder.icon_state = "durand8" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs scanner module to the [holder].", "You install phasic scanner module to the [holder].") var/obj/item/I = used_atom @@ -1071,7 +1180,7 @@ else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "durand9" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") holder.icon_state = "durand12" @@ -1080,7 +1189,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "durand10" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom @@ -1089,7 +1198,7 @@ else user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") holder.icon_state = "durand11" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") holder.icon_state = "durand14" @@ -1098,64 +1207,80 @@ var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "durand12" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "durand15" else - user.visible_message("[user] unfastens the super capacitor.", "You unfasten the capacitor.") + user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") holder.icon_state = "durand13" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "durand16" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "durand14" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "durand17" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "durand15" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "durand16" + holder.icon_state = "durand18" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "durand14" - if(4) + holder.icon_state = "durand16" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "durand17" + holder.icon_state = "durand19" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "durand15" - if(3) + holder.icon_state = "durand17" + if(4) if(diff==FORWARD) user.visible_message("[user] installs Durand Armor Plates to the [holder].", "You install Durand Armor Plates to the [holder].") qdel(used_atom) - holder.icon_state = "durand18" + holder.icon_state = "durand20" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "durand16" - if(2) + holder.icon_state = "durand18" + if(3) if(diff==FORWARD) user.visible_message("[user] secures Durand Armor Plates.", "You secure Durand Armor Plates.") - holder.icon_state = "durand19" + holder.icon_state = "durand21" else user.visible_message("[user] pries Durand Armor Plates from the [holder].", "You pry Durand Armor Plates from the [holder].") new /obj/item/mecha_parts/part/durand_armor(get_turf(holder)) - holder.icon_state = "durand17" - if(1) + holder.icon_state = "durand19" + if(2) if(diff==FORWARD) user.visible_message("[user] welds Durand Armor Plates to the [holder].", "You weld Durand Armor Plates to the [holder].") + spawn_mecha_result() else user.visible_message("[user] unfastens Durand Armor Plates.", "You unfasten Durand Armor Plates.") - holder.icon_state = "durand18" + holder.icon_state = "durand20" return 1 -/datum/construction/reversible/mecha/durand/spawn_result() - var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder.contents) - qdel(holder) +/datum/construction/reversible/mecha/durand/spawn_mecha_result() + ..() SSblackbox.inc("mecha_durand_created",1) return //PHAZON /datum/construction/mecha/phazon_chassis - result = "/obj/mecha/combat/phazon" steps = list(list("key"=/obj/item/mecha_parts/part/phazon_torso), //1 list("key"=/obj/item/mecha_parts/part/phazon_left_arm), //2 list("key"=/obj/item/mecha_parts/part/phazon_right_arm), //3 @@ -1183,15 +1308,17 @@ return /datum/construction/reversible/mecha/phazon - result = "/obj/mecha/combat/phazon" + result = /obj/mecha/combat/phazon steps = list( - //1 - list("key"=/obj/item/device/assembly/signaler/anomaly, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/device/assembly/signaler/anomaly, "backkey"=null, //Cannot remove the anomaly core once it's in "desc"="Anomaly core socket is open and awaiting connection."), - - //2 - list("key"=/obj/item/weldingtool, + //2 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //3 @@ -1213,72 +1340,80 @@ //7 list("key"=/obj/item/stack/sheet/plasteel, "backkey"=/obj/item/screwdriver, - "desc"="The bluespace crystal is engaged."), + "desc"="The power cell is secured."), //8 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="The power cell is installed."), + //9 + list("key"=/obj/item/stock_parts/cell, + "backkey"=/obj/item/screwdriver, + "desc"="The bluespace crystal is engaged."), + //10 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wirecutters, "desc"="The bluespace crystal is connected."), - //9 + //11 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/crowbar, "desc"="The bluespace crystal is installed."), - //10 + //12 list("key"=/obj/item/ore/bluespace_crystal, "backkey"=/obj/item/screwdriver, "desc"="Super capacitor is secured."), - //12 - list("key"=/obj/item/screwdriver, - "backkey"=/obj/item/crowbar, - "desc"="Super capacitor is installed."), - //12 - list("key"=/obj/item/stock_parts/capacitor, - "backkey"=/obj/item/screwdriver, - "desc"="Phasic scanner module is secured."), //13 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Phasic scanner module is installed."), + "desc"="Super capacitor is installed."), //14 - list("key"=/obj/item/stock_parts/scanning_module, + list("key"=/obj/item/stock_parts/capacitor, "backkey"=/obj/item/screwdriver, - "desc"="Weapon control module is secured."), + "desc"="Phasic scanner module is secured."), //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Weapon control is installed."), + "desc"="Phasic scanner module is installed."), //16 - list("key"=/obj/item/circuitboard/mecha/phazon/targeting, + list("key"=/obj/item/stock_parts/scanning_module, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="Weapon control module is secured."), //17 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed"), + "desc"="Weapon control is installed."), //18 - list("key"=/obj/item/circuitboard/mecha/phazon/peripherals, + list("key"=/obj/item/circuitboard/mecha/phazon/targeting, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //19 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed"), //20 + list("key"=/obj/item/circuitboard/mecha/phazon/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //21 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //22 list("key"=/obj/item/circuitboard/mecha/phazon/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //21 + //23 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //22 + //24 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //23 + //25 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //24 + //26 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -1293,24 +1428,24 @@ //TODO: better messages. switch(index) - if(24) + if(27) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "phazon1" - if(23) + if(26) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "phazon2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "phazon0" - if(22) + if(25) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "phazon3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "phazon1" - if(21) + if(24) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "phazon4" @@ -1319,7 +1454,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "phazon2" - if(20) + if(23) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -1327,7 +1462,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "phazon3" - if(19) + if(22) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "phazon6" @@ -1335,7 +1470,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/phazon/main(get_turf(holder)) holder.icon_state = "phazon4" - if(18) + if(21) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -1343,7 +1478,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "phazon5" - if(17) + if(20) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "phazon8" @@ -1351,7 +1486,7 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/phazon/peripherals(get_turf(holder)) holder.icon_state = "phazon6" - if(16) + if(19) if(diff==FORWARD) user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) @@ -1359,7 +1494,7 @@ else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "phazon7" - if(15) + if(18) if(diff==FORWARD) user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "phazon10" @@ -1367,7 +1502,7 @@ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/circuitboard/mecha/phazon/targeting(get_turf(holder)) holder.icon_state = "phazon8" - if(14) + if(17) if(diff==FORWARD) user.visible_message("[user] installs phasic scanner module to the [holder].", "You install scanner module to the [holder].") var/obj/item/I = used_atom @@ -1376,7 +1511,7 @@ else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "phazon9" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] secures the phasic scanner module.", "You secure the scanner module.") holder.icon_state = "phazon12" @@ -1385,7 +1520,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "phazon10" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] installs super capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom @@ -1394,7 +1529,7 @@ else user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the scanner module.") holder.icon_state = "phazon11" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] secures the super capacitor.", "You secure the capacitor.") holder.icon_state = "phazon14" @@ -1403,7 +1538,7 @@ var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "phazon12" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs the bluespace crystal.", "You install the bluespace crystal.") qdel(used_atom) @@ -1411,7 +1546,7 @@ else user.visible_message("[user] unsecures the super capacitor from the [holder].", "You unsecure the capacitor from the [holder].") holder.icon_state = "phazon13" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] connects the bluespace crystal.", "You connect the bluespace crystal.") holder.icon_state = "phazon16" @@ -1419,68 +1554,85 @@ user.visible_message("[user] removes the bluespace crystal from the [holder].", "You remove the bluespace crystal from the [holder].") new /obj/item/ore/bluespace_crystal(get_turf(holder)) holder.icon_state = "phazon14" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] engages the bluespace crystal.", "You engage the bluespace crystal.") holder.icon_state = "phazon17" else user.visible_message("[user] disconnects the bluespace crystal from the [holder].", "You disconnect the bluespace crystal from the [holder].") holder.icon_state = "phazon15" - if(7) + if(10) if(diff==FORWARD) - user.visible_message("[user] installs the phase armor layer to the [holder].", "You install the phase armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "phazon18" else user.visible_message("[user] disengages the bluespace crystal.", "You disengage the bluespace crystal.") holder.icon_state = "phazon16" - if(6) + if(9) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "phazon19" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "phazon17" + if(8) + if(diff==FORWARD) + user.visible_message("[user] installs the phase armor layer to the [holder].", "You install the phase armor layer to the [holder].") + holder.icon_state = "phazon20" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "durand18" + if(7) if(diff==FORWARD) user.visible_message("[user] secures the phase armor layer.", "You secure the phase armor layer.") - holder.icon_state = "phazon19" + holder.icon_state = "phazon21" else user.visible_message("[user] pries the phase armor layer from the [holder].", "You pry the phase armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - holder.icon_state = "phazon17" - if(5) + holder.icon_state = "phazon19" + if(6) if(diff==FORWARD) user.visible_message("[user] welds the phase armor layer to the [holder].", "You weld the phase armor layer to the [holder].") - holder.icon_state = "phazon20" + holder.icon_state = "phazon22" else user.visible_message("[user] unfastens the phase armor layer.", "You unfasten the phase armor layer.") - holder.icon_state = "phazon18" - if(4) + holder.icon_state = "phazon20" + if(5) if(diff==FORWARD) user.visible_message("[user] installs Phazon Armor Plates to the [holder].", "You install Phazon Armor Plates to the [holder].") qdel(used_atom) - holder.icon_state = "phazon21" + holder.icon_state = "phazon23" else user.visible_message("[user] cuts phase armor layer from the [holder].", "You cut the phase armor layer from the [holder].") - holder.icon_state = "phazon19" - if(3) + holder.icon_state = "phazon21" + if(4) if(diff==FORWARD) user.visible_message("[user] secures Phazon Armor Plates.", "You secure Phazon Armor Plates.") - holder.icon_state = "phazon22" + holder.icon_state = "phazon24" else user.visible_message("[user] pries Phazon Armor Plates from the [holder].", "You pry Phazon Armor Plates from the [holder].") new /obj/item/mecha_parts/part/phazon_armor(get_turf(holder)) - holder.icon_state = "phazon20" - if(2) + holder.icon_state = "phazon22" + if(3) if(diff==FORWARD) user.visible_message("[user] welds Phazon Armor Plates to the [holder].", "You weld Phazon Armor Plates to the [holder].") else user.visible_message("[user] unfastens Phazon Armor Plates.", "You unfasten Phazon Armor Plates.") - holder.icon_state = "phazon21" - if(1) + holder.icon_state = "phazon23" + if(2) if(diff==FORWARD) user.visible_message("[user] carefully inserts the anomaly core into \the [holder] and secures it.", "You slowly place the anomaly core into its socket and close its chamber.") qdel(used_atom) + spawn_mecha_result() return 1 -/datum/construction/reversible/mecha/phazon/spawn_result() - var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder.contents) - qdel(holder) +/datum/construction/reversible/mecha/phazon/spawn_mecha_result() + ..() SSblackbox.inc("mecha_phazon_created",1) return @@ -1515,13 +1667,16 @@ /datum/construction/reversible/mecha/odysseus - result = "/obj/mecha/medical/odysseus" + result = /obj/mecha/medical/odysseus steps = list( - //1 - list("key"=/obj/item/weldingtool, + //0, dummy step used to stop the steps from finishing and spawn_result() being called automatically. + list("desc"="You shouldn't be able to see this."), + + //1 + list("key"=/obj/item/weldingtool, "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), - //2 + //2 list("key"=/obj/item/wrench, "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), @@ -1540,36 +1695,44 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/screwdriver, - "desc"="Peripherals control module is secured."), + "desc"="The power cell is secured."), //7 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Peripherals control module is installed."), + "desc"="The power cell is installed."), //8 - list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals, + list("key"=/obj/item/stock_parts/cell, "backkey"=/obj/item/screwdriver, - "desc"="Central control module is secured."), + "desc"="Peripherals control module is secured."), //9 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/crowbar, - "desc"="Central control module is installed."), + "desc"="Peripherals control module is installed."), //10 + list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals, + "backkey"=/obj/item/screwdriver, + "desc"="Central control module is secured."), + //11 + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, + "desc"="Central control module is installed."), + //12 list("key"=/obj/item/circuitboard/mecha/odysseus/main, "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), - //11 + //13 list("key"=/obj/item/wirecutters, "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), - //12 + //14 list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), - //13 + //15 list("key"=/obj/item/screwdriver, "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), - //14 + //16 list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -1583,24 +1746,24 @@ //TODO: better messages. switch(index) - if(14) + if(17) user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "odysseus1" - if(13) + if(16) if(diff==FORWARD) user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "odysseus2" else user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "odysseus0" - if(12) + if(15) if(diff==FORWARD) user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "odysseus3" else user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "odysseus1" - if(11) + if(14) if(diff==FORWARD) user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "odysseus4" @@ -1609,7 +1772,7 @@ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "odysseus2" - if(10) + if(13) if(diff==FORWARD) user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) @@ -1617,7 +1780,7 @@ else user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "odysseus3" - if(9) + if(12) if(diff==FORWARD) user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "odysseus6" @@ -1625,7 +1788,7 @@ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/circuitboard/mecha/odysseus/main(get_turf(holder)) holder.icon_state = "odysseus4" - if(8) + if(11) if(diff==FORWARD) user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) @@ -1633,7 +1796,7 @@ else user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "odysseus5" - if(7) + if(10) if(diff==FORWARD) user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "odysseus8" @@ -1641,56 +1804,74 @@ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/circuitboard/mecha/odysseus/peripherals(get_turf(holder)) holder.icon_state = "odysseus6" - if(6) + if(9) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the power cell into the [holder].", "You install the power cell into the [holder].") + var/obj/item/I = used_atom + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "odysseus9" else user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "odysseus7" - if(5) + if(8) + if(diff==FORWARD) + user.visible_message("[user] secures the power cell.", "You secure the power cell.") + holder.icon_state = "odysseus10" + else + user.visible_message("[user] prys the power cell from [holder].", "You pry the power cell from [holder].") + var/obj/item/I = locate(/obj/item/stock_parts/cell) in holder + I.forceMove(holder.drop_location()) + holder.icon_state = "odysseus8" + if(7) + if(diff==FORWARD) + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + holder.icon_state = "odysseus11" + else + user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + holder.icon_state = "odysseus9" + if(6) if(diff==FORWARD) user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") - holder.icon_state = "odysseus10" + holder.icon_state = "odysseus12" else user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 - holder.icon_state = "odysseus8" - if(4) + holder.icon_state = "odysseus10" + if(5) if(diff==FORWARD) user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") - holder.icon_state = "odysseus11" + holder.icon_state = "odysseus13" else user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") - holder.icon_state = "odysseus9" - if(3) + holder.icon_state = "odysseus11" + if(4) if(diff==FORWARD) user.visible_message("[user] installs [used_atom] layer to the [holder].", "You install the external reinforced armor layer to the [holder].") - holder.icon_state = "odysseus12" + holder.icon_state = "odysseus14" else user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") - holder.icon_state = "odysseus10" - if(2) + holder.icon_state = "odysseus12" + if(3) if(diff==FORWARD) user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") - holder.icon_state = "odysseus13" + holder.icon_state = "odysseus15" else var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 user.visible_message("[user] pries [MS] from the [holder].", "You pry [MS] from the [holder].") - holder.icon_state = "odysseus11" - if(1) + holder.icon_state = "odysseus13" + if(2) if(diff==FORWARD) user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") - holder.icon_state = "odysseus14" + spawn_mecha_result() else user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") - holder.icon_state = "odysseus12" + holder.icon_state = "odysseus14" return 1 -/datum/construction/reversible/mecha/odysseus/spawn_result() +/datum/construction/reversible/mecha/odysseus/spawn_mecha_result() ..() SSblackbox.inc("mecha_odysseus_created",1) return diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 5b9aa28174c..431768500e6 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -92,15 +92,15 @@ qdel(src) /obj/item/mecha_parts/mecha_tracking/Destroy() - if(istype(loc, /obj/mecha)) + if(ismecha(loc)) var/obj/mecha/M = loc if(src in M.trackers) M.trackers -= src return ..() /obj/item/mecha_parts/mecha_tracking/proc/in_mecha() - if(istype(src.loc, /obj/mecha)) - return src.loc + if(ismecha(loc)) + return loc return 0 /obj/item/mecha_parts/mecha_tracking/proc/shock() @@ -110,7 +110,7 @@ qdel(src) /obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log() - if(!istype(loc, /obj/mecha)) + if(!ismecha(loc)) return 0 var/obj/mecha/M = src.loc return M.get_log_html() diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index f09ae53e316..3f32b18178c 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -283,13 +283,13 @@ var/area/A = get_area(location) var/where = "[A.name] | [location.x], [location.y]" - var/whereLink = "[where]" + var/whereLink = "[where]" if(carry.my_atom.fingerprintslast) var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast) var/more = "" if(M) - more = "(?) (FLW) " + more = "(?) (FLW) " message_admins("Smoke: ([whereLink])[contained]. Key: [carry.my_atom.fingerprintslast][more].", 0, 1) log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].") else diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index e0cec3af026..30aa68dcadf 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -157,10 +157,26 @@ /obj/effect/landmark/start/wizard name = "wizard" -/obj/effect/landmark/start/wizard/Initialize(mapload) +/obj/effect/landmark/start/wizard/Initialize() ..() GLOB.wizardstart += loc - qdel(src) + return INITIALIZE_HINT_QDEL + +/obj/effect/landmark/start/nukeop + name = "nukeop" + +/obj/effect/landmark/start/nukeop/Initialize() + ..() + GLOB.nukeop_start += loc + return INITIALIZE_HINT_QDEL + +/obj/effect/landmark/start/nukeop_leader + name = "nukeop leader" + +/obj/effect/landmark/start/nukeop_leader/Initialize() + ..() + GLOB.nukeop_leader_start += loc + return INITIALIZE_HINT_QDEL /obj/effect/landmark/start/new_player name = "New Player" @@ -173,7 +189,7 @@ /obj/effect/landmark/start/new_player/Initialize(mapload) ..() - qdel(src) + return INITIALIZE_HINT_QDEL @@ -183,7 +199,7 @@ /obj/effect/landmark/latejoin/Initialize(mapload) ..() SSjob.latejoin_trackers += loc - qdel(src) + return INITIALIZE_HINT_QDEL // carp. /obj/effect/landmark/carpspawn @@ -205,23 +221,6 @@ /obj/effect/landmark/tripai name = "tripai" -// marauder entry (XXX WTF IS MAURADER ENTRY???) - -/obj/effect/landmark/marauder_entry - name = "Marauder Entry" - -// syndicate breach area (XXX I DON'T KNOW WHAT THIS IS EITHER) - -/obj/effect/landmark/syndicate_breach_area - name = "Syndicate Breach Area" - -// teleport scroll landmark, XXX DOES THIS DO ANYTHING? -/obj/effect/landmark/teleport_scroll - name = "Teleport-Scroll" - -/obj/effect/landmark/syndicate_spawn - name = "Syndicate-Spawn" - // xenos. /obj/effect/landmark/xeno_spawn name = "xeno_spawn" @@ -229,7 +228,7 @@ /obj/effect/landmark/xeno_spawn/Initialize(mapload) ..() GLOB.xeno_spawn += loc - qdel(src) + return INITIALIZE_HINT_QDEL // blobs. /obj/effect/landmark/blobstart @@ -238,7 +237,7 @@ /obj/effect/landmark/blobstart/Initialize(mapload) ..() GLOB.blobstart += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/secequipment name = "secequipment" @@ -246,7 +245,7 @@ /obj/effect/landmark/secequipment/Initialize(mapload) ..() GLOB.secequipment += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/prisonwarp name = "prisonwarp" @@ -254,15 +253,15 @@ /obj/effect/landmark/prisonwarp/Initialize(mapload) ..() GLOB.prisonwarp += loc - qdel(src) - + return INITIALIZE_HINT_QDEL + /obj/effect/landmark/ert_spawn name = "Emergencyresponseteam" /obj/effect/landmark/ert_spawn/Initialize(mapload) ..() GLOB.emergencyresponseteamspawn += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/holding_facility name = "Holding Facility" @@ -270,7 +269,7 @@ /obj/effect/landmark/holding_facility/Initialize(mapload) ..() GLOB.holdingfacility += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/observe name = "tdomeobserve" @@ -278,7 +277,7 @@ /obj/effect/landmark/thunderdome/observe/Initialize(mapload) ..() GLOB.tdomeobserve += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/one name = "tdome1" @@ -286,7 +285,7 @@ /obj/effect/landmark/thunderdome/one/Initialize(mapload) ..() GLOB.tdome1 += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/two name = "tdome2" @@ -294,7 +293,7 @@ /obj/effect/landmark/thunderdome/two/Initialize(mapload) ..() GLOB.tdome2 += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/admin name = "tdomeadmin" @@ -302,6 +301,25 @@ /obj/effect/landmark/thunderdome/admin/Initialize(mapload) ..() GLOB.tdomeadmin += loc + return INITIALIZE_HINT_QDEL + +//Servant spawn locations +/obj/effect/landmark/servant_of_ratvar + name = "servant of ratvar spawn" + +/obj/effect/landmark/servant_of_ratvar/Initialize(mapload) + ..() + GLOB.servant_spawns += loc + qdel(src) + +//City of Cogs entrances +/obj/effect/landmark/city_of_cogs + name = "city of cogs entrance" + icon_state = "x4" + +/obj/effect/landmark/city_of_cogs/Initialize(mapload) + ..() + GLOB.city_of_cogs_spawns += loc qdel(src) //generic event spawns diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index f4155cfc926..6cc4200a15b 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -40,10 +40,10 @@ /obj/effect/portal/attackby(obj/item/W, mob/user, params) if(user && Adjacent(user)) - teleport(user) + user.forceMove(get_turf(src)) /obj/effect/portal/Crossed(atom/movable/AM, oldloc) - if(get_turf(oldloc) == get_turf(linked)) + if(linked && (get_turf(oldloc) == get_turf(linked))) return ..() if(!teleport(AM)) return ..() @@ -53,7 +53,7 @@ /obj/effect/portal/attack_hand(mob/user) if(Adjacent(user)) - teleport(user) + user.forceMove(get_turf(src)) /obj/effect/portal/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override) . = ..() @@ -125,7 +125,7 @@ return ..() /obj/effect/portal/proc/teleport(atom/movable/M) - if(!istype(M) || istype(M, /obj/effect) || (istype(M, /obj/mecha) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport. + if(!istype(M) || istype(M, /obj/effect) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport. return var/turf/real_target = get_link_target_turf() if(!istype(real_target)) diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm index 62471505d0e..70128be7ee1 100644 --- a/code/game/objects/effects/proximity.dm +++ b/code/game/objects/effects/proximity.dm @@ -33,7 +33,7 @@ if(!force_rebuild && range == current_range) return FALSE . = TRUE - + current_range = range var/list/checkers_local = checkers diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index cfe8761b84c..be32f0df199 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -12,7 +12,7 @@ var/turf/T = get_turf(src) for(var/path in items) new path(T) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/spawner/bundle/costume/chicken name = "chicken costume spawner" diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 94cabaf6e19..21843aee3e9 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -18,7 +18,7 @@ if(lootspawn) new lootspawn(T) lootcount-- - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/spawner/lootdrop/armory_contraband name = "armory contraband gun spawner" @@ -89,7 +89,7 @@ /obj/effect/spawner/lootdrop/maintenance/Initialize(mapload) loot = GLOB.maintenance_loot - ..() + . = ..() /obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF! @@ -130,7 +130,7 @@ loot = list() for(var/path in subtypesof(/obj/effect/spawner/bundle/costume)) loot[path] = TRUE - ..() + . = ..() // Minor lootdrops follow diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index a452dae7497..593c953adf1 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -17,4 +17,4 @@ log_game("An alien egg has been delivered to [A] at [COORD(T)]") var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen." SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time)) - qdel(src) + return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 84c75270f95..6722ffd89be 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -52,6 +52,7 @@ icon_state = "eggs" var/amount_grown = 0 var/player_spiders = 0 + var/directive = "" //Message from the mother var/poison_type = "toxin" var/poison_per_bite = 5 var/list/faction = list("spiders") @@ -71,6 +72,7 @@ S.poison_type = poison_type S.poison_per_bite = poison_per_bite S.faction = faction.Copy() + S.directive = directive if(player_spiders) S.player_spiders = 1 qdel(src) @@ -87,10 +89,15 @@ var/obj/machinery/atmospherics/components/unary/vent_pump/entry_vent var/travelling_in_vent = 0 var/player_spiders = 0 + var/directive = "" //Message from the mother var/poison_type = "toxin" var/poison_per_bite = 5 var/list/faction = list("spiders") +/obj/structure/spider/spiderling/Destroy() + new/obj/item/reagent_containers/food/snacks/spiderling(get_turf(src)) + . = ..() + /obj/structure/spider/spiderling/Initialize() pixel_x = rand(6,-6) pixel_y = rand(6,-6) @@ -103,6 +110,15 @@ /obj/structure/spider/spiderling/nurse grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse +/obj/structure/spider/spiderling/midwife + grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife + +/obj/structure/spider/spiderling/viper + grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper + +/obj/structure/spider/spiderling/tarantula + grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/tarantula + /obj/structure/spider/spiderling/Collide(atom/user) if(istype(user, /obj/structure/table)) src.loc = user.loc @@ -171,11 +187,15 @@ amount_grown += rand(0,2) if(amount_grown >= 100) if(!grow_as) - grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse) + if(prob(3)) + grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider/tarantula, /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper, /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife) + else + grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse) var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(src.loc) S.poison_per_bite = poison_per_bite S.poison_type = poison_type S.faction = faction.Copy() + S.directive = directive if(player_spiders) S.playable_spider = TRUE notify_ghosts("Spider [S.name] can be controlled", null, enter_link="(Click to play)", source=S, action=NOTIFY_ATTACK) @@ -194,12 +214,12 @@ . = ..() /obj/structure/spider/cocoon/container_resist(mob/living/user) - var/breakout_time = 1 + var/breakout_time = 600 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)") + to_chat(user, "You struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)") visible_message("You see something struggling and writhing in \the [src]!") - if(do_after(user,(breakout_time*60*10), target = src)) + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src) return qdel(src) diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index b1068b00384..95ec2b31bc8 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -199,3 +199,57 @@ duration = 80 icon_state = "sigilactiveoverlay" alpha = 0 + +/obj/effect/temp_visual/steam + name = "steam" + desc = "Steam! It's hot. It also serves as a game distribution platform." + icon_state = "smoke" + duration = 15 + +/obj/effect/temp_visual/steam/Initialize(mapload, steam_direction) + . = ..() + setDir(steam_direction) + var/x_offset = 0 + var/y_offset = 0 + switch(dir) + if(NORTH) + y_offset = 8 + if(EAST) + x_offset = 4 + y_offset = 4 + if(SOUTH) + y_offset = 2 + if(WEST) + x_offset = -4 + y_offset = 4 + animate(src, pixel_x = x_offset, pixel_y = y_offset, alpha = 50, time = 15) + +/obj/effect/temp_visual/steam_release + name = "all the steam" + +/obj/effect/temp_visual/steam_release/Initialize() + ..() + for(var/V in GLOB.cardinals) + var/turf/T = get_step(src, V) + new/obj/effect/temp_visual/steam(T, V) + return INITIALIZE_HINT_QDEL + +//Foreshadows a servant warping in. +/obj/effect/temp_visual/ratvar/warp_marker + name = "illuminant marker" + desc = "A silhouette of dim light. It's getting brighter!" + resistance_flags = INDESTRUCTIBLE + icon = 'icons/effects/genetics.dmi' + icon_state = "servitude" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE + alpha = 0 + light_color = "#FFE48E" + light_range = 2 + light_power = 0.7 + duration = 55 + +/obj/effect/temp_visual/ratvar/warp_marker/Initialize(mapload, mob/living/servant) + . = ..() + animate(src, alpha = 255, time = 50) + diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index b0049fc3fdf..376bb92fd9b 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -213,7 +213,7 @@ /obj/effect/temp_visual/fire icon = 'icons/effects/fire.dmi' icon_state = "3" - light_range = 3 + light_range = LIGHT_RANGE_FIRE light_color = LIGHT_COLOR_FIRE duration = 10 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c2b50f98cf8..c9b766573db 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -61,6 +61,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/equip_delay_other = 20 //In deciseconds, how long an item takes to put on another person var/strip_delay = 40 //In deciseconds, how long an item takes to remove from another person var/breakouttime = 0 + var/being_removed = FALSE var/list/materials var/origin_tech = null //Used by R&D to determine what research bonuses it grants. var/needs_permit = 0 //Used by security bots to determine if this item is safe for public use. diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index fd7a87ac8ce..45788b77b9a 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -54,7 +54,7 @@ AI MODULES for(var/mylaw in lawlist) if(mylaw != "") tot_laws++ - if(tot_laws > config.silicon_max_law_amount && !bypass_law_amt_check)//allows certain boards to avoid this check, eg: reset + if(tot_laws > CONFIG_GET(number/silicon_max_law_amount) && !bypass_law_amt_check)//allows certain boards to avoid this check, eg: reset to_chat(user, "Not enough memory allocated to [law_datum.owner ? law_datum.owner : "the AI core"]'s law processor to handle this amount of laws.") message_admins("[key_name_admin(user)] tried to upload laws to [law_datum.owner ? key_name_admin(law_datum.owner) : "an AI core"] that would exceed the law cap.") overflow = TRUE diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 4c4c5378596..a2f80a94a9f 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -31,7 +31,7 @@ obj/item/construction var/no_ammo_message = "The \'Low Ammo\' light on the device blinks yellow." /obj/item/construction/Initialize() - ..() + . = ..() desc = "A [src]. It currently holds [matter]/[max_matter] matter-units." spark_system = new /datum/effect_system/spark_spread spark_system.set_up(5, 0, src) @@ -123,6 +123,7 @@ obj/item/construction lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' max_matter = 160 + flags_2 = NO_MAT_REDEMPTION_2 var/mode = 1 var/canRturf = 0 var/ranged = FALSE @@ -144,7 +145,7 @@ obj/item/construction set category = "Object" set src in usr // What does this do? - var window_type_name + var/window_type_name if (window_type == /obj/structure/window/fulltile) window_type = /obj/structure/window/reinforced/fulltile @@ -240,11 +241,11 @@ obj/item/construction set category = "Object" set src in usr - var airlockcat = input(usr, "Select whether the airlock is solid or glass.") in list("Solid", "Glass") + var/airlockcat = input(usr, "Select whether the airlock is solid or glass.") in list("Solid", "Glass") switch(airlockcat) if("Solid") if(advanced_airlock_setting == 1) - var airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security") + var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security") switch(airlockpaint) if("Default") airlock_type = /obj/machinery/door/airlock @@ -275,7 +276,7 @@ obj/item/construction if("Glass") if(advanced_airlock_setting == 1) - var airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining") + var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining") switch(airlockpaint) if("Default") airlock_type = /obj/machinery/door/airlock/glass diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 4aa37253c4e..15abe72a524 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -79,13 +79,14 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( //find these defines in code\game\machinery\pipe\consruction.dm GLOBAL_LIST_INIT(RPD_recipes, list( - "Regular Pipes" = list( + "Pipes" = list( "Pipe" = new /datum/pipe_info(PIPE_SIMPLE, 1, PIPE_BENDABLE), //"Bent Pipe" = new /datum/pipe_info(PIPE_SIMPLE, 5, PIPE_BENT), "Manifold" = new /datum/pipe_info(PIPE_MANIFOLD, 1, PIPE_TRINARY), "Manual Valve" = new /datum/pipe_info(PIPE_MVALVE, 1, PIPE_BINARY), "Digital Valve" = new /datum/pipe_info(PIPE_DVALVE, 1, PIPE_BINARY), "4-Way Manifold" = new /datum/pipe_info(PIPE_4WAYMANIFOLD, 1, PIPE_QUAD), + "Bluespace Pipe" = new /datum/pipe_info(PIPE_BLUESPACE, 1, PIPE_UNARY), ), "Devices"=list( "Connector" = new /datum/pipe_info(PIPE_CONNECTOR, 1, PIPE_UNARY), diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index ac02746462f..8b7acabcce1 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -31,6 +31,7 @@ icon_state = "bluebodybag_folded" unfoldedbag_path = /obj/structure/closet/body_bag/bluespace w_class = WEIGHT_CLASS_SMALL + flags_2 = NO_MAT_REDEMPTION_2 origin_tech = "bluespace=4;materials=4;plasmatech=4" /obj/item/bodybag/bluespace/examine(mob/user) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index c7104588f30..2d14c7994fa 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -160,7 +160,7 @@ update_label("John Doe", "Clowny") var/anyone = FALSE //Can anyone forge the ID or just syndicate? /obj/item/card/id/syndicate/Initialize() - ..() + . = ..() var/datum/action/item_action/chameleon/change/chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/card/id chameleon_action.chameleon_name = "ID Card" @@ -180,14 +180,14 @@ update_label("John Doe", "Clowny") if(isliving(user) && user.mind) if(user.mind.special_role || anyone) if(alert(user, "Action", "Agent ID", "Show", "Forge") == "Forge") - var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26) + var/t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26) if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/dead/new_player/prefrences.dm if (t) alert("Invalid name.") return registered_name = t - var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN) + var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN) if(!u) registered_name = "" return @@ -220,7 +220,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/captains_spare/Initialize() var/datum/job/captain/J = new/datum/job/captain access = J.get_access() - ..() + . = ..() /obj/item/card/id/centcom name = "\improper CentCom ID" @@ -231,7 +231,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/centcom/Initialize() access = get_all_centcom_access() - ..() + . = ..() /obj/item/card/id/ert name = "\improper CentCom ID" @@ -242,7 +242,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Initialize() access = get_all_accesses()+get_ert_access("commander")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Security registered_name = "Security Response Officer" @@ -250,7 +250,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Security/Initialize() access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Engineer registered_name = "Engineer Response Officer" @@ -258,7 +258,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Engineer/Initialize() access = get_all_accesses()+get_ert_access("eng")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Medical registered_name = "Medical Response Officer" @@ -266,7 +266,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Medical/Initialize() access = get_all_accesses()+get_ert_access("med")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/prisoner name = "prisoner ID card" diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 3edb5be0909..ee7a91140c0 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -59,7 +59,7 @@ to_chat(user, "Your name has been sent to your employers for approval.") // Autoapproves after a certain time response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) - to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [approval_time / 10] seconds). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") + to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") /obj/item/station_charter/proc/reject_proposed(user) if(!user) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 15a7c1ab0ba..f04f8d44414 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -234,6 +234,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/attack(mob/living/carbon/M, mob/living/carbon/user) if(!istype(M)) return ..() + if(M.on_fire && !lit) + light("[user] lights [src] with [M]'s burning body. What a cold-blooded badass.") + return var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(lit && cig && user.a_intent == INTENT_HELP) if(cig.lit) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index f78da3b0498..39f75307441 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -125,6 +125,9 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M var/location = user.zone_selected + if((location in list("eyes", "mouth", "head")) && !H.get_bodypart("head")) + to_chat(user, "[H] doesn't have a head!") + return if(location == "mouth") if(!(FACEHAIR in H.dna.species.species_traits)) to_chat(user, "There is no facial hair to shave!") diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 803e62d05d3..4dcd9666889 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -72,16 +72,15 @@ user.visible_message("[user] is jamming [src] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!") return (BRUTELOSS|OXYLOSS) -/obj/item/toy/crayon/New() - ..() +/obj/item/toy/crayon/Initialize() + . = ..() // Makes crayons identifiable in things like grinders if(name == "crayon") name = "[item_color] crayon" - if(config) - if(config.mutant_races == 1) - graffiti |= "antilizard" - graffiti |= "prolizard" + if(CONFIG_GET(flag/join_with_mutant_race)) + graffiti |= "antilizard" + graffiti |= "prolizard" all_drawables = graffiti + letters + numerals + oriented + runes + graffiti_large_h drawtype = pick(all_drawables) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 721914966fb..cad7389f632 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -26,6 +26,18 @@ GLOBAL_LIST_EMPTY(PDAs) var/obj/item/cartridge/cartridge = null //current cartridge var/mode = 0 //Controls what menu the PDA will display. 0 is hub; the rest are either built in or based on cartridge. var/icon_alert = "pda-r" //Icon to be overlayed for message alerts. Taken from the pda icon file. + var/font_index = 0 //This int tells DM which font is currently selected and lets DM know when the last font has been selected so that it can cycle back to the first font when "toggle font" is pressed again. + var/font_mode = "font-family:monospace;" //The currently selected font. + var/background_color = "#808000" //The currently selected background color. + + #define FONT_MONO "font-family:monospace;" + #define FONT_SHARE "font-family:\"Share Tech Mono\", monospace;letter-spacing:0px;" + #define FONT_ORBITRON "font-family:\"Orbitron\", monospace;letter-spacing:0px; font-size:15px" + #define FONT_VT "font-family:\"VT323\", monospace;letter-spacing:1px;" + #define MODE_MONO 0 + #define MODE_SHARE 1 + #define MODE_ORBITRON 2 + #define MODE_VT 3 //Secondary variables var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner. @@ -46,6 +58,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/detonatable = TRUE // Can the PDA be blown up? var/hidden = 0 // Is the PDA hidden from the PDA list? var/emped = 0 + var/equipped = FALSE //used here to determine if this is the first time its been picked up var/obj/item/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above @@ -58,6 +71,13 @@ GLOBAL_LIST_EMPTY(PDAs) var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above. var/overlays_x_offset = 0 //x offset to use for certain overlays +/obj/item/device/pda/examine(mob/user) + ..() + if(!id && !inserted_item) + return + else + to_chat(user, "Alt-click to remove contents.") + /obj/item/device/pda/Initialize() . = ..() if(fon) @@ -72,6 +92,27 @@ GLOBAL_LIST_EMPTY(PDAs) inserted_item = new /obj/item/pen(src) update_icon() +/obj/item/device/pda/equipped(mob/user, slot) + if(!equipped) + if(user.client) + switch(user.client.prefs.pda_style) + if(MONO) + font_index = MODE_MONO + font_mode = FONT_MONO + if(SHARE) + font_index = MODE_SHARE + font_mode = FONT_SHARE + if(ORBITRON) + font_index = MODE_ORBITRON + font_mode = FONT_ORBITRON + if(VT) + font_index = MODE_VT + font_mode = FONT_VT + else + font_index = MODE_MONO + font_mode = FONT_MONO + equipped = TRUE + /obj/item/device/pda/proc/update_label() name = "PDA-[owner] ([ownjob])" //Name generalisation @@ -125,7 +166,8 @@ GLOBAL_LIST_EMPTY(PDAs) hidden_uplink.interact(user) return - var/dat = "
Refresh"
@@ -134,6 +176,12 @@ GLOBAL_LIST_EMPTY(PDAs)
if (mode)
dat += " | Return"
+ if (mode == 0)
+ dat += ""
+
dat += "" if (!owner) @@ -311,6 +359,24 @@ GLOBAL_LIST_EMPTY(PDAs) //BASIC FUNCTIONS=================================== if("Refresh")//Refresh, goes to the end of the proc. + + if ("Toggle_Font") + //CODE REVISION 2 + font_index = (font_index + 1) % 4 + + switch(font_index) + if (MODE_MONO) + font_mode = FONT_MONO + if (MODE_SHARE) + font_mode = FONT_SHARE + if (MODE_ORBITRON) + font_mode = FONT_ORBITRON + if (MODE_VT) + font_mode = FONT_VT + if ("Change_Color") + var/new_color = input("Please enter a color name or hex value (Default is \'#808000\').")as color + background_color = new_color + if("Return")//Return if(mode<=9) mode = 0 @@ -404,7 +470,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (in_range(src, U) && loc == U) if (mode == 1 && n) note = n - notehtml = parsepencode(n, U, SIGNFONT) + notehtml = parsemarkdown(n, U) notescanned = 0 else U << browse(null, "window=pda") @@ -542,7 +608,7 @@ GLOBAL_LIST_EMPTY(PDAs) P.show_recieved_message(msg,src) if(!multiple) show_to_ghosts(user,msg) - log_talk(user,"[key_name(user)] (PDA: [name]) sent \"[message]\" to [key_name(P,null,TRUE)]",LOGPDA) + log_talk(user,"[key_name(user)] (PDA: [initial(name)]) sent \"[message]\" to [key_name(P,null,TRUE)]",LOGPDA) else if(!multiple) to_chat(user, "ERROR: Server isn't responding.") @@ -552,7 +618,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(multiple) show_to_sender(last_sucessful_msg,1) show_to_ghosts(user,last_sucessful_msg,1) - log_talk(user,"[user] (PDA: [name]) sent \"[message]\" to Everyone",LOGPDA) + log_talk(user,"[user] (PDA: [initial(name)]) sent \"[message]\" to Everyone",LOGPDA) /obj/item/device/pda/proc/show_to_sender(datum/data_pda_msg/msg,multiple = 0) tnote += "→ To [multiple ? "Everyone" : msg.recipient]:
[msg.message][msg.get_photo_ref()]
" diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm new file mode 100644 index 00000000000..204a1f81d92 --- /dev/null +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -0,0 +1,65 @@ +//Used by engineering cyborgs in place of generic circuits. +/obj/item/device/electroadaptive_pseudocircuit + name = "electroadaptive pseudocircuit" + desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction." + icon = 'icons/obj/module.dmi' + icon_state = "boris" + w_class = WEIGHT_CLASS_TINY + materials = list(MAT_METAL = 50, MAT_GLASS = 300) + origin_tech = "engineering=4" + var/recharging = FALSE + var/circuits = 5 //How many circuits the pseudocircuit has left + var/static/recycleable_circuits = typecacheof(list(/obj/item/electronics/firelock, /obj/item/electronics/airalarm, /obj/item/electronics/firealarm, \ + /obj/item/electronics/apc))//A typecache of circuits consumable for material + +/obj/item/device/electroadaptive_pseudocircuit/Initialize() + . = ..() + maptext = "[circuits]" + +/obj/item/device/electroadaptive_pseudocircuit/examine(mob/user) + ..() + if(iscyborg(user)) + to_chat(user, "It has material for [circuits] circuit[circuits == 1 ? "" : "s"]. Use the pseudocircuit on existing circuits to gain material.") + to_chat(user, "Serves as a substitute for fire/air alarm, firelock, and APC electronics.") + to_chat(user, "It can also be used on an APC with no power cell to fabricate a low-capacity cell at a high power cost.") + +/obj/item/device/electroadaptive_pseudocircuit/proc/adapt_circuit(mob/living/silicon/robot/R, circuit_cost = 0) + if(QDELETED(R) || !istype(R)) + return + if(!R.cell) + to_chat(R, "You need a power cell installed for that.") + return + if(!R.cell.use(circuit_cost)) + to_chat(R, "You don't have the power for that (you need [DisplayPower(circuit_cost)].)") + return + if(recharging) + to_chat(R, "[src] needs some time to recharge first.") + return + if(!circuits) + to_chat(R, "You need more material. Use [src] on existing simple circuits to break them down.") + return + playsound(R, 'sound/items/rped.ogg', 50, TRUE) + recharging = TRUE + circuits-- + maptext = "[circuits]" + icon_state = "[initial(icon_state)]_recharging" + var/recharge_time = min(600, circuit_cost * 5) //40W of cost for one fabrication = 20 seconds of recharge time; this is to prevent spamming + addtimer(CALLBACK(src, .proc/recharge), recharge_time) + return TRUE //The actual circuit magic itself is done on a per-object basis + +/obj/item/device/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity) + if(!proximity) + return + if(!is_type_in_typecache(target, recycleable_circuits)) + return + circuits++ + maptext = "[circuits]" + user.visible_message("User breaks down [target] with [src].", \ + "You recycle [target] into [src]. It now has material for [circuits] circuits.") + playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE) + qdel(target) + +/obj/item/device/electroadaptive_pseudocircuit/proc/recharge() + playsound(src, 'sound/machines/chime.ogg', 25, TRUE) + recharging = FALSE + icon_state = initial(icon_state) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 55c8bb5252a..6ba8425392f 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -1,7 +1,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/device/gps name = "global positioning system" - desc = "Helping lost spacemen find their way through the planets since 2016. Alt+click to toggle power." + desc = "Helping lost spacemen find their way through the planets since 2016." icon = 'icons/obj/telescience.dmi' icon_state = "gps-c" w_class = WEIGHT_CLASS_SMALL @@ -15,6 +15,9 @@ GLOBAL_LIST_EMPTY(GPS_list) var/updating = TRUE //Automatic updating of GPS list. Can be set to manual by user. var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown +/obj/item/device/gps/examine(mob/user) + ..() + to_chat(user, "Alt-click to switch it [tracking ? "off":"on"].") /obj/item/device/gps/Initialize() . = ..() @@ -209,4 +212,4 @@ GLOBAL_LIST_EMPTY(GPS_list) clear() tagged = null STOP_PROCESSING(SSfastprocess, src) - . = ..() \ No newline at end of file + . = ..() diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index fdcf781a4d2..19a81e8640f 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -1,3 +1,4 @@ +GLOBAL_LIST_INIT(pipe_paint_colors, list("grey"=rgb(255,255,255), "red"=rgb(255,0,0), "blue"=rgb(0,0,255), "cyan"=rgb(0,256,249), "green"=rgb(30,255,0), "yellow"=rgb(255,198,0), "purple"=rgb(130,43,255))) /obj/item/device/pipe_painter name = "pipe painter" @@ -5,16 +6,7 @@ icon_state = "labeler1" item_state = "flight" flags_1 = NOBLUDGEON_1 - var/list/modes = list( - "grey" = rgb(255,255,255), - "red" = rgb(255,0,0), - "blue" = rgb(0,0,255), - "cyan" = rgb(0,256,249), - "green" = rgb(30,255,0), - "yellow" = rgb(255,198,0), - "purple" = rgb(130,43,255) - ) - var/mode = "grey" + var/paint_color = "grey" materials = list(MAT_METAL=5000, MAT_GLASS=2000) @@ -27,14 +19,13 @@ return var/obj/machinery/atmospherics/pipe/P = A - P.add_atom_colour(modes[mode], FIXED_COLOUR_PRIORITY) - P.pipe_color = modes[mode] - user.visible_message("[user] paints \the [P] [mode].","You paint \the [P] [mode].") - P.update_node_icon() //updates the neighbors + if(P.paint(GLOB.pipe_paint_colors[paint_color])) + playsound(src, 'sound/machines/click.ogg', 50, 1) + user.visible_message("[user] paints \the [P] [paint_color].","You paint \the [P] [paint_color].") /obj/item/device/pipe_painter/attack_self(mob/user) - mode = input("Which colour do you want to use?","Pipe painter") in modes + paint_color = input("Which colour do you want to use?","Pipe painter") in GLOB.pipe_paint_colors -/obj/item/device/pipe_painter/examine() +/obj/item/device/pipe_painter/examine(mob/user) ..() - to_chat(usr, "It is set to [mode].") + to_chat(user, "It is set to [paint_color].") diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index e3f767f9fab..d32ae86090e 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -138,7 +138,7 @@ if(power_drained > max_power * 0.98) if (!admins_warned) admins_warned = TRUE - message_admins("Power sink at ([x],[y],[z] - JMP) is 95% full. Explosion imminent.") + message_admins("Power sink at ([x],[y],[z] - JMP) is 95% full. Explosion imminent.") playsound(src, 'sound/effects/screech.ogg', 100, 1, 1) if(power_drained >= max_power) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 331a9e60db2..82dba702c4b 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -20,7 +20,7 @@ return (FIRELOSS) /obj/item/device/electropack/Initialize() - ..() + . = ..() SSradio.add_object(src, frequency, GLOB.RADIO_CHAT) /obj/item/device/electropack/Destroy() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 4c309f4aa15..9817614e24c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -1,6 +1,6 @@ /obj/item/device/radio/headset name = "radio headset" - desc = "An updated, modular intercom that fits over the head. Takes encryption keys. \nTo speak on the general radio frequency, use ; before speaking." + desc = "An updated, modular intercom that fits over the head. Takes encryption keys." icon_state = "headset" item_state = "headset" materials = list(MAT_METAL=75) @@ -11,6 +11,12 @@ var/obj/item/device/encryptionkey/keyslot2 = null dog_fashion = null +/obj/item/device/radio/headset/examine(mob/user) + ..() + to_chat(user, "To speak on the general radio frequency, use ; before speaking.") + if (command) + to_chat(user, "Alt-click to toggle the high-volume mode.") + /obj/item/device/radio/headset/Initialize() . = ..() recalculateChannels() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 08b5f4b9dd9..3e9ce8c3412 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -15,6 +15,29 @@ /obj/item/device/radio/intercom/unscrewed unfastened = TRUE +/obj/item/device/radio/intercom/ratvar + name = "hierophant intercom" + desc = "A modified intercom that uses the Hierophant network instead of subspace tech. Can listen to and broadcast on any frequency." + icon_state = "intercom_ratvar" + freerange = TRUE + +/obj/item/device/radio/intercom/ratvar/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item/screwdriver)) + to_chat(user, "[src] is fastened to the wall with [is_servant_of_ratvar(user) ? "replicant alloy" : "some material you've never seen"], and can't be removed.") + return //no unfastening! + . = ..() + +/obj/item/device/radio/intercom/ratvar/process() + if(!istype(SSticker.mode, /datum/game_mode/clockwork_cult)) + invisibility = INVISIBILITY_OBSERVER + alpha = 125 + emped = TRUE + else + invisibility = initial(invisibility) + alpha = initial(alpha) + emped = FALSE + ..() + /obj/item/device/radio/intercom/Initialize(mapload, ndir, building) . = ..() if(building) @@ -114,7 +137,7 @@ if(!on) icon_state = "intercom-p" else - icon_state = "intercom" + icon_state = initial(icon_state) /obj/item/device/radio/intercom/add_blood(list/blood_dna) return 0 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 378ef6cde4e..aea0093a22f 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -4,6 +4,7 @@ suffix = "\[3\]" icon_state = "walkietalkie" item_state = "walkietalkie" + desc = "A basic handheld radio that communicates with local telecommunication networks." dog_fashion = /datum/dog_fashion/back var/on = TRUE // 0 for off var/last_transmission diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1d20d9ae106..97f2e865526 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -73,6 +73,7 @@ MASS SPECTROMETER origin_tech = "magnets=1;biotech=1" var/mode = 1 var/scanmode = 0 + var/advanced = FALSE /obj/item/device/healthanalyzer/attack_self(mob/user) if(!scanmode) @@ -97,7 +98,7 @@ MASS SPECTROMETER user.visible_message("[user] has analyzed [M]'s vitals.") if(scanmode == 0) - healthscan(user, M, mode) + healthscan(user, M, mode, advanced) else if(scanmode == 1) chemscan(user, M) @@ -105,7 +106,7 @@ MASS SPECTROMETER // Used by the PDA medical scanner too -/proc/healthscan(mob/living/user, mob/living/M, mode = 1) +/proc/healthscan(mob/living/user, mob/living/M, mode = 1, advanced = FALSE) if(user.incapacitated() || user.eye_blind) return //Damage specifics @@ -115,8 +116,8 @@ MASS SPECTROMETER var/brute_loss = M.getBruteLoss() var/mob_status = (M.stat == DEAD ? "Deceased" : "[round(M.health/M.maxHealth,0.01)*100] % healthy") - if(M.status_flags & FAKEDEATH) - mob_status = "Deceased" + if(M.status_flags & FAKEDEATH && !advanced) + mob_status = "Deceased" oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss if(ishuman(M)) @@ -136,19 +137,77 @@ MASS SPECTROMETER if(oxy_loss > 10) to_chat(user, "\t[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.") if(tox_loss > 10) - to_chat(user, "\t[tox_loss > 50 ? "Critical" : "Dangerous"] amount of toxins detected.") + to_chat(user, "\t[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.") if(M.getStaminaLoss()) to_chat(user, "\tSubject appears to be suffering from fatigue.") + if(advanced) + to_chat(user, "\tFatigue Level: [M.getStaminaLoss()]%.") if (M.getCloneLoss()) to_chat(user, "\tSubject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.") - if (M.reagents && M.reagents.get_reagent_amount("epinephrine")) - to_chat(user, "\tBloodstream analysis located [M.reagents.get_reagent_amount("epinephrine")] units of rejuvenation chemicals.") + if(advanced) + to_chat(user, "\tCellular Damage Level: [M.getCloneLoss()].") if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain)) to_chat(user, "\tSubject brain function is non-existent.") else if (M.getBrainLoss() >= 60) to_chat(user, "\tSevere brain damage detected. Subject likely to have mental retardation.") else if (M.getBrainLoss() >= 10) to_chat(user, "\tBrain damage detected. Subject may have had a concussion.") + if(advanced) + to_chat(user, "\tBrain Activity Level: [100 - M.getBrainLoss()]%.") + if (M.radiation) + to_chat(user, "\tSubject is irradiated.") + if(advanced) + to_chat(user, "\tRadiation Level: [M.radiation]%.") + + if(advanced && M.hallucinating()) + to_chat(user, "\tSubject is hallucinating.") + + //Eyes and ears + if(advanced) + if(iscarbon(M)) + var/mob/living/carbon/C = M + var/obj/item/organ/ears/ears = C.getorganslot("ears") + to_chat(user, "\t==EAR STATUS==") + if(istype(ears)) + var/healthy = TRUE + if(C.disabilities & DEAF) + healthy = FALSE + to_chat(user, "\tSubject is genetically deaf.") + else + if(ears.ear_damage) + to_chat(user, "\tSubject has [ears.ear_damage > UNHEALING_EAR_DAMAGE? "permanent ": "temporary "]hearing damage.") + healthy = FALSE + if(ears.deaf) + to_chat(user, "\tSubject is [ears.ear_damage > UNHEALING_EAR_DAMAGE ? "permanently ": "temporarily "] deaf.") + healthy = FALSE + if(healthy) + to_chat(user, "\tHealthy.") + else + to_chat(user, "\tSubject does not have ears.") + var/obj/item/organ/eyes/eyes = C.getorganslot("eye_sight") + to_chat(user, "\t==EYE STATUS==") + if(istype(eyes)) + var/healthy = TRUE + if(C.disabilities & BLIND) + to_chat(user, "\tSubject is blind.") + healthy = FALSE + if(C.disabilities & NEARSIGHT) + to_chat(user, "\tSubject is nearsighted.") + healthy = FALSE + if(eyes.eye_damage > 30) + to_chat(user, "\tSubject has severe eye damage.") + healthy = FALSE + else if(eyes.eye_damage > 20) + to_chat(user, "\tSubject has significant eye damage.") + healthy = FALSE + else if(eyes.eye_damage) + to_chat(user, "\tSubject has minor eye damage.") + healthy = FALSE + if(healthy) + to_chat(user, "\tHealthy.") + else + to_chat(user, "\tSubject does not have eyes.") + if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -172,11 +231,11 @@ MASS SPECTROMETER to_chat(user, "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)") // Time of death - if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) + if(M.tod && (M.stat == DEAD || ((M.status_flags & FAKEDEATH) && !advanced))) to_chat(user, "Time of Death: [M.tod]") var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) - to_chat(user, "Subject died [tdelta / 10] seconds ago, defibrillation may be possible!") + to_chat(user, "Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!") for(var/thing in M.viruses) var/datum/disease/D = thing @@ -209,7 +268,7 @@ MASS SPECTROMETER var/cyberimp_detect for(var/obj/item/organ/cyberimp/CI in C.internal_organs) - if(CI.status == ORGAN_ROBOTIC) + if(CI.status == ORGAN_ROBOTIC && !CI.syndicate_implant) cyberimp_detect += "[C.name] is modified with a [CI.name].
" if(cyberimp_detect) to_chat(user, "Detected cybernetic modifications:") @@ -246,6 +305,12 @@ MASS SPECTROMETER if(0) to_chat(usr, "The scanner no longer shows limb damage.") +/obj/item/device/healthanalyzer/advanced + name = "advanced health analyzer" + icon_state = "health_adv" + desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy." + origin_tech = "magnets=3;biotech=3" + advanced = TRUE /obj/item/device/analyzer desc = "A hand-held environmental scanner which reports current gas levels." diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 2cc0ab0417f..663eed0a8db 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -111,7 +111,6 @@ effective or pretty fucking useless. /obj/item/device/healthanalyzer/rad_laser/interact(mob/user) user.set_machine(src) - var/cooldown = GetCooldown() var/dat = "Irradiation: [irradiate ? "On" : "Off"]
" dat += "Stealth Mode (NOTE: Deactivates automatically while Irradiation is off): [stealth ? "On" : "Off"]
" dat += "Scan Mode: " @@ -133,7 +132,7 @@ effective or pretty fucking useless. -- [(wavelength+(intensity*4))] ++
- Laser Cooldown: [cooldown] Seconds
+ Laser Cooldown: [DisplayTimeText(GetCooldown())]
"} var/datum/browser/popup = new(user, "radlaser", "Radioactive Microlaser Interface", 400, 240) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 69fef254e87..045da484edd 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -165,7 +165,7 @@ var/attachment = "no device" if(attached_device) if(istype(attached_device, /obj/item/device/assembly/signaler)) - attachment = "[attached_device]" + attachment = "[attached_device]" else attachment = attached_device diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 82d4c3d99f9..15c6bcd4b19 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -37,10 +37,14 @@ "Very doubtful") /obj/item/toy/eightball/Initialize(mapload) - ..() - if(prob(1)) - new /obj/item/toy/eightball/haunted(get_turf(src)) - qdel(src) + . = ..() + if(MakeHaunted()) + return INITIALIZE_HINT_QDEL + +/obj/item/toy/eightball/proc/MakeHaunted() + . = prob(1) + if(.) + new /obj/item/toy/eightball/haunted(loc) /obj/item/toy/eightball/attack_self(mob/user) if(shaking) @@ -81,7 +85,7 @@ var/fixed_answer /obj/item/toy/eightball/broken/Initialize(mapload) - ..() + . = ..() fixed_answer = pick(possible_answers) /obj/item/toy/eightball/broken/get_answer() @@ -97,7 +101,7 @@ var/list/votes /obj/item/toy/eightball/haunted/Initialize(mapload) - ..() + . = ..() votes = list() GLOB.poi_list |= src @@ -105,6 +109,9 @@ GLOB.poi_list -= src . = ..() +/obj/item/toy/eightball/haunted/MakeHaunted() + return FALSE + /obj/item/toy/eightball/haunted/attack_ghost(mob/user) if(!shaking) to_chat(user, "[src] is not currently being shaken.") diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index a8807505030..a210c2a7142 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -68,6 +68,7 @@ ..() if(reagents.total_volume) to_chat(user, "It contains [round(reagents.total_volume)] units.") + to_chat(user, "Alt-click to empty it.") else to_chat(user, "It is empty.") diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index b352596e2f5..833d2151808 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -292,7 +292,7 @@ var/mob/last = get_mob_by_ckey(nadeassembly.fingerprintslast) var/turf/T = get_turf(src) var/area/A = get_area(T) - message_admins("grenade primed by an assembly, attached by [key_name_admin(M)](?) (FLW) and last touched by [key_name_admin(last)](?) (FLW) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] (JMP).") + message_admins("grenade primed by an assembly, attached by [key_name_admin(M)](?) (FLW) and last touched by [key_name_admin(last)](?) (FLW) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] (JMP).") log_game("grenade primed by an assembly, attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] ([T.x], [T.y], [T.z])") else addtimer(CALLBACK(src, .proc/prime), det_time) diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 6abe7fc33d9..a890f4d5a35 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -13,11 +13,6 @@ return for(var/mob/living/M in get_hearers_in_view(7, flashbang_turf)) bang(get_turf(M), M) - - for(var/obj/structure/blob/B in get_hear(8,flashbang_turf)) //Blob damage here - var/distance = get_dist(B, get_turf(src)) - var/damage = round(100/(distance*distance)+1) - B.take_damage(damage, BURN, "energy") qdel(src) /obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index fef017e612f..25b1a60955c 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -253,7 +253,7 @@ var/trap_damage = 20 /obj/item/restraints/legcuffs/beartrap/Initialize() - ..() + . = ..() icon_state = "[initial(icon_state)][armed]" /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 7f8d612e166..5ed9959d9db 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -244,6 +244,7 @@ S.name = name S.ckey = theghost.ckey S.status_flags |= GODMODE + S.language_holder = user.language_holder.copy(S) var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN) if(src && input) @@ -338,8 +339,8 @@ /obj/item/nullrod/carp name = "carp-sie plushie" desc = "An adorable stuffed toy that resembles the god of all carp. The teeth look pretty sharp. Activate it to receive the blessing of Carp-Sie." - icon = 'icons/obj/toy.dmi' - icon_state = "carpplushie" + icon = 'icons/obj/plushes.dmi' + icon_state = "carpplush" item_state = "carp_plushie" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' @@ -386,12 +387,10 @@ flags_2 = SLOWS_WHILE_IN_HAND_2 /obj/item/nullrod/tribal_knife/Initialize(mapload) - ..() - -/obj/item/nullrod/tribal_knife/New() - ..() + . = ..() START_PROCESSING(SSobj, src) + /obj/item/nullrod/tribal_knife/Destroy() STOP_PROCESSING(SSobj, src) . = ..() diff --git a/code/game/objects/items/implants/implant_abductor.dm b/code/game/objects/items/implants/implant_abductor.dm index 74642edd666..710e2d738e5 100644 --- a/code/game/objects/items/implants/implant_abductor.dm +++ b/code/game/objects/items/implants/implant_abductor.dm @@ -26,21 +26,15 @@ if(..()) var/obj/machinery/abductor/console/console if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(H.dna.species.id == "abductor") - var/datum/species/abductor/S = H.dna.species - console = get_team_console(S.team) + var/datum/antagonist/abductor/A = target.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR) + if(A) + console = get_abductor_console(A.team.team_number) home = console.pad if(!home) - console = get_team_console(pick(1, 2, 3, 4)) + var/list/consoles = list() + for(var/obj/machinery/abductor/console/C in GLOB.machines) + consoles += C + console = pick(consoles) home = console.pad - return 1 - -/obj/item/implant/abductor/proc/get_team_console(var/team) - var/obj/machinery/abductor/console/console - for(var/obj/machinery/abductor/console/c in GLOB.machines) - if(c.team == team) - console = c - break - return console + return TRUE diff --git a/code/game/objects/items/implants/implant_loyality.dm b/code/game/objects/items/implants/implant_loyality.dm index e25fc8dda69..ffaebf5a638 100644 --- a/code/game/objects/items/implants/implant_loyality.dm +++ b/code/game/objects/items/implants/implant_loyality.dm @@ -19,21 +19,21 @@ /obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = 0) if(..()) - if((target.mind in (SSticker.mode.head_revolutionaries))) + if((target.mind in (SSticker.mode.head_revolutionaries)) || target.mind.unconvertable) if(!silent) target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") removed(target, 1) qdel(src) - return 0 + return FALSE if(target.mind in SSticker.mode.revolutionaries) - SSticker.mode.remove_revolutionary(target.mind) + SSticker.mode.remove_revolutionary(target.mind, FALSE, user) if(!silent) if(target.mind in SSticker.mode.cult) to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!") else to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.") - return 1 - return 0 + return TRUE + return FALSE /obj/item/implant/mindshield/removed(mob/target, silent = 0, special = 0) if(..()) diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 81ef8afe12d..1b277d56828 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -61,7 +61,7 @@ return ..() /obj/item/implantcase/Initialize(mapload) - ..() + . = ..() if(imp_type) imp = new imp_type(src) update_icon() diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 2f59020cbe2..8d252cb5af1 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -20,7 +20,7 @@ var/special = FALSE var/special_name = "special function" var/message_cooldown - var/breakout_time = 1 + var/breakout_time = 600 /obj/machinery/implantchair/Initialize() . = ..() @@ -85,10 +85,17 @@ update_icon() /obj/machinery/implantchair/proc/implant_action(mob/living/M) - var/obj/item/implant/I = new implant_type - if(I.implant(M)) - visible_message("[M] has been implanted by the [name].") - return 1 + var/obj/item/I = new implant_type + if(istype(I, /obj/item/implant)) + var/obj/item/implant/P = I + if(P.implant(M)) + visible_message("[M] has been implanted by [src].") + return TRUE + else if(istype(I, /obj/item/organ)) + var/obj/item/organ/P = I + P.Insert(M, drop_if_replaced = FALSE) + visible_message("[M] has been implanted by [src].") + return TRUE /obj/machinery/implantchair/update_icon() icon_state = initial(icon_state) @@ -117,9 +124,9 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ "You hear a metallic creaking from [src].") - if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return user.visible_message("[user] successfully broke out of [src]!", \ diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 0daa8f1d4ee..8144017faa8 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -59,7 +59,7 @@ return ..() /obj/item/implanter/Initialize(mapload) - ..() + . = ..() if(imp_type) imp = new imp_type(src) update_icon() diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 1b4805ef4bc..8a5b4ada608 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -882,7 +882,8 @@ ..() /obj/item/book/manual/wiki/proc/initialize_wikibook() - if(config.wikiurl) + var/wikiurl = CONFIG_GET(string/wikiurl) + if(wikiurl) dat = {" @@ -900,7 +901,7 @@ }
You start skimming through the manual...
- + diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 778655d4b0e..4376e995e8e 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -39,4 +39,36 @@ /obj/item/toy/plush/narplush name = "nar'sie plushie" desc = "A small stuffed doll of the elder god nar'sie. Who thought this was a good children's toy?" - icon_state = "narplush" \ No newline at end of file + icon_state = "narplush" + +/obj/item/toy/plush/lizardplushie + name = "lizard plushie" + desc = "An adorable stuffed toy that resembles a lizardperson." + icon_state = "plushie_lizard" + item_state = "plushie_lizard" + attack_verb = list("clawed", "hissed", "tail slapped") + squeak_override = list('sound/weapons/slash.ogg' = 1) + +/obj/item/toy/plush/snakeplushie + name = "snake plushie" + desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing." + icon_state = "plushie_snake" + item_state = "plushie_snake" + attack_verb = list("bitten", "hissed", "tail slapped") + squeak_override = list('sound/weapons/bite.ogg' = 1) + +/obj/item/toy/plush/nukeplushie + name = "operative plushie" + desc = "An stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious." + icon_state = "plushie_nuke" + item_state = "plushie_nuke" + attack_verb = list("shot", "nuked", "detonated") + squeak_override = list('sound/effects/hit_punch.ogg' = 1) + +/obj/item/toy/plush/slimeplushie + name = "slime plushie" + desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack." + icon_state = "plushie_slime" + item_state = "plushie_slime" + attack_verb = list("blorbled", "slimed", "absorbed") + squeak_override = list('sound/effects/blobattack.ogg' = 1) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 28d4d13967a..c8249024f86 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -41,7 +41,7 @@ /obj/item/target/syndicate icon_state = "target_s" - desc = "A shooting target that looks like a syndicate scum." + desc = "A shooting target that looks like syndicate scum." hp = 2600 /obj/item/target/alien diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index c492b752f0d..350daa0fc3f 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -1,7 +1,7 @@ /obj/item/picket_sign icon_state = "picket" name = "blank picket sign" - desc = "It's blank" + desc = "It's blank." force = 5 w_class = WEIGHT_CLASS_BULKY attack_verb = list("bashed","smacked") diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 02d835da16d..6c073f4b69c 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -1,7 +1,7 @@ /obj/item/stack/medical name = "medical pack" singular_name = "medical pack" - icon = 'icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/stack_objects.dmi' amount = 6 max_amount = 6 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 8056674074d..2bb5d110fc0 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \ /obj/item/stack/sheet/mineral/sandbags name = "sandbags" - icon = 'icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/stack_objects.dmi' icon_state = "sandbags" singular_name = "sandbag" layer = LOW_ITEM_LAYER diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 5d87c4b38e3..2d22963065e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -313,6 +313,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ null, new/datum/stack_recipe("directional brass window", /obj/structure/window/reinforced/clockwork/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \ new/datum/stack_recipe("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ + new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE) \ )) @@ -334,12 +335,21 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ new /obj/item/stack/sheet/runed_metal(loc, amount) qdel(src) +/obj/item/stack/tile/brass/attack_self(mob/living/user) + if(!is_servant_of_ratvar(user)) + to_chat(user, "[src] seems far too fragile and rigid to build with.") //haha that's because it's actually replicant alloy you DUMMY + return + ..() + /obj/item/stack/tile/brass/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.brass_recipes . = ..() pixel_x = 0 pixel_y = 0 +/obj/item/stack/tile/brass/fifty + amount = 50 + /obj/item/stack/sheet/lessergem name = "lesser gems" desc = "Rare kind of gems which are only gained by blood sacrifice to minor deities. They are needed in crafting powerful objects." @@ -386,7 +396,6 @@ GLOBAL_LIST_INIT(plastic_recipes, list( singular_name = "plastic sheet" icon_state = "sheet-plastic" throwforce = 7 - origin_tech = "materials=1" origin_tech = "materials=1;biotech=1" merge_type = /obj/item/stack/sheet/plastic diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 301c9fdac73..f2570ff0688 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -8,6 +8,7 @@ * Stacks */ /obj/item/stack + icon = 'icons/obj/stack_objects.dmi' origin_tech = "materials=1" gender = PLURAL var/list/datum/stack_recipe/recipes @@ -76,6 +77,7 @@ to_chat(user, "There are [get_amount()] in the stack.") else to_chat(user, "There is [get_amount()] in the stack.") + to_chat(user, "Alt-click to take a custom amount.") /obj/item/stack/proc/get_amount() if(is_cyborg) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index fe89f423380..3e9231f5624 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -40,6 +40,7 @@ max_w_class = WEIGHT_CLASS_GIGANTIC max_combined_w_class = 35 resistance_flags = FIRE_PROOF + flags_2 = NO_MAT_REDEMPTION_2 var/pshoom = 'sound/items/pshoom.ogg' var/alt_sound = 'sound/items/pshoom_2.ogg' armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 60, acid = 50) @@ -289,7 +290,7 @@ icon_state = initial(icon_state) /obj/item/storage/backpack/satchel/flat/Initialize(mapload) - ..() + . = ..() SSpersistence.new_secret_satchels += src /obj/item/storage/backpack/satchel/flat/PopulateContents() @@ -306,7 +307,7 @@ var/revealed = 0 /obj/item/storage/backpack/satchel/flat/secret/Initialize() - ..() + . = ..() if(isfloorturf(loc) && !istype(loc, /turf/open/floor/plating/)) hide(1) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index a8b989aecfa..944604c6ac0 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -73,6 +73,7 @@ origin_tech = "materials=4;bluespace=4;engineering=4;plasmatech=3" max_combined_w_class = 60 storage_slots = 60 + flags_2 = NO_MAT_REDEMPTION_2 // ----------------------------- // Mining Satchel diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 0cf82063ab2..0266a657235 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -88,6 +88,16 @@ new /obj/item/device/t_scanner(src) new /obj/item/extinguisher/mini(src) +/obj/item/storage/belt/utility/servant/PopulateContents() + new /obj/item/screwdriver/brass(src) + new /obj/item/wirecutters/brass(src) + new /obj/item/wrench/brass(src) + new /obj/item/crowbar/brass(src) + new /obj/item/weldingtool/experimental/brass(src) + new /obj/item/device/multitool(src) + new /obj/item/stack/cable_coil(src, 30, "yellow") + + /obj/item/storage/belt/medical diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index dc6993cdbe7..c0c861f4c4e 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -156,6 +156,24 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", var/unholy2clean = A.reagents.get_reagent_amount("unholywater") A.reagents.del_reagent("unholywater") A.reagents.add_reagent("holywater",unholy2clean) + if(istype(A, /obj/item/twohanded/required/cult_bastard)) + var/obj/item/twohanded/required/cult_bastard/sword = A + to_chat(user, "You begin to exorcise [sword].") + playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1) + if(do_after(user, 40, target = sword)) + playsound(src,'sound/effects/pray_chaplain.ogg',60,1) + for(var/obj/item/device/soulstone/SS in sword.contents) + SS.usability = TRUE + for(var/mob/living/simple_animal/shade/EX in SS) + SSticker.mode.remove_cultist(EX.mind, 1, 0) + EX.icon_state = "ghost1" + EX.name = "Purified [EX.name]" + SS.release_shades(user) + qdel(SS) + new /obj/item/nullrod/claymore(get_turf(sword)) + user.visible_message("[user] has purified the [sword]!!") + qdel(sword) + /obj/item/storage/book/bible/booze desc = "To be applied to the head repeatedly." diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index c1a47742e91..489f1c6bf07 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -735,7 +735,7 @@ var/theme_name /obj/item/storage/box/ingredients/Initialize() - ..() + . = ..() if(theme_name) name = "[name] ([theme_name])" desc = "A box containing supplementary ingredients for the aspiring chef. The box's theme is '[theme_name]'." diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 883641d43b5..435bc64c41f 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -17,6 +17,7 @@ icon = 'icons/obj/food/containers.dmi' icon_state = "donutbox6" name = "donut box" + desc = "Mmm. Donuts." resistance_flags = FLAMMABLE var/icon_type = "donut" var/spawn_type = null @@ -125,13 +126,21 @@ icon_type = "cigarette" spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette +/obj/item/storage/fancy/cigarettes/examine(mob/user) + ..() + to_chat(user, "Alt-click to extract contents.") + /obj/item/storage/fancy/cigarettes/AltClick(mob/user) - if(user.get_active_held_item()) + if(user.stat || user.restrained()) return - for(var/obj/item/lighter/lighter in src) - remove_from_storage(lighter, user.loc) - user.put_in_active_hand(lighter) - break + var/obj/item/clothing/mask/cigarette/W = locate(/obj/item/clothing/mask/cigarette) in contents + if(W && contents.len > 0) + remove_from_storage(W, user) + user.put_in_hands(W) + contents -= W + to_chat(user, "You take a [icon_type] out of the pack.") + else + to_chat(user, "There are no [icon_type]s left in the pack.") /obj/item/storage/fancy/cigarettes/update_icon() if(fancy_open || !contents.len) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 4b93fde13f9..4dc90de6bec 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -56,7 +56,7 @@ item_state = "firstaid-ointment" /obj/item/storage/firstaid/fire/Initialize(mapload) - ..() + . = ..() icon_state = pick("ointment","firefirstaid") /obj/item/storage/firstaid/fire/PopulateContents() diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 346e9ba4098..50898e72e1f 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -123,6 +123,11 @@ icon_broken = "medalbox+b" can_hold = list(/obj/item/clothing/accessory/medal) +/obj/item/storage/lockbox/medal/examine(mob/user) + ..() + if(!locked) + to_chat(user, "Alt-click to [open ? "close":"open"] it.") + /obj/item/storage/lockbox/medal/AltClick() if(!locked) open = (open ? FALSE : TRUE) @@ -172,6 +177,14 @@ for(var/i in 1 to 3) new /obj/item/clothing/accessory/medal/silver/security(src) +/obj/item/storage/lockbox/medal/cargo + name = "cargo award box" + desc = "A locked box used to store awards to be given to members of the cargo department." + req_access = list(ACCESS_QM) + +/obj/item/storage/lockbox/medal/cargo/PopulateContents() + new /obj/item/clothing/accessory/medal/ribbon/cargo(src) + /obj/item/storage/lockbox/medal/sci name = "science medal box" desc = "A locked box used to store medals to be given to members of the science department." @@ -179,4 +192,4 @@ /obj/item/storage/lockbox/medal/sci/PopulateContents() for(var/i in 1 to 3) - new /obj/item/clothing/accessory/medal/plasma/nobel_science(src) \ No newline at end of file + new /obj/item/clothing/accessory/medal/plasma/nobel_science(src) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 6620ec52657..4d56b6a8e8a 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -25,34 +25,33 @@ w_class = WEIGHT_CLASS_NORMAL max_w_class = WEIGHT_CLASS_SMALL max_combined_w_class = 14 + desc = "This shouldn't exist. If it does, create an issue report." /obj/item/storage/secure/examine(mob/user) ..() - to_chat(user, text("The service panel is [src.open ? "open" : "closed"].")) + to_chat(user, text("The service panel is currently [open ? "unscrewed" : "screwed shut"].")) /obj/item/storage/secure/attackby(obj/item/W, mob/user, params) if(locked) if (istype(W, /obj/item/screwdriver)) - if (do_after(user, 20*W.toolspeed, target = src)) - src.open =! src.open - user.show_message("You [open ? "open" : "close"] the service panel.", 1) + if (do_after(user, 20*W.toolspeed, target = user)) + open =! open + to_chat(user, "You [open ? "open" : "close"] the service panel.") return - if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking)) - user.show_message("Now attempting to reset internal memory, please hold.", 1) - src.l_hacking = 1 - if (do_after(usr, 100*W.toolspeed, target = src)) - if (prob(33)) - src.l_setshort = 1 + if (istype(W, /obj/item/wirecutters) || istype(W, /obj/item/card/emag)) + to_chat(user, "[src] is protected from this sort of tampering, yet it appears the internal memory wires can still be pulsed.") + if ((istype(W, /obj/item/device/multitool)) && (!l_hacking)) + if(src.open == 1) + to_chat(user, "Now attempting to reset internal memory, please hold.") + src.l_hacking = 1 + if (do_after(usr, 400*W.toolspeed, target = user)) + to_chat(user, "Internal memory reset - lock has been disengaged.") src.l_set = 0 - user.show_message("Internal memory reset. Please give it a few seconds to reinitialize.", 1) - sleep(80) - src.l_setshort = 0 src.l_hacking = 0 else - user.show_message("Unable to reset internal memory.", 1) src.l_hacking = 0 else - src.l_hacking = 0 + to_chat(user, "You must unscrew the service panel before you can pulse the wiring.") return //At this point you have exhausted all the special things to do when locked // ... but it's still locked. @@ -179,6 +178,7 @@ icon_opened = "safe0" icon_locking = "safeb" icon_sparking = "safespark" + desc = "Excellent for securing things away from grubby hands." force = 8 w_class = WEIGHT_CLASS_GIGANTIC max_w_class = 8 diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 470f3837f56..b42a8fb8135 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -34,7 +34,7 @@ if(!over_object) return - if (istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech + if (ismecha(M.loc)) // stops inventory actions in a mech return // this must come before the screen objects only block, dunno why it wasn't before diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 18fe4536ece..9ef47c6441c 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -19,7 +19,7 @@ var/has_latches = TRUE /obj/item/storage/toolbox/Initialize() - ..() + . = ..() if(has_latches) if(prob(10)) latches = "double_latch" @@ -152,6 +152,10 @@ new /obj/item/crowbar/brass(src) new /obj/item/weldingtool/experimental/brass(src) +/obj/item/storage/toolbox/brass/prefilled/servant + slot_flags = SLOT_BELT + fabricator_type = null + /obj/item/storage/toolbox/brass/prefilled/ratvar var/slab_type = /obj/item/clockwork/slab diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 25bd6947078..9892c354457 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -60,7 +60,8 @@ /obj/item/tank/internals/air name = "air tank" desc = "Mixed anyone?" - icon_state = "oxygen" + icon_state = "air" + item_state = "air" force = 10 dog_fashion = /datum/dog_fashion/back diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index c0f1e3267f3..8f5d43d51e4 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -178,7 +178,7 @@ if("pressure") var/pressure = params["pressure"] if(pressure == "reset") - pressure = TANK_DEFAULT_RELEASE_PRESSURE + pressure = initial(distribute_pressure) . = TRUE else if(pressure == "min") pressure = TANK_MIN_RELEASE_PRESSURE @@ -237,7 +237,6 @@ if(!istype(src.loc, /obj/item/device/transfer_valve)) message_admins("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].") log_game("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].") - //to_chat(world, "\blue[x],[y] tank is exploding: [pressure] kPa") //Give the gas a chance to build up more pressure through reacting air_contents.react() air_contents.react() @@ -246,7 +245,6 @@ var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE var/turf/epicenter = get_turf(loc) - //to_chat(world, "\blue Exploding Pressure: [pressure] kPa, intensity: [range]") explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5)) if(istype(src.loc, /obj/item/device/transfer_valve)) @@ -255,7 +253,6 @@ qdel(src) else if(pressure > TANK_RUPTURE_PRESSURE) - //to_chat(world, "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") if(integrity <= 0) var/turf/T = get_turf(src) if(!T) @@ -267,7 +264,6 @@ integrity-- else if(pressure > TANK_LEAK_PRESSURE) - //to_chat(world, "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") if(integrity <= 0) var/turf/T = get_turf(src) if(!T) diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index ba7141d77ee..d4432e02570 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -104,11 +104,11 @@ /obj/item/paper/guides/antag/supermatter_sliver info = "How to safely extract a supermatter sliver:\
- \
-
- Approach an active supermatter crystal with proper protective gear. DO NOT MAKE PHYSICAL CONTACT. \ +
- Approach an active supermatter crystal with radiation shielded personal protective equipment. DO NOT MAKE PHYSICAL CONTACT. \
- Use a supermatter scalpel (provided) to slice off a sliver of the crystal. \ -
- Use supermatter extraction tongs (also provided) to safely remove the sliver. \ +
- Use supermatter extraction tongs (also provided) to safely pick up the sliver you sliced off. \
- Physical contact of any object with the sliver will dust the object, as well as yourself. \ -
- Use the tongs to place the sliver into the provided container, which will take some time to seal \ +
- Use the tongs to place the sliver into the provided container, which will take some time to seal. \
- Get the hell out before the crystal delaminates. \
- ??? \
You're yanked away from [src]!") + playsound(src, 'sound/magic/enter_blood.ogg', 50, TRUE) + playsound(L, 'sound/magic/exit_blood.ogg', 50, TRUE) + flash_color(L, flash_color = "#C80000", flash_time = 10) + /turf/open/Initalize_Atmos(times_fired) excited = 0 update_visuals() diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index da92d6b9dde..74150c64334 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -125,11 +125,10 @@ /turf/open/chasm/straight_down/Initialize() - ..() + . = ..() drop_x = x drop_y = y - if(z+1 <= world.maxz) - drop_z = z+1 + drop_z = z - 1 var/turf/T = locate(drop_x, drop_y, drop_z) T.visible_message("The ceiling gives way!") playsound(T, 'sound/effects/break_stone.ogg', 50, 1) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 9ff164f50b5..3978bc802d5 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -21,7 +21,7 @@ broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") if (!burnt_states) burnt_states = list() - ..() + . = ..() //This is so damaged or burnt tiles or platings don't get remembered as the default tile var/static/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","damaged4", "damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", "foam_plating", @@ -163,10 +163,10 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "You remove the broken plating.") + to_chat(user, "You remove the broken plating.") else if(user && !silent) - to_chat(user, "You remove the floor tile.") + to_chat(user, "You remove the floor tile.") if(floor_tile && make_tile) new floor_tile(src) return make_plating() diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 59e7bed8ca9..428c965197a 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -8,10 +8,15 @@ */ /turf/open/floor/wood + desc = "Stylish dark wood." icon_state = "wood" floor_tile = /obj/item/stack/tile/wood broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") +/turf/open/floor/wood/examine(mob/user) + ..() + to_chat(user, "There's a few screws and a small crack visible.") + /turf/open/floor/wood/attackby(obj/item/C, mob/user, params) if(..()) return @@ -42,16 +47,16 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "You remove the broken planks.") + to_chat(user, "You remove the broken planks.") else if(make_tile) if(user && !silent) - to_chat(user, "You unscrew the planks.") + to_chat(user, "You unscrew the planks.") if(floor_tile) new floor_tile(src) else if(user && !silent) - to_chat(user, "You forcefully pry off the planks, destroying them in the process.") + to_chat(user, "You forcefully pry off the planks, destroying them in the process.") return make_plating() /turf/open/floor/wood/cold @@ -71,14 +76,14 @@ var/turfverb = "uproot" /turf/open/floor/grass/Initialize() - ..() + . = ..() update_icon() /turf/open/floor/grass/attackby(obj/item/C, mob/user, params) if(istype(C, /obj/item/shovel) && params) new ore_type(src) new ore_type(src) //Make some sand if you shovel grass - user.visible_message("[user] digs up [src].", "You [src.turfverb] [src].") + user.visible_message("[user] digs up [src].", "You [src.turfverb] [src].") playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) make_plating() if(..()) @@ -109,7 +114,7 @@ slowdown = 0 /turf/open/floor/grass/snow/basalt/Initialize() - ..() + . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" set_basalt_light(src) @@ -126,7 +131,7 @@ slowdown = 0 /turf/open/floor/grass/fakebasalt/Initialize() - ..() + . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" set_basalt_light(src) @@ -143,8 +148,12 @@ canSmoothWith = list(/turf/open/floor/carpet) flags_1 = NONE -/turf/open/floor/carpet/Initialize() +/turf/open/floor/carpet/examine(mob/user) ..() + to_chat(user, "There's a small crack on the edge of it.") + +/turf/open/floor/carpet/Initialize() + . = ..() update_icon() /turf/open/floor/carpet/update_icon() @@ -205,7 +214,7 @@ plane = PLANE_SPACE /turf/open/floor/fakespace/Initialize() - ..() + . = ..() icon_state = SPACE_ICON_STATE /turf/open/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 542a0ed81d4..0dd3673f6a4 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -12,8 +12,12 @@ var/can_modify_colour = TRUE -/turf/open/floor/light/Initialize() +/turf/open/floor/light/examine(mob/user) ..() + to_chat(user, "There's a small crack on the edge of it.") + +/turf/open/floor/light/Initialize() + . = ..() update_icon() /turf/open/floor/light/break_tile() diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index c28232410da..6f863d4bd03 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -18,7 +18,7 @@ /turf/open/floor/mineral/Initialize() broken_states = list("[initial(icon_state)]_dam") - ..() + . = ..() if (!icons) icons = list() @@ -221,7 +221,7 @@ icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9") /turf/open/floor/mineral/abductor/Initialize() - ..() + . = ..() icon_state = "alienpod[rand(1,9)]" /turf/open/floor/mineral/abductor/break_tile() diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 1461abfcaff..794b886537b 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -20,7 +20,7 @@ /turf/open/floor/circuit/Initialize() SSmapping.nuke_tiles += src update_icon() - ..() + . = ..() /turf/open/floor/circuit/Destroy() SSmapping.nuke_tiles -= src @@ -142,25 +142,27 @@ name = "clockwork floor" desc = "Tightly-pressed brass tiles. They emit minute vibration." icon_state = "plating" + baseturf = /turf/open/floor/clockwork + var/uses_overlay = TRUE var/obj/effect/clockwork/overlay/floor/realappearence /turf/open/floor/clockwork/Initialize() - ..() - new /obj/effect/temp_visual/ratvar/floor(src) - new /obj/effect/temp_visual/ratvar/beam(src) - realappearence = new /obj/effect/clockwork/overlay/floor(src) - realappearence.linked = src - change_construction_value(1) + . = ..() + if(uses_overlay) + new /obj/effect/temp_visual/ratvar/floor(src) + new /obj/effect/temp_visual/ratvar/beam(src) + realappearence = new /obj/effect/clockwork/overlay/floor(src) + realappearence.linked = src /turf/open/floor/clockwork/Destroy() STOP_PROCESSING(SSobj, src) - change_construction_value(-1) - if(realappearence) - qdel(realappearence) - realappearence = null + if(uses_overlay && realappearence) + QDEL_NULL(realappearence) return ..() /turf/open/floor/clockwork/ReplaceWithLattice() + if(baseturf == type) + return ..() for(var/obj/structure/lattice/L in src) L.ratvar_act() @@ -194,6 +196,8 @@ L.adjustToxLoss(-3, TRUE, TRUE) /turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params) + if(baseturf == type) + return if(istype(I, /obj/item/crowbar)) user.visible_message("[user] begins slowly prying up [src]...", "You begin painstakingly prying up [src]...") playsound(src, I.usesound, 20, 1) @@ -217,6 +221,12 @@ animate(src, color = previouscolor, time = 8) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) +/turf/open/floor/clockwork/reebe + name = "cogplate" + desc = "Warm brass plating. You can feel it gently vibrating, as if machinery is on the other side." + icon_state = "reebe" + baseturf = /turf/open/floor/clockwork/reebe + uses_overlay = FALSE /turf/open/floor/bluespace slowdown = -1 diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 63c883f88c0..b194127de83 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -4,6 +4,10 @@ broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") burnt_states = list("floorscorched1", "floorscorched2") +/turf/open/floor/plasteel/examine(mob/user) + ..() + to_chat(user, "There's a small crack on the edge of it.") + /turf/open/floor/plasteel/update_icon() if(!..()) return 0 diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 3617759e99d..3e16da8b9f4 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -12,12 +12,19 @@ icon_state = "plating" intact = FALSE +/turf/open/floor/plating/examine(mob/user) + ..() + if(broken || burnt) + to_chat(user, "It looks like the dents could be welded smooth.") + return + to_chat(user, "There are few attachment holes for a new tile or reinforcement rods.") + /turf/open/floor/plating/Initialize() if (!broken_states) broken_states = list("platingdmg1", "platingdmg2", "platingdmg3") if (!burnt_states) burnt_states = list("panelscorched") - ..() + . = ..() icon_plating = icon_state /turf/open/floor/plating/update_icon() diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 2649a3a14de..848a7e82193 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -193,7 +193,7 @@ var/list/L = list(45) if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels. - L += -45 + L -= 45 // Expand the edges of our tunnel for(var/edge_angle in L) diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index eaf0e512f72..74354e78c77 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -1,11 +1,16 @@ /turf/open/floor/engine name = "reinforced floor" + desc = "Extremely sturdy." icon_state = "engine" thermal_conductivity = 0.025 heat_capacity = INFINITY floor_tile = /obj/item/stack/rods +/turf/open/floor/engine/examine(mob/user) + ..() + to_chat(user, "The reinforcement rods are wrenched firmly in place.") + /turf/open/floor/engine/airless initial_gas_mix = "TEMP=2.7" @@ -108,7 +113,7 @@ var/obj/effect/clockwork/overlay/floor/bloodcult/realappearence /turf/open/floor/engine/cult/Initialize() - ..() + . = ..() new /obj/effect/temp_visual/cult/turf/floor(src) realappearence = new /obj/effect/clockwork/overlay/floor/bloodcult(src) realappearence.linked = src diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 9e0d57d7825..1a5d0b78ec7 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -30,7 +30,7 @@ pixel_y = -4 pixel_x = -4 icon = smooth_icon - ..() + . = ..() if (mineralType && mineralAmt && spread && spreadChance) for(var/dir in GLOB.cardinals) if(prob(spreadChance)) @@ -38,10 +38,6 @@ if(istype(T, /turf/closed/mineral/random)) Spread(T) -/turf/closed/mineral/shuttleRotate(rotation) - setDir(angle2dir(rotation+dir2angle(dir))) - queue_smooth(src) - /turf/closed/mineral/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) if(turf_type) underlay_appearance.icon = initial(turf_type.icon) @@ -111,12 +107,6 @@ if(istype(R.module_active, /obj/item/pickaxe)) src.attackby(R.module_active,R) return -/* else if(istype(AM, /obj/mecha)) - var/obj/mecha/M = AM - if(istype(M.selected, /obj/item/mecha_parts/mecha_equipment/drill)) - src.attackby(M.selected,M) - return*/ -//Aparantly mechs are just TOO COOL to call Collide()) else return @@ -153,7 +143,7 @@ /turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1) if (display_icon_state) icon_state = display_icon_state - ..() + . = ..() if (prob(mineralChance)) var/path = pickweight(mineralSpawnChanceList) var/turf/T = ChangeTurf(path,FALSE,FALSE,TRUE) @@ -393,7 +383,7 @@ /turf/closed/mineral/gibtonite/Initialize() det_time = rand(8,10) //So you don't know exactly when the hot potato will explode - ..() + . = ..() /turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1) diff --git a/code/game/turfs/simulated/reebe_void.dm b/code/game/turfs/simulated/reebe_void.dm new file mode 100644 index 00000000000..2e0246df832 --- /dev/null +++ b/code/game/turfs/simulated/reebe_void.dm @@ -0,0 +1,47 @@ +/turf/open/indestructible/reebe_void + name = "void" + icon_state = "reebemap" + layer = SPACE_LAYER + baseturf = /turf/open/indestructible/reebe_void + planetary_atmos = TRUE + +/turf/open/indestructible/reebe_void/Initialize(mapload) + . = ..() + icon_state = "reebegame" + +/turf/open/indestructible/reebe_void/spawning + icon_state = "reebespawn" + +/turf/open/indestructible/reebe_void/spawning/Initialize(mapload) + . = ..() + if(mapload) + for(var/i in 1 to 3) + if(prob(1)) + new /obj/item/clockwork/alloy_shards/large(src) + if(prob(2)) + new /obj/item/clockwork/alloy_shards/medium(src) + if(prob(3)) + new /obj/item/clockwork/alloy_shards/small(src) + +/turf/open/indestructible/reebe_void/spawning/lattices + icon_state = "reebelattice" + +/turf/open/indestructible/reebe_void/spawning/lattices/Initialize(mapload) + . = ..() + if(mapload) + if(prob(2.5)) + new /obj/structure/lattice/catwalk/clockwork(src) + else if(prob(5)) + new /obj/structure/lattice/clockwork(src) + +/turf/open/indestructible/reebe_void/Enter(atom/movable/AM, atom/old_loc) + if(!..()) + return FALSE + else + if(istype(AM, /obj/structure/window)) + return FALSE + if(istype(AM, /obj/item/projectile)) + return TRUE + if((locate(/obj/structure/lattice) in src)) + return TRUE + return FALSE diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index d0eaad34e3a..e39c791cee8 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -55,8 +55,8 @@ sheet_type = /obj/item/stack/tile/brass sheet_amount = 1 girder_type = /obj/structure/destructible/clockwork/wall_gear + baseturf = /turf/open/floor/clockwork/reebe var/obj/effect/clockwork/overlay/wall/realappearence - var/obj/structure/destructible/clockwork/cache/linkedcache /turf/closed/wall/clockwork/Initialize() ..() @@ -64,18 +64,8 @@ new /obj/effect/temp_visual/ratvar/beam(src) realappearence = new /obj/effect/clockwork/overlay/wall(src) realappearence.linked = src - change_construction_value(5) - -/turf/closed/wall/clockwork/examine(mob/user) - ..() - if((is_servant_of_ratvar(user) || isobserver(user)) && linkedcache) - to_chat(user, "It is linked to a Tinkerer's Cache, generating components!") /turf/closed/wall/clockwork/Destroy() - if(linkedcache) - linkedcache.linkedwall = null - linkedcache = null - change_construction_value(-5) if(realappearence) qdel(realappearence) realappearence = null diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm index 5ebe1d632af..5c95d108b42 100644 --- a/code/game/turfs/simulated/wall/reinf_walls.dm +++ b/code/game/turfs/simulated/wall/reinf_walls.dm @@ -13,8 +13,7 @@ girder_type = /obj/structure/girder/reinforced explosion_block = 2 -/turf/closed/wall/r_wall/examine(mob/user) - ..() +/turf/closed/wall/r_wall/deconstruction_hints(mob/user) switch(d_state) if(INTACT) to_chat(user, "The outer grille is fully intact.") diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 9171c7f54c0..baee3b31c17 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -25,6 +25,13 @@ /turf/closed/wall/clockwork) smooth = SMOOTH_TRUE +/turf/closed/wall/examine(mob/user) + ..() + deconstruction_hints(user) + +/turf/closed/wall/proc/deconstruction_hints(mob/user) + to_chat(user, "The outer plating is welded firmly in place.") + /turf/closed/wall/attack_tk() return @@ -287,4 +294,4 @@ to_chat(user, "You deconstruct the wall.") ChangeTurf(/turf/open/floor/plating) return TRUE - return FALSE \ No newline at end of file + return FALSE diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 2c988c00cc0..126e2d0c66b 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -14,6 +14,7 @@ var/global/datum/gas_mixture/immutable/space/space_gas = new plane = PLANE_SPACE + layer = SPACE_LAYER light_power = 0.25 dynamic_lighting = DYNAMIC_LIGHTING_DISABLED @@ -66,7 +67,7 @@ return /turf/open/space/proc/update_starlight() - if(config.starlight) + if(CONFIG_GET(flag/starlight)) for(var/t in RANGE_TURFS(1,src)) //RANGE_TURFS is in code\__HELPERS\game.dm if(isspaceturf(t)) //let's NOT update this that much pls diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index f11735d6768..cf611560c30 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -73,7 +73,7 @@ /turf/open/space/transit/Initialize() - ..() + . = ..() update_icon() for(var/atom/movable/AM in src) throw_atom(AM) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 601cd6ccab8..15910adf47b 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -122,8 +122,6 @@ return FALSE /turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area) - if (!mover) - return TRUE // First, make sure it can leave its square if(isturf(mover.loc)) // Nothing but border objects stop you from leaving a tile, only one loop is needed @@ -132,32 +130,28 @@ mover.Collide(obstacle) return FALSE - var/list/large_dense = list() - - //Next, check objects to block entry that are on the border - for(var/atom/movable/border_obstacle in src) - if(border_obstacle.flags_1 & ON_BORDER_1) - if(!border_obstacle.CanPass(mover, mover.loc, 1) && (forget != border_obstacle)) - mover.Collide(border_obstacle) - return FALSE - else - large_dense += border_obstacle - //Then, check the turf itself if (!src.CanPass(mover, src)) mover.Collide(src) return FALSE - //Finally, check objects/mobs to block entry that are not on the border - var/atom/movable/tompost_bump + + var/atom/movable/topmost_bump var/top_layer = FALSE - for(var/atom/movable/obstacle in large_dense) + + //Next, check objects to block entry that are on the border + for(var/atom/movable/obstacle in src) if(!obstacle.CanPass(mover, mover.loc, 1) && (forget != obstacle)) - if(obstacle.layer > top_layer) - tompost_bump = obstacle - top_layer = obstacle.layer - if(tompost_bump) - mover.Collide(tompost_bump) + if(obstacle.flags_1 & ON_BORDER_1) + mover.Collide(obstacle) + return FALSE + else + if(obstacle.layer > top_layer) + topmost_bump = obstacle + top_layer = obstacle.layer + + if(topmost_bump) + mover.Collide(topmost_bump) return FALSE return TRUE //Nothing found to block so return success! @@ -446,7 +440,7 @@ /turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, forceop = FALSE) // Remove all atoms except observers, landmarks, docking ports var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object)) - var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(ignore_typecache), ignored_atoms) + var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(), ignored_atoms | ignore_typecache) allowed_contents -= src for(var/i in 1 to allowed_contents.len) var/thing = allowed_contents[i] @@ -512,7 +506,7 @@ return if(has_gravity(src)) playsound(src, "bodyfall", 50, 1) - + faller.drop_all_held_items() /turf/proc/add_decal(decal,group) LAZYINITLIST(decals) diff --git a/code/game/world.dm b/code/game/world.dm index 3763a408acc..65490a9a969 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -1,3 +1,6 @@ +#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round + //This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored + GLOBAL_VAR(security_mode) GLOBAL_PROTECT(security_mode) @@ -12,20 +15,19 @@ GLOBAL_PROTECT(security_mode) make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) - config = new + new /datum/controller/configuration CheckSchemaVersion() SetRoundID() SetupLogs() - if(!RunningService()) //tgs2 support - GLOB.revdata.DownloadPRDetails() + SERVER_TOOLS_ON_NEW load_motd() load_admins() LoadVerbs(/datum/verbs/menu) - if(config.usewhitelist) + if(CONFIG_GET(flag/usewhitelist)) load_whitelist() LoadBans() @@ -33,9 +35,6 @@ GLOBAL_PROTECT(security_mode) Master.Initialize(10, FALSE) - if(config.irc_announce_new_game) - IRCBroadcast("New round starting on [SSmapping.config.map_name]!") - /world/proc/SetupExternalRSC() #if (PRELOAD_RSC == 0) external_rsc_urls = world.file2list("config/external_rsc_urls.txt","\n") @@ -48,7 +47,7 @@ GLOBAL_PROTECT(security_mode) #endif /world/proc/CheckSchemaVersion() - if(config.sql_enabled) + if(CONFIG_GET(flag/sql_enabled)) if(SSdbcore.Connect()) log_world("Database connection established.") var/datum/DBQuery/query_db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_revision")] ORDER BY date DESC LIMIT 1") @@ -68,7 +67,7 @@ GLOBAL_PROTECT(security_mode) log_world("Your server failed to establish a connection with the database.") /world/proc/SetRoundID() - if(config.sql_enabled) + if(CONFIG_GET(flag/sql_enabled)) if(SSdbcore.Connect()) var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')") query_round_start.Execute() @@ -122,12 +121,13 @@ GLOBAL_PROTECT(security_mode) var/pinging = ("ping" in input) var/playing = ("players" in input) - if(!pinging && !playing && config && config.log_world_topic) + if(!pinging && !playing && config && CONFIG_GET(flag/log_world_topic)) WRITE_FILE(GLOB.world_game_log, "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]") - if(input[SERVICE_CMD_PARAM_KEY]) - return ServiceCommand(input) - var/key_valid = (global.comms_allowed && input["key"] == global.comms_key) + SERVER_TOOLS_ON_TOPIC //redirect to server tools if necessary + + var/comms_key = CONFIG_GET(string/comms_key) + var/key_valid = (comms_key && input["key"] == comms_key) if(pinging) var/x = 1 @@ -142,25 +142,14 @@ GLOBAL_PROTECT(security_mode) n++ return n - else if("ircstatus" in input) //tgs2 support - var/static/last_irc_status = 0 - if(world.time - last_irc_status < 50) - return - var/list/adm = get_admin_counts() - var/list/allmins = adm["total"] - var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). " - status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode.name]." - send2irc("Status", status) - last_irc_status = world.time - else if("status" in input) var/list/s = list() s["version"] = GLOB.game_version s["mode"] = GLOB.master_mode - s["respawn"] = config ? GLOB.abandon_allowed : 0 + s["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE s["enter"] = GLOB.enter_allowed - s["vote"] = config.allow_vote_mode - s["ai"] = config.allow_ai + s["vote"] = CONFIG_GET(flag/allow_vote_mode) + s["ai"] = CONFIG_GET(flag/allow_ai) s["host"] = host ? host : null s["active_players"] = get_active_player_count() s["players"] = GLOB.clients.len @@ -210,24 +199,6 @@ GLOBAL_PROTECT(security_mode) if(input["crossmessage"] == "News_Report") minor_announce(input["message"], "Breaking Update From [input["message_sender"]]") - else if("adminmsg" in input) //tgs2 support - if(!key_valid) - return "Bad Key" - else - return IrcPm(input["adminmsg"],input["msg"],input["sender"]) - - else if("namecheck" in input) //tgs2 support - if(!key_valid) - return "Bad Key" - else - log_admin("IRC Name Check: [input["sender"]] on [input["namecheck"]]") - message_admins("IRC name checking on [input["namecheck"]] from [input["sender"]]") - return keywords_lookup(input["namecheck"],1) - else if("adminwho" in input) //tgs2 support - if(!key_valid) - return "Bad Key" - else - return ircadminwho() else if("server_hop" in input) show_server_hop_transfer_screen(input["server_hop"]) @@ -246,7 +217,7 @@ GLOBAL_PROTECT(security_mode) C.AnnouncePR(final_composed) /world/Reboot(reason = 0, fast_track = FALSE) - ServiceReboot() //handles alternative actions if necessary + SERVER_TOOLS_ON_REBOOT if (reason || fast_track) //special reboot, do none of the normal stuff if (usr) log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools") @@ -262,17 +233,6 @@ GLOBAL_PROTECT(security_mode) GLOB.join_motd = file2text("config/motd.txt") + "
" + GLOB.revdata.GetTestMergeInfo() /world/proc/update_status() - var/s = "" - - if (config && config.server_name) - s += "[config.server_name] — " - - s += "[station_name()]"; - s += " (" - s += "" //Change this to wherever you want the hub to link to. - s += "Default" //Replace this with something else. Or ever better, delete it and uncomment the game version. - s += "" - s += ")" var/list/features = list() @@ -282,13 +242,25 @@ GLOBAL_PROTECT(security_mode) if (!GLOB.enter_allowed) features += "closed" - features += GLOB.abandon_allowed ? "respawn" : "no respawn" + var/s = "" + var/hostedby + if(config) + var/server_name = CONFIG_GET(string/servername) + if (server_name) + s += "[server_name] — " + features += "[CONFIG_GET(flag/norespawn) ? "no " : ""]respawn" + if(CONFIG_GET(flag/allow_vote_mode)) + features += "vote" + if(CONFIG_GET(flag/allow_ai)) + features += "AI allowed" + hostedby = CONFIG_GET(string/hostedby) - if (config && config.allow_vote_mode) - features += "vote" - - if (config && config.allow_ai) - features += "AI allowed" + s += "[station_name()]"; + s += " (" + s += "" //Change this to wherever you want the hub to link to. + s += "Default" //Replace this with something else. Or ever better, delete it and uncomment the game version. + s += "" + s += ")" var/n = 0 for (var/mob/M in GLOB.player_list) @@ -300,8 +272,8 @@ GLOBAL_PROTECT(security_mode) else if (n > 0) features += "~[n] player" - if (!host && config && config.hostedby) - features += "hosted by [config.hostedby]" + if (!host && hostedby) + features += "hosted by [hostedby]" if (features) s += ": [jointext(features, ", ")]" diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm index eb4d854d66e..eb81a0de9fd 100644 --- a/code/modules/admin/DB_ban/functions.dm +++ b/code/modules/admin/DB_ban/functions.dm @@ -362,6 +362,7 @@ output += "