- " + 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 546935e697..e3ce12397e 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -1,52 +1,148 @@ -//Returns the world time in english -/proc/worldtime2text() - return gameTimestamp("hh:mm:ss", world.time) - -/proc/time_stamp(format = "hh:mm:ss", show_ds) - var/time_string = time2text(world.timeofday, format) - return show_ds ? "[time_string]:[world.timeofday % 10]" : time_string - -/proc/gameTimestamp(format = "hh:mm:ss", wtime=null) - if(!wtime) - wtime = world.time - return time2text(wtime - GLOB.timezoneOffset + SSticker.gametime_offset - SSticker.round_start_time, format) - -/* Returns 1 if it is the selected month and day */ -/proc/isDay(month, day) - if(isnum(month) && isnum(day)) - var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month - var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day - if(month == MM && day == DD) - return 1 - - // Uncomment this out when debugging! - //else - //return 1 - -//returns timestamp in a sql and ISO 8601 friendly format -/proc/SQLtime(timevar) - if(!timevar) - timevar = world.realtime - return time2text(timevar, "YYYY-MM-DD hh:mm:ss") - - -GLOBAL_VAR_INIT(midnight_rollovers, 0) -GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) -/proc/update_midnight_rollover() - if (world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS! - return GLOB.midnight_rollovers++ - return GLOB.midnight_rollovers - -/proc/weekdayofthemonth() - var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day - switch(DD) - if(8 to 13) - return 2 - if(14 to 20) - return 3 - if(21 to 27) - return 4 - if(28 to INFINITY) - return 5 - else - return 1 +//Returns the world time in english +/proc/worldtime2text() + return gameTimestamp("hh:mm:ss", world.time) + +/proc/time_stamp(format = "hh:mm:ss", show_ds) + var/time_string = time2text(world.timeofday, format) + return show_ds ? "[time_string]:[world.timeofday % 10]" : time_string + +/proc/gameTimestamp(format = "hh:mm:ss", wtime=null) + if(!wtime) + wtime = world.time + return time2text(wtime - GLOB.timezoneOffset + SSticker.gametime_offset - SSticker.round_start_time, format) + +/* Returns 1 if it is the selected month and day */ +/proc/isDay(month, day) + if(isnum(month) && isnum(day)) + var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month + var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day + if(month == MM && day == DD) + return 1 + + // Uncomment this out when debugging! + //else + //return 1 + +//returns timestamp in a sql and ISO 8601 friendly format +/proc/SQLtime(timevar) + if(!timevar) + timevar = world.realtime + return time2text(timevar, "YYYY-MM-DD hh:mm:ss") + + +GLOBAL_VAR_INIT(midnight_rollovers, 0) +GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) +/proc/update_midnight_rollover() + if (world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS! + return GLOB.midnight_rollovers++ + return GLOB.midnight_rollovers + +/proc/weekdayofthemonth() + var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day + switch(DD) + if(8 to 13) + return 2 + if(14 to 20) + return 3 + if(21 to 27) + return 4 + if(28 to INFINITY) + 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 60b5d82940..46d6c2ce5c 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 a05d52087f..5e190ab709 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -502,28 +502,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. @@ -812,7 +796,7 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list( /* -Checks if that loc and dir has a item on the wall +Checks if that loc and dir has an item on the wall */ GLOBAL_LIST_INIT(WALLITEMS, typecacheof(list( /obj/machinery/power/apc, /obj/machinery/airalarm, /obj/item/device/radio/intercom, @@ -1282,7 +1266,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) @@ -1380,63 +1364,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/_compile_options.dm b/code/_compile_options.dm index 54459da0b5..829a55150f 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -33,7 +33,7 @@ #define MAX_CHARTER_LEN 80 //MINOR TWEAKS/MISC -#define AGE_MIN 17 //youngest a character can be +#define AGE_MIN 18 //youngest a character can be #define AGE_MAX 85 //oldest a character can be #define WIZARD_AGE_MIN 30 //youngest a wizard can be #define SHOES_SLOWDOWN 0 //How much shoes slow you down by default. Negative values speed you up @@ -72,4 +72,4 @@ //Update this whenever the db schema changes //make sure you add an update to the schema_version stable in the db changelog #define DB_MAJOR_VERSION 3 -#define DB_MINOR_VERSION 1 +#define DB_MINOR_VERSION 3 diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index 83bf3cfb5a..391744e34c 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 1581c904b9..03824c4c83 100644 --- a/code/_globalvars/lists/mapping.dm +++ b/code/_globalvars/lists/mapping.dm @@ -1,55 +1,61 @@ -#define Z_NORTH 1 -#define Z_EAST 2 -#define Z_SOUTH 3 -#define Z_WEST 4 - +#define Z_NORTH 1 +#define Z_EAST 2 +#define Z_SOUTH 3 +#define Z_WEST 4 + GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST)) -GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) -GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) - -//This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there. -//(Exceptions: extended, sandbox and nuke) -Errorage -//Was list("3" = 30, "4" = 70). -//Spacing should be a reliable method of getting rid of a body -- Urist. -//Go away Urist, I'm restoring this to the longer list. ~Errorage -GLOBAL_LIST_INIT(accessable_z_levels, list(1,3,4,5,6,7)) //Keep this to six maps, repeating z-levels is ok if needed - -GLOBAL_LIST(global_map) - //list/global_map = list(list(1,5),list(4,3))//an array of map Z levels. - //Resulting sector map looks like - //|_1_|_4_| - //|_5_|_3_| - // - //1 - SS13 - //4 - Derelict - //3 - AI satellite - //5 - empty space - -GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created -GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created -GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security spawns -GLOBAL_LIST_EMPTY(generic_event_spawns) //list of all spawns for events - -GLOBAL_LIST_EMPTY(wizardstart) -GLOBAL_LIST_EMPTY(newplayer_start) -GLOBAL_LIST_EMPTY(prisonwarp) //prisoners go to these -GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here -GLOBAL_LIST_EMPTY(xeno_spawn)//Aliens spawn at these. -GLOBAL_LIST_EMPTY(tdome1) -GLOBAL_LIST_EMPTY(tdome2) -GLOBAL_LIST_EMPTY(tdomeobserve) -GLOBAL_LIST_EMPTY(tdomeadmin) -GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped -GLOBAL_LIST_EMPTY(blobstart) -GLOBAL_LIST_EMPTY(secequipment) -GLOBAL_LIST_EMPTY(deathsquadspawn) -GLOBAL_LIST_EMPTY(emergencyresponseteamspawn) -GLOBAL_LIST_EMPTY(ruin_landmarks) - - //away missions -GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can take you to - - //used by jump-to-area etc. Updated by area/updateName() -GLOBAL_LIST_EMPTY(sortedAreas) - -GLOBAL_LIST_EMPTY(all_abstract_markers) \ No newline at end of file +GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) +GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) + +//This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there. +//(Exceptions: extended, sandbox and nuke) -Errorage +//Was list("3" = 30, "4" = 70). +//Spacing should be a reliable method of getting rid of a body -- Urist. +//Go away Urist, I'm restoring this to the longer list. ~Errorage +GLOBAL_LIST_INIT(accessable_z_levels, list(1,3,4,5,6,7)) //Keep this to six maps, repeating z-levels is ok if needed + +GLOBAL_LIST_INIT(station_z_levels, list(ZLEVEL_STATION_PRIMARY)) + +GLOBAL_LIST(global_map) + //list/global_map = list(list(1,5),list(4,3))//an array of map Z levels. + //Resulting sector map looks like + //|_1_|_4_| + //|_5_|_3_| + // + //1 - SS13 + //4 - Derelict + //3 - AI satellite + //5 - empty space + +GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created +GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created +GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security spawns +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 +GLOBAL_LIST_EMPTY(xeno_spawn)//Aliens spawn at these. +GLOBAL_LIST_EMPTY(tdome1) +GLOBAL_LIST_EMPTY(tdome2) +GLOBAL_LIST_EMPTY(tdomeobserve) +GLOBAL_LIST_EMPTY(tdomeadmin) +GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped +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 +GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can take you to + + //used by jump-to-area etc. Updated by area/updateName() +GLOBAL_LIST_EMPTY(sortedAreas) + +GLOBAL_LIST_EMPTY(all_abstract_markers) diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 4c8a2654fa..62a5b8c80e 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 522ff84ff0..d855c7f141 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/logging.dm b/code/_globalvars/logging.dm index 5be6a8dbaa..3f96b33b34 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -4,6 +4,8 @@ GLOBAL_VAR(world_game_log) GLOBAL_PROTECT(world_game_log) GLOBAL_VAR(world_runtime_log) GLOBAL_PROTECT(world_runtime_log) +GLOBAL_VAR(world_qdel_log) +GLOBAL_PROTECT(world_qdel_log) GLOBAL_VAR(world_attack_log) GLOBAL_PROTECT(world_attack_log) GLOBAL_VAR(world_href_log) @@ -14,6 +16,8 @@ GLOBAL_VAR(config_error_log) GLOBAL_PROTECT(config_error_log) GLOBAL_VAR(sql_error_log) GLOBAL_PROTECT(sql_error_log) +GLOBAL_VAR(world_pda_log) +GLOBAL_PROTECT(world_pda_log) GLOBAL_LIST_EMPTY(bombers) GLOBAL_PROTECT(bombers) diff --git a/code/_globalvars/sensitive.dm b/code/_globalvars/sensitive.dm deleted file mode 100644 index e1a02621ac..0000000000 --- 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/ai.dm b/code/_onclick/ai.dm index 6b4d9aad1c..b65890f4c6 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -14,7 +14,8 @@ if(call(client.click_intercept, "InterceptClickOn")(src, params, A)) return - if(control_disabled || stat) return + if(control_disabled || incapacitated()) + return if(ismob(A)) ai_actual_track(A) @@ -31,7 +32,7 @@ if(call(client.click_intercept, "InterceptClickOn")(src, params, A)) return - if(control_disabled || stat) + if(control_disabled || incapacitated()) return var/turf/pixel_turf = get_turf_pixel(A) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 0eeca2eaf7..99d12568bc 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 85ecd036de..d4d2c2d8a5 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/ai.dm b/code/_onclick/hud/ai.dm index a5bc86dabe..87a33afc13 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -2,8 +2,8 @@ icon = 'icons/mob/screen_ai.dmi' /obj/screen/ai/Click() - if(isobserver(usr)) - return 1 + if(isobserver(usr) || usr.incapacitated()) + return TRUE /obj/screen/ai/aicore name = "AI core" @@ -20,6 +20,8 @@ icon_state = "camera" /obj/screen/ai/camera_list/Click() + if(..()) + return var/mob/living/silicon/ai/AI = usr var/camera = input(AI, "Choose which camera you want to view", "Cameras") as null|anything in AI.get_camera_list() AI.ai_camera_list(camera) @@ -130,6 +132,8 @@ icon_state = "take_picture" /obj/screen/ai/image_take/Click() + if(..()) + return if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.aicamera.toggle_camera_mode() @@ -142,6 +146,8 @@ icon_state = "view_images" /obj/screen/ai/image_view/Click() + if(..()) + return if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.aicamera.viewpictures() diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 69deb2cb58..3cc6734482 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() ..() @@ -624,7 +538,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) @@ -633,6 +547,7 @@ so as to remain in compliance with the most up-to-date laws." /obj/screen/alert/restrained/buckled name = "Buckled" desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed." + icon_state = "buckled" /obj/screen/alert/restrained/handcuffed name = "Handcuffed" @@ -643,9 +558,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 @@ -698,4 +624,3 @@ so as to remain in compliance with the most up-to-date laws." severity = 0 master = null screen_loc = "" - diff --git a/code/_onclick/hud/clockwork_marauder.dm b/code/_onclick/hud/clockwork_marauder.dm deleted file mode 100644 index 7429d1deeb..0000000000 --- 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/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 6c18ad0e07..12253cc550 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -67,7 +67,7 @@ screen_loc = "CENTER-7,CENTER-7" layer = FULLSCREEN_LAYER plane = FULLSCREEN_PLANE - mouse_opacity = MOUSE_OPACITY_TRANSPARENT + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/severity = 0 var/show_when_dead = FALSE @@ -95,16 +95,20 @@ layer = CRIT_LAYER plane = FULLSCREEN_PLANE +/obj/screen/fullscreen/crit/vision + icon_state = "oxydamageoverlay" + layer = BLIND_LAYER + /obj/screen/fullscreen/blind icon_state = "blackimageoverlay" layer = BLIND_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/curse - icon_state = "curse" - layer = CURSE_LAYER - plane = FULLSCREEN_PLANE - +/obj/screen/fullscreen/curse + icon_state = "curse" + layer = CURSE_LAYER + plane = FULLSCREEN_PLANE + /obj/screen/fullscreen/impaired icon_state = "impairedoverlay" @@ -168,4 +172,4 @@ plane = LIGHTING_PLANE layer = LIGHTING_LAYER blend_mode = BLEND_ADD - show_when_dead = TRUE + show_when_dead = TRUE diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 07c17b891f..4d1ca2c778 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() @@ -313,11 +313,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/parallax.dm b/code/_onclick/hud/parallax.dm index f364bac76f..a9971895a7 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -247,7 +247,7 @@ /obj/screen/parallax_layer/Initialize(mapload, view) - ..() + . = ..() if (!view) view = world.view update_o(view) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 2d94f41ba9..0906a099a0 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -1,586 +1,586 @@ -/* - Screen objects - Todo: improve/re-implement - - Screen objects are only used for the hud and should not appear anywhere "in-game". - They are used with the client/screen list and the screen_loc var. - For more information, see the byond documentation on the screen_loc and screen vars. -*/ -/obj/screen - name = "" - icon = 'icons/mob/screen_gen.dmi' - layer = ABOVE_HUD_LAYER - plane = ABOVE_HUD_PLANE - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - appearance_flags = APPEARANCE_UI - var/obj/master = null //A reference to the object in the slot. Grabs or items, generally. - var/datum/hud/hud = null // A reference to the owner HUD, if any. - -/obj/screen/take_damage() - return - -/obj/screen/Destroy() - master = null - hud = null - return ..() - -/obj/screen/examine(mob/user) - return - -/obj/screen/orbit() - return - -/obj/screen/text - icon = null - icon_state = null +/* + Screen objects + Todo: improve/re-implement + + Screen objects are only used for the hud and should not appear anywhere "in-game". + They are used with the client/screen list and the screen_loc var. + For more information, see the byond documentation on the screen_loc and screen vars. +*/ +/obj/screen + name = "" + icon = 'icons/mob/screen_gen.dmi' + layer = ABOVE_HUD_LAYER + plane = ABOVE_HUD_PLANE + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + appearance_flags = APPEARANCE_UI + var/obj/master = null //A reference to the object in the slot. Grabs or items, generally. + var/datum/hud/hud = null // A reference to the owner HUD, if any. + +/obj/screen/take_damage() + return + +/obj/screen/Destroy() + master = null + hud = null + return ..() + +/obj/screen/examine(mob/user) + return + +/obj/screen/orbit() + return + +/obj/screen/text + icon = null + icon_state = null mouse_opacity = MOUSE_OPACITY_TRANSPARENT - screen_loc = "CENTER-7,CENTER-7" - maptext_height = 480 - maptext_width = 480 - -/obj/screen/swap_hand - layer = HUD_LAYER - plane = HUD_PLANE - name = "swap hand" - -/obj/screen/swap_hand/Click() - // At this point in client Click() code we have passed the 1/10 sec check and little else - // We don't even know if it's a middle click - if(world.time <= usr.next_move) - return 1 - - if(usr.incapacitated()) - return 1 - - if(ismob(usr)) - var/mob/M = usr - M.swap_hand() - return 1 - -/obj/screen/craft - name = "crafting menu" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "craft" - screen_loc = ui_crafting - -/obj/screen/craft/Click() - var/mob/living/M = usr - if(isobserver(usr)) - return - M.OpenCraftingMenu() - -/obj/screen/area_creator - name = "create new area" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "area_edit" - screen_loc = ui_building - -/obj/screen/area_creator/Click() - if(usr.incapacitated()) - return 1 - var/area/A = get_area(usr) - if(!A.outdoors) - to_chat(usr, "There is already a defined structure here.") - return 1 - create_area(usr) - -/obj/screen/language_menu - name = "language menu" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "talk_wheel" - screen_loc = ui_language_menu - -/obj/screen/language_menu/Click() - var/mob/M = usr - var/datum/language_holder/H = M.get_language_holder() - H.open_language_menu(usr) - -/obj/screen/inventory - var/slot_id // The indentifier for the slot. It has nothing to do with ID cards. - var/icon_empty // Icon when empty. For now used only by humans. - var/icon_full // Icon when contains an item. For now used only by humans. - layer = HUD_LAYER - plane = HUD_PLANE - -/obj/screen/inventory/Click(location, control, params) - // At this point in client Click() code we have passed the 1/10 sec check and little else - // We don't even know if it's a middle click - if(world.time <= usr.next_move) - return 1 - - if(usr.incapacitated()) - return 1 - if(istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech - return 1 - - if(hud && hud.mymob && slot_id) - var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id) - if(inv_item) - return inv_item.Click(location, control, params) - - if(usr.attack_ui(slot_id)) - usr.update_inv_hands() - return 1 - -/obj/screen/inventory/update_icon() - if(!icon_empty) - icon_empty = icon_state - - if(hud && hud.mymob && slot_id && icon_full) - if(hud.mymob.get_item_by_slot(slot_id)) - icon_state = icon_full - else - icon_state = icon_empty - -/obj/screen/inventory/hand - var/mutable_appearance/handcuff_overlay - var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "blocked") - var/held_index = 0 - -/obj/screen/inventory/hand/update_icon() - ..() - - if(!handcuff_overlay) - var/state = (!(held_index % 2)) ? "markus" : "gabrielle" - handcuff_overlay = mutable_appearance('icons/mob/screen_gen.dmi', state) - - cut_overlays() - - if(hud && hud.mymob) - if(iscarbon(hud.mymob)) - var/mob/living/carbon/C = hud.mymob - if(C.handcuffed) - add_overlay(handcuff_overlay) - - if(held_index) - if(!C.has_hand_for_held_index(held_index)) - add_overlay(blocked_overlay) - - if(held_index == hud.mymob.active_hand_index) - add_overlay("hand_active") - - -/obj/screen/inventory/hand/Click(location, control, params) - // At this point in client Click() code we have passed the 1/10 sec check and little else - // We don't even know if it's a middle click - if(world.time <= usr.next_move) - return 1 - if(usr.incapacitated() || isobserver(usr)) - return 1 - if (istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech - return 1 - - if(hud.mymob.active_hand_index == held_index) - var/obj/item/I = hud.mymob.get_active_held_item() - if(I) - I.Click(location, control, params) - else - hud.mymob.swap_hand(held_index) - return 1 - -/obj/screen/close - name = "close" - -/obj/screen/close/Click() - if(istype(master, /obj/item/storage)) - var/obj/item/storage/S = master - S.close(usr) - return 1 - - -/obj/screen/drop - name = "drop" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "act_drop" - layer = HUD_LAYER - plane = HUD_PLANE - -/obj/screen/drop/Click() - usr.drop_item_v() - -/obj/screen/act_intent - name = "intent" - icon_state = "help" - screen_loc = ui_acti - -/obj/screen/act_intent/Click(location, control, params) - usr.a_intent_change(INTENT_HOTKEY_RIGHT) - -/obj/screen/act_intent/segmented/Click(location, control, params) - if(usr.client.prefs.toggles & INTENT_STYLE) - var/_x = text2num(params2list(params)["icon-x"]) - var/_y = text2num(params2list(params)["icon-y"]) - - if(_x<=16 && _y<=16) - usr.a_intent_change(INTENT_HARM) - - else if(_x<=16 && _y>=17) - usr.a_intent_change(INTENT_HELP) - - else if(_x>=17 && _y<=16) - usr.a_intent_change(INTENT_GRAB) - - else if(_x>=17 && _y>=17) - usr.a_intent_change(INTENT_DISARM) - else - return ..() - -/obj/screen/act_intent/alien - icon = 'icons/mob/screen_alien.dmi' - screen_loc = ui_movi - -/obj/screen/act_intent/robot - icon = 'icons/mob/screen_cyborg.dmi' - screen_loc = ui_borg_intents - -/obj/screen/internals - name = "toggle internals" - icon_state = "internal0" - screen_loc = ui_internal - -/obj/screen/internals/Click() - if(!iscarbon(usr)) - return - var/mob/living/carbon/C = usr - if(C.incapacitated()) - return - - if(C.internal) - C.internal = null - to_chat(C, "You are no longer running on internals.") - icon_state = "internal0" - else - if(!C.getorganslot("breathing_tube")) - if(!istype(C.wear_mask, /obj/item/clothing/mask)) - to_chat(C, "You are not wearing an internals mask!") - return 1 - else - var/obj/item/clothing/mask/M = C.wear_mask - if(M.mask_adjusted) // if mask on face but pushed down - M.adjustmask(C) // adjust it back + screen_loc = "CENTER-7,CENTER-7" + maptext_height = 480 + maptext_width = 480 + +/obj/screen/swap_hand + layer = HUD_LAYER + plane = HUD_PLANE + name = "swap hand" + +/obj/screen/swap_hand/Click() + // At this point in client Click() code we have passed the 1/10 sec check and little else + // We don't even know if it's a middle click + if(world.time <= usr.next_move) + return 1 + + if(usr.incapacitated()) + return 1 + + if(ismob(usr)) + var/mob/M = usr + M.swap_hand() + return 1 + +/obj/screen/craft + name = "crafting menu" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "craft" + screen_loc = ui_crafting + +/obj/screen/craft/Click() + var/mob/living/M = usr + if(isobserver(usr)) + return + M.OpenCraftingMenu() + +/obj/screen/area_creator + name = "create new area" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "area_edit" + screen_loc = ui_building + +/obj/screen/area_creator/Click() + if(usr.incapacitated()) + return 1 + var/area/A = get_area(usr) + if(!A.outdoors) + to_chat(usr, "There is already a defined structure here.") + return 1 + create_area(usr) + +/obj/screen/language_menu + name = "language menu" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "talk_wheel" + screen_loc = ui_language_menu + +/obj/screen/language_menu/Click() + var/mob/M = usr + var/datum/language_holder/H = M.get_language_holder() + H.open_language_menu(usr) + +/obj/screen/inventory + var/slot_id // The indentifier for the slot. It has nothing to do with ID cards. + var/icon_empty // Icon when empty. For now used only by humans. + var/icon_full // Icon when contains an item. For now used only by humans. + layer = HUD_LAYER + plane = HUD_PLANE + +/obj/screen/inventory/Click(location, control, params) + // At this point in client Click() code we have passed the 1/10 sec check and little else + // We don't even know if it's a middle click + if(world.time <= usr.next_move) + return 1 + + if(usr.incapacitated()) + return 1 + if(ismecha(usr.loc)) // stops inventory actions in a mech + return 1 + + if(hud && hud.mymob && slot_id) + var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id) + if(inv_item) + return inv_item.Click(location, control, params) + + if(usr.attack_ui(slot_id)) + usr.update_inv_hands() + return 1 + +/obj/screen/inventory/update_icon() + if(!icon_empty) + icon_empty = icon_state + + if(hud && hud.mymob && slot_id && icon_full) + if(hud.mymob.get_item_by_slot(slot_id)) + icon_state = icon_full + else + icon_state = icon_empty + +/obj/screen/inventory/hand + var/mutable_appearance/handcuff_overlay + var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "blocked") + var/held_index = 0 + +/obj/screen/inventory/hand/update_icon() + ..() + + if(!handcuff_overlay) + var/state = (!(held_index % 2)) ? "markus" : "gabrielle" + handcuff_overlay = mutable_appearance('icons/mob/screen_gen.dmi', state) + + cut_overlays() + + if(hud && hud.mymob) + if(iscarbon(hud.mymob)) + var/mob/living/carbon/C = hud.mymob + if(C.handcuffed) + add_overlay(handcuff_overlay) + + if(held_index) + if(!C.has_hand_for_held_index(held_index)) + add_overlay(blocked_overlay) + + if(held_index == hud.mymob.active_hand_index) + add_overlay("hand_active") + + +/obj/screen/inventory/hand/Click(location, control, params) + // At this point in client Click() code we have passed the 1/10 sec check and little else + // We don't even know if it's a middle click + if(world.time <= usr.next_move) + return 1 + if(usr.incapacitated() || isobserver(usr)) + return 1 + if (ismecha(usr.loc)) // stops inventory actions in a mech + return 1 + + if(hud.mymob.active_hand_index == held_index) + var/obj/item/I = hud.mymob.get_active_held_item() + if(I) + I.Click(location, control, params) + else + hud.mymob.swap_hand(held_index) + return 1 + +/obj/screen/close + name = "close" + +/obj/screen/close/Click() + if(istype(master, /obj/item/storage)) + var/obj/item/storage/S = master + S.close(usr) + return 1 + + +/obj/screen/drop + name = "drop" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "act_drop" + layer = HUD_LAYER + plane = HUD_PLANE + +/obj/screen/drop/Click() + usr.drop_item_v() + +/obj/screen/act_intent + name = "intent" + icon_state = "help" + screen_loc = ui_acti + +/obj/screen/act_intent/Click(location, control, params) + usr.a_intent_change(INTENT_HOTKEY_RIGHT) + +/obj/screen/act_intent/segmented/Click(location, control, params) + if(usr.client.prefs.toggles & INTENT_STYLE) + var/_x = text2num(params2list(params)["icon-x"]) + var/_y = text2num(params2list(params)["icon-y"]) + + if(_x<=16 && _y<=16) + usr.a_intent_change(INTENT_HARM) + + else if(_x<=16 && _y>=17) + usr.a_intent_change(INTENT_HELP) + + else if(_x>=17 && _y<=16) + usr.a_intent_change(INTENT_GRAB) + + else if(_x>=17 && _y>=17) + usr.a_intent_change(INTENT_DISARM) + else + return ..() + +/obj/screen/act_intent/alien + icon = 'icons/mob/screen_alien.dmi' + screen_loc = ui_movi + +/obj/screen/act_intent/robot + icon = 'icons/mob/screen_cyborg.dmi' + screen_loc = ui_borg_intents + +/obj/screen/internals + name = "toggle internals" + icon_state = "internal0" + screen_loc = ui_internal + +/obj/screen/internals/Click() + if(!iscarbon(usr)) + return + var/mob/living/carbon/C = usr + if(C.incapacitated()) + return + + if(C.internal) + C.internal = null + to_chat(C, "You are no longer running on internals.") + icon_state = "internal0" + else + if(!C.getorganslot("breathing_tube")) + if(!istype(C.wear_mask, /obj/item/clothing/mask)) + to_chat(C, "You are not wearing an internals mask!") + return 1 + else + var/obj/item/clothing/mask/M = C.wear_mask + if(M.mask_adjusted) // if mask on face but pushed down + M.adjustmask(C) // adjust it back if( !(M.flags_1 & MASKINTERNALS_1) ) - to_chat(C, "You are not wearing an internals mask!") - return - - var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank) - if(I) - to_chat(C, "You are now running on internals from the [I] on your [C.get_held_index_name(C.get_held_index_of_item(I))].") - C.internal = I - else if(ishuman(C)) - var/mob/living/carbon/human/H = C - if(istype(H.s_store, /obj/item/tank)) - to_chat(H, "You are now running on internals from the [H.s_store] on your [H.wear_suit].") - H.internal = H.s_store - else if(istype(H.belt, /obj/item/tank)) - to_chat(H, "You are now running on internals from the [H.belt] on your belt.") - H.internal = H.belt - else if(istype(H.l_store, /obj/item/tank)) - to_chat(H, "You are now running on internals from the [H.l_store] in your left pocket.") - H.internal = H.l_store - else if(istype(H.r_store, /obj/item/tank)) - to_chat(H, "You are now running on internals from the [H.r_store] in your right pocket.") - H.internal = H.r_store - + to_chat(C, "You are not wearing an internals mask!") + return + + var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank) + if(I) + to_chat(C, "You are now running on internals from the [I] on your [C.get_held_index_name(C.get_held_index_of_item(I))].") + C.internal = I + else if(ishuman(C)) + var/mob/living/carbon/human/H = C + if(istype(H.s_store, /obj/item/tank)) + to_chat(H, "You are now running on internals from the [H.s_store] on your [H.wear_suit].") + H.internal = H.s_store + else if(istype(H.belt, /obj/item/tank)) + to_chat(H, "You are now running on internals from the [H.belt] on your belt.") + H.internal = H.belt + else if(istype(H.l_store, /obj/item/tank)) + to_chat(H, "You are now running on internals from the [H.l_store] in your left pocket.") + H.internal = H.l_store + else if(istype(H.r_store, /obj/item/tank)) + to_chat(H, "You are now running on internals from the [H.r_store] in your right pocket.") + H.internal = H.r_store + //Separate so CO2 jetpacks are a little less cumbersome. - if(!C.internal && istype(C.back, /obj/item/tank)) - to_chat(C, "You are now running on internals from the [C.back] on your back.") - C.internal = C.back - - if(C.internal) - icon_state = "internal1" - else - to_chat(C, "You don't have an oxygen tank!") - return - C.update_action_buttons_icon() - -/obj/screen/mov_intent - name = "run/walk toggle" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "running" - -/obj/screen/mov_intent/Click() - toggle(usr) - -/obj/screen/mov_intent/proc/toggle(mob/user) - if(isobserver(user)) - return - switch(user.m_intent) - if("run") - user.m_intent = MOVE_INTENT_WALK - icon_state = "walking" - if("walk") - user.m_intent = MOVE_INTENT_RUN - icon_state = "running" - user.update_icons() - -/obj/screen/pull - name = "stop pulling" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "pull" - -/obj/screen/pull/Click() - if(isobserver(usr)) - return - usr.stop_pulling() - -/obj/screen/pull/update_icon(mob/mymob) - if(!mymob) return - if(mymob.pulling) - icon_state = "pull" - else - icon_state = "pull0" - -/obj/screen/resist - name = "resist" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "act_resist" - layer = HUD_LAYER - plane = HUD_PLANE - -/obj/screen/resist/Click() - if(isliving(usr)) - var/mob/living/L = usr - L.resist() - -/obj/screen/storage - name = "storage" - -/obj/screen/storage/Click(location, control, params) - if(world.time <= usr.next_move) - 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 - return 1 - if(master) - var/obj/item/I = usr.get_active_held_item() - if(I) - master.attackby(I, usr, params) - return 1 - -/obj/screen/throw_catch - name = "throw/catch" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "act_throw_off" - -/obj/screen/throw_catch/Click() - if(iscarbon(usr)) - var/mob/living/carbon/C = usr - C.toggle_throw_mode() - -/obj/screen/zone_sel - name = "damage zone" - icon_state = "zone_sel" - screen_loc = ui_zonesel - var/selecting = "chest" - -/obj/screen/zone_sel/Click(location, control,params) - if(isobserver(usr)) - return - - var/list/PL = params2list(params) - var/icon_x = text2num(PL["icon-x"]) - var/icon_y = text2num(PL["icon-y"]) - var/choice - - switch(icon_y) - if(1 to 9) //Legs - switch(icon_x) - if(10 to 15) - choice = "r_leg" - if(17 to 22) - choice = "l_leg" - else - return 1 - if(10 to 13) //Hands and groin - switch(icon_x) - if(8 to 11) - choice = "r_arm" - if(12 to 20) - choice = "groin" - if(21 to 24) - choice = "l_arm" - else - return 1 - if(14 to 22) //Chest and arms to shoulders - switch(icon_x) - if(8 to 11) - choice = "r_arm" - if(12 to 20) - choice = "chest" - if(21 to 24) - choice = "l_arm" - else - return 1 - if(23 to 30) //Head, but we need to check for eye or mouth - if(icon_x in 12 to 20) - choice = "head" - switch(icon_y) - if(23 to 24) - if(icon_x in 15 to 17) - choice = "mouth" - if(26) //Eyeline, eyes are on 15 and 17 - if(icon_x in 14 to 18) - choice = "eyes" - if(25 to 27) - if(icon_x in 15 to 17) - choice = "eyes" - - return set_selected_zone(choice, usr) - -/obj/screen/zone_sel/proc/set_selected_zone(choice, mob/user) - if(isobserver(user)) - return - - if(choice != selecting) - selecting = choice - update_icon(usr) - return 1 - -/obj/screen/zone_sel/update_icon(mob/user) - cut_overlays() - add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[selecting]")) - user.zone_selected = selecting - -/obj/screen/zone_sel/alien - icon = 'icons/mob/screen_alien.dmi' - -/obj/screen/zone_sel/alien/update_icon(mob/user) - cut_overlays() - add_overlay(mutable_appearance('icons/mob/screen_alien.dmi', "[selecting]")) - user.zone_selected = selecting - -/obj/screen/zone_sel/robot - icon = 'icons/mob/screen_cyborg.dmi' - - -/obj/screen/flash - name = "flash" - icon_state = "blank" - blend_mode = BLEND_ADD - screen_loc = "WEST,SOUTH to EAST,NORTH" - layer = FLASH_LAYER - plane = FULLSCREEN_PLANE - -/obj/screen/damageoverlay - icon = 'icons/mob/screen_full.dmi' - icon_state = "oxydamageoverlay0" - name = "dmg" - blend_mode = BLEND_MULTIPLY - screen_loc = "CENTER-7,CENTER-7" + if(!C.internal && istype(C.back, /obj/item/tank)) + to_chat(C, "You are now running on internals from the [C.back] on your back.") + C.internal = C.back + + if(C.internal) + icon_state = "internal1" + else + to_chat(C, "You don't have an oxygen tank!") + return + C.update_action_buttons_icon() + +/obj/screen/mov_intent + name = "run/walk toggle" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "running" + +/obj/screen/mov_intent/Click() + toggle(usr) + +/obj/screen/mov_intent/proc/toggle(mob/user) + if(isobserver(user)) + return + switch(user.m_intent) + if("run") + user.m_intent = MOVE_INTENT_WALK + icon_state = "walking" + if("walk") + user.m_intent = MOVE_INTENT_RUN + icon_state = "running" + user.update_icons() + +/obj/screen/pull + name = "stop pulling" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "pull" + +/obj/screen/pull/Click() + if(isobserver(usr)) + return + usr.stop_pulling() + +/obj/screen/pull/update_icon(mob/mymob) + if(!mymob) return + if(mymob.pulling) + icon_state = "pull" + else + icon_state = "pull0" + +/obj/screen/resist + name = "resist" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "act_resist" + layer = HUD_LAYER + plane = HUD_PLANE + +/obj/screen/resist/Click() + if(isliving(usr)) + var/mob/living/L = usr + L.resist() + +/obj/screen/storage + name = "storage" + +/obj/screen/storage/Click(location, control, params) + if(world.time <= usr.next_move) + return 1 + if(usr.stat || usr.IsUnconscious() || usr.IsKnockdown() || usr.IsStun()) + return 1 + if (ismecha(usr.loc)) // stops inventory actions in a mech + return 1 + if(master) + var/obj/item/I = usr.get_active_held_item() + if(I) + master.attackby(I, usr, params) + return 1 + +/obj/screen/throw_catch + name = "throw/catch" + icon = 'icons/mob/screen_midnight.dmi' + icon_state = "act_throw_off" + +/obj/screen/throw_catch/Click() + if(iscarbon(usr)) + var/mob/living/carbon/C = usr + C.toggle_throw_mode() + +/obj/screen/zone_sel + name = "damage zone" + icon_state = "zone_sel" + screen_loc = ui_zonesel + var/selecting = "chest" + +/obj/screen/zone_sel/Click(location, control,params) + if(isobserver(usr)) + return + + var/list/PL = params2list(params) + var/icon_x = text2num(PL["icon-x"]) + var/icon_y = text2num(PL["icon-y"]) + var/choice + + switch(icon_y) + if(1 to 9) //Legs + switch(icon_x) + if(10 to 15) + choice = "r_leg" + if(17 to 22) + choice = "l_leg" + else + return 1 + if(10 to 13) //Hands and groin + switch(icon_x) + if(8 to 11) + choice = "r_arm" + if(12 to 20) + choice = "groin" + if(21 to 24) + choice = "l_arm" + else + return 1 + if(14 to 22) //Chest and arms to shoulders + switch(icon_x) + if(8 to 11) + choice = "r_arm" + if(12 to 20) + choice = "chest" + if(21 to 24) + choice = "l_arm" + else + return 1 + if(23 to 30) //Head, but we need to check for eye or mouth + if(icon_x in 12 to 20) + choice = "head" + switch(icon_y) + if(23 to 24) + if(icon_x in 15 to 17) + choice = "mouth" + if(26) //Eyeline, eyes are on 15 and 17 + if(icon_x in 14 to 18) + choice = "eyes" + if(25 to 27) + if(icon_x in 15 to 17) + choice = "eyes" + + return set_selected_zone(choice, usr) + +/obj/screen/zone_sel/proc/set_selected_zone(choice, mob/user) + if(isobserver(user)) + return + + if(choice != selecting) + selecting = choice + update_icon(usr) + return 1 + +/obj/screen/zone_sel/update_icon(mob/user) + cut_overlays() + add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[selecting]")) + user.zone_selected = selecting + +/obj/screen/zone_sel/alien + icon = 'icons/mob/screen_alien.dmi' + +/obj/screen/zone_sel/alien/update_icon(mob/user) + cut_overlays() + add_overlay(mutable_appearance('icons/mob/screen_alien.dmi', "[selecting]")) + user.zone_selected = selecting + +/obj/screen/zone_sel/robot + icon = 'icons/mob/screen_cyborg.dmi' + + +/obj/screen/flash + name = "flash" + icon_state = "blank" + blend_mode = BLEND_ADD + screen_loc = "WEST,SOUTH to EAST,NORTH" + layer = FLASH_LAYER + plane = FULLSCREEN_PLANE + +/obj/screen/damageoverlay + icon = 'icons/mob/screen_full.dmi' + icon_state = "oxydamageoverlay0" + name = "dmg" + blend_mode = BLEND_MULTIPLY + screen_loc = "CENTER-7,CENTER-7" mouse_opacity = MOUSE_OPACITY_TRANSPARENT - layer = UI_DAMAGE_LAYER - plane = FULLSCREEN_PLANE - -/obj/screen/healths - name = "health" - icon_state = "health0" - screen_loc = ui_health - -/obj/screen/healths/alien - icon = 'icons/mob/screen_alien.dmi' - screen_loc = ui_alien_health - -/obj/screen/healths/robot - icon = 'icons/mob/screen_cyborg.dmi' - screen_loc = ui_borg_health - -/obj/screen/healths/deity - name = "Nexus Health" - icon_state = "deity_nexus" - screen_loc = ui_deityhealth - -/obj/screen/healths/blob - name = "blob health" - icon_state = "block" - screen_loc = ui_internal + layer = UI_DAMAGE_LAYER + plane = FULLSCREEN_PLANE + +/obj/screen/healths + name = "health" + icon_state = "health0" + screen_loc = ui_health + +/obj/screen/healths/alien + icon = 'icons/mob/screen_alien.dmi' + screen_loc = ui_alien_health + +/obj/screen/healths/robot + icon = 'icons/mob/screen_cyborg.dmi' + screen_loc = ui_borg_health + +/obj/screen/healths/deity + name = "Nexus Health" + icon_state = "deity_nexus" + screen_loc = ui_deityhealth + +/obj/screen/healths/blob + name = "blob health" + icon_state = "block" + screen_loc = ui_internal mouse_opacity = MOUSE_OPACITY_TRANSPARENT - -/obj/screen/healths/blob/naut - name = "health" - icon = 'icons/mob/blob.dmi' - icon_state = "nauthealth" - -/obj/screen/healths/blob/naut/core - name = "overmind health" - screen_loc = ui_health - icon_state = "corehealth" - -/obj/screen/healths/guardian - name = "summoner health" - icon = 'icons/mob/guardian.dmi' - icon_state = "base" - screen_loc = ui_health + +/obj/screen/healths/blob/naut + name = "health" + icon = 'icons/mob/blob.dmi' + icon_state = "nauthealth" + +/obj/screen/healths/blob/naut/core + name = "overmind health" + screen_loc = ui_health + icon_state = "corehealth" + +/obj/screen/healths/guardian + name = "summoner health" + icon = 'icons/mob/guardian.dmi' + icon_state = "base" + screen_loc = ui_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT - -/obj/screen/healths/clock - icon = 'icons/mob/actions.dmi' - icon_state = "bg_clock" - screen_loc = ui_health + +/obj/screen/healths/clock + icon = 'icons/mob/actions.dmi' + icon_state = "bg_clock" + screen_loc = ui_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT - -/obj/screen/healths/clock/gear - icon = 'icons/mob/clockwork_mobs.dmi' - icon_state = "bg_gear" - screen_loc = ui_internal - -/obj/screen/healths/revenant - name = "essence" - icon = 'icons/mob/actions.dmi' - icon_state = "bg_revenant" - screen_loc = ui_health + +/obj/screen/healths/clock/gear + icon = 'icons/mob/clockwork_mobs.dmi' + icon_state = "bg_gear" + screen_loc = ui_internal + +/obj/screen/healths/revenant + name = "essence" + icon = 'icons/mob/actions.dmi' + icon_state = "bg_revenant" + screen_loc = ui_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT - -/obj/screen/healths/construct - icon = 'icons/mob/screen_construct.dmi' - icon_state = "artificer_health0" - screen_loc = ui_construct_health + +/obj/screen/healths/construct + icon = 'icons/mob/screen_construct.dmi' + icon_state = "artificer_health0" + screen_loc = ui_construct_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT - -/obj/screen/healthdoll - name = "health doll" - screen_loc = ui_healthdoll - -/obj/screen/splash - icon = 'config/title_screens/images/title1.dmi' - icon_state = "" - screen_loc = "1,1" - layer = SPLASHSCREEN_LAYER - plane = SPLASHSCREEN_PLANE - var/client/holder - -/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE - holder = C - - if(!visible) - alpha = 0 - - if(!use_previous_title) - if(SStitle.icon) - icon = SStitle.icon - else - if(!SStitle.previous_icon) - qdel(src) - return - icon = SStitle.previous_icon - - holder.screen += src - - ..() - -/obj/screen/splash/proc/Fade(out, qdel_after = TRUE) - if(QDELETED(src)) - return - if(out) - animate(src, alpha = 0, time = 30) - else - alpha = 0 - animate(src, alpha = 255, time = 30) - if(qdel_after) - QDEL_IN(src, 30) - -/obj/screen/splash/Destroy() - if(holder) - holder.screen -= src - holder = null - return ..() + +/obj/screen/healthdoll + name = "health doll" + screen_loc = ui_healthdoll + +/obj/screen/splash + icon = 'config/title_screens/images/title1.dmi' + icon_state = "" + screen_loc = "1,1" + layer = SPLASHSCREEN_LAYER + plane = SPLASHSCREEN_PLANE + var/client/holder + +/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE + holder = C + + if(!visible) + alpha = 0 + + if(!use_previous_title) + if(SStitle.icon) + icon = SStitle.icon + else + if(!SStitle.previous_icon) + qdel(src) + return + icon = SStitle.previous_icon + + holder.screen += src + + ..() + +/obj/screen/splash/proc/Fade(out, qdel_after = TRUE) + if(QDELETED(src)) + return + if(out) + animate(src, alpha = 0, time = 30) + else + alpha = 0 + animate(src, alpha = 255, time = 30) + if(qdel_after) + QDEL_IN(src, 30) + +/obj/screen/splash/Destroy() + if(holder) + holder.screen -= src + holder = null + return ..() diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm index 92a98e14c6..b3a2546335 100644 --- a/code/_onclick/hud/swarmer.dm +++ b/code/_onclick/hud/swarmer.dm @@ -26,7 +26,7 @@ /obj/screen/swarmer/Replicate icon_state = "ui_replicate" name = "Replicate (Costs 50 Resources)" - desc = "Creates a another of our kind." + desc = "Creates another of our kind." /obj/screen/swarmer/Replicate/Click() if(isswarmer(usr)) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index f1ac1af1af..987818924f 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -9,19 +9,20 @@ // Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown. /obj/item/proc/attack_self(mob/user) - return + SendSignal(COMSIG_ITEM_ATTACK_SELF, user) + interact(user) /obj/item/proc/pre_attackby(atom/A, mob/living/user, params) //do stuff before attackby! return TRUE //return FALSE to avoid calling attackby after this proc does stuff // No comment /atom/proc/attackby(obj/item/W, mob/user, params) - return + return SendSignal(COMSIG_PARENT_ATTACKBY, W, user, params) /obj/attackby(obj/item/I, mob/living/user, params) - return I.attack_obj(src, user) + return ..() || I.attack_obj(src, user) -/mob/living/attackby(obj/item/I, mob/user, params) +/mob/living/attackby(obj/item/I, mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it? var/sharpness = I.is_sharp() @@ -35,6 +36,7 @@ /obj/item/proc/attack(mob/living/M, mob/living/user) + SendSignal(COMSIG_ITEM_ATTACK, M, user) if(flags_1 & NOBLUDGEON_1) return if(!force) @@ -54,6 +56,7 @@ //the equivalent of the standard version of attack() but for object targets. /obj/item/proc/attack_obj(obj/O, mob/living/user) + SendSignal(COMSIG_ITEM_ATTACK_OBJ, O, user) if(flags_1 & NOBLUDGEON_1) return user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 438b3b5142..55f3e83b61 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -1,104 +1,91 @@ -/mob/dead/observer/DblClickOn(var/atom/A, var/params) - if(client.click_intercept) - if(call(client.click_intercept,"InterceptClickOn")(src,params,A)) - return - - if(can_reenter_corpse && mind && mind.current) - if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it - reenter_corpse() // (cloning scanner, body bag, closet, mech, etc) - return // seems legit. - - // Things you might plausibly want to follow - if(ismovableatom(A)) - ManualFollow(A) - - // Otherwise jump - else if(A.loc) - loc = get_turf(A) - update_parallax_contents() - -/mob/dead/observer/ClickOn(var/atom/A, var/params) - if(client.click_intercept) - if(call(client.click_intercept,"InterceptClickOn")(src,params,A)) - return - - var/list/modifiers = params2list(params) - if(modifiers["shift"] && modifiers["middle"]) - ShiftMiddleClickOn(A) - return - if(modifiers["shift"] && modifiers["ctrl"]) - CtrlShiftClickOn(A) - return - if(modifiers["middle"]) - MiddleClickOn(A) - return - if(modifiers["shift"]) - ShiftClickOn(A) - return - if(modifiers["alt"]) - AltClickOn(A) - return - if(modifiers["ctrl"]) - CtrlClickOn(A) - return - - if(world.time <= next_move) - return - // You are responsible for checking config.ghost_interaction when you override this function - // Not all of them require checking, see below - A.attack_ghost(src) - -// Oh by the way this didn't work with old click code which is why clicking shit didn't spam you -/atom/proc/attack_ghost(mob/dead/observer/user) - if(user.client) - if(IsAdminGhost(user)) - attack_ai(user) - if(user.client.prefs.inquisitive_ghost) - user.examinate(src) - -// --------------------------------------- -// And here are some good things for free: -// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu - -/obj/machinery/teleport/hub/attack_ghost(mob/user) - var/atom/l = loc - var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z)) - if(com && com.locked) - user.forceMove(get_turf(com.locked)) - -/obj/effect/portal/attack_ghost(mob/user) - if(linked) - user.forceMove(get_turf(linked)) - -/obj/machinery/gateway/centerstation/attack_ghost(mob/user) - if(awaygate) - user.forceMove(awaygate.loc) - else - to_chat(user, "[src] has no destination.") - -/obj/machinery/gateway/centeraway/attack_ghost(mob/user) - if(stationgate) - user.forceMove(stationgate.loc) - else - to_chat(user, "[src] has no destination.") - -/obj/item/storage/attack_ghost(mob/user) - orient2hud(user) - show_to(user) - -/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) - -*/ +/mob/dead/observer/DblClickOn(var/atom/A, var/params) + if(client.click_intercept) + if(call(client.click_intercept,"InterceptClickOn")(src,params,A)) + return + + if(can_reenter_corpse && mind && mind.current) + if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it + reenter_corpse() // (cloning scanner, body bag, closet, mech, etc) + return // seems legit. + + // Things you might plausibly want to follow + if(ismovableatom(A)) + ManualFollow(A) + + // Otherwise jump + else if(A.loc) + loc = get_turf(A) + update_parallax_contents() + +/mob/dead/observer/ClickOn(var/atom/A, var/params) + if(client.click_intercept) + if(call(client.click_intercept,"InterceptClickOn")(src,params,A)) + return + + var/list/modifiers = params2list(params) + if(modifiers["shift"] && modifiers["middle"]) + ShiftMiddleClickOn(A) + return + if(modifiers["shift"] && modifiers["ctrl"]) + CtrlShiftClickOn(A) + return + if(modifiers["middle"]) + MiddleClickOn(A) + return + if(modifiers["shift"]) + ShiftClickOn(A) + return + if(modifiers["alt"]) + AltClickOn(A) + return + if(modifiers["ctrl"]) + CtrlClickOn(A) + return + + if(world.time <= next_move) + return + // You are responsible for checking config.ghost_interaction when you override this function + // Not all of them require checking, see below + A.attack_ghost(src) + +// Oh by the way this didn't work with old click code which is why clicking shit didn't spam you +/atom/proc/attack_ghost(mob/dead/observer/user) + if(user.client) + if(IsAdminGhost(user)) + attack_ai(user) + if(user.client.prefs.inquisitive_ghost) + user.examinate(src) + +// --------------------------------------- +// And here are some good things for free: +// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu + +/obj/machinery/teleport/hub/attack_ghost(mob/user) + var/atom/l = loc + var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z)) + if(com && com.locked) + user.forceMove(get_turf(com.locked)) + +/obj/effect/portal/attack_ghost(mob/user) + if(linked) + user.forceMove(get_turf(linked)) + +/obj/machinery/gateway/centerstation/attack_ghost(mob/user) + if(awaygate) + user.forceMove(awaygate.loc) + else + to_chat(user, "[src] has no destination.") + +/obj/machinery/gateway/centeraway/attack_ghost(mob/user) + if(stationgate) + user.forceMove(stationgate.loc) + else + to_chat(user, "[src] has no destination.") + +/obj/item/storage/attack_ghost(mob/user) + orient2hud(user) + show_to(user) + +/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)) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index b0ab260d63..903f3c0790 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/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index ae78d1d172..73a98db4e3 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -26,4 +26,746 @@ build_type = PROTOLATHE materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000) build_path = /obj/item/gun/energy/laser/carbine/nopin - category = list("Weapons") \ No newline at end of file + category = list("Weapons") + +////////////Anti Tank Pistol//////////// + +/obj/item/gun/ballistic/automatic/pistol/antitank + name = "Anti Tank Pistol" + desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate your wrist." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "atp" + item_state = "pistol" + recoil = 6 + mag_type = /obj/item/ammo_box/magazine/sniper_rounds + fire_delay = 50 + burst_size = 1 + origin_tech = "combat=7" + can_suppress = 0 + w_class = WEIGHT_CLASS_NORMAL + actions_types = list() + fire_sound = 'sound/weapons/blastcannon.ogg' + spread = 30 //damn thing has no rifling. + +/obj/item/gun/ballistic/automatic/pistol/antitank/update_icon() + ..() + if(magazine) + cut_overlays() + add_overlay("atp-mag") + else + cut_overlays() + icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" + +/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate + name = "Syndicate Anti Tank Pistol" + desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing." + pin = /obj/item/device/firing_pin/implant/pindicate + origin_tech = "combat=7;syndicate=6" + +/////////////spinfusor stuff//////////////// + +/obj/item/projectile/bullet/spinfusor + name ="spinfusor disk" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state= "spinner" + damage = 30 + dismemberment = 25 + +/obj/item/projectile/bullet/spinfusor/on_hit(atom/target, blocked = FALSE) //explosion to emulate the spinfusor's AOE + ..() + explosion(target, -1, -1, 2, 0, -1) + return 1 + +/obj/item/ammo_casing/caseless/spinfusor + name = "spinfusor disk" + desc = "A magnetic disk designed specifically for the Stormhammer magnetic cannon. Warning: extremely volatile!" + projectile_type = /obj/item/projectile/bullet/spinfusor + caliber = "spinfusor" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "disk" + throwforce = 15 //still deadly when thrown + throw_speed = 3 + +/obj/item/ammo_casing/caseless/spinfusor/throw_impact(atom/target) //disks detonate when thrown + if(!..()) // not caught in mid-air + visible_message("[src] detonates!") + playsound(src.loc, "sparks", 50, 1) + explosion(target, -1, -1, 1, 1, -1) + qdel(src) + return 1 + +/obj/item/ammo_box/magazine/internal/spinfusor + name = "spinfusor internal magazine" + ammo_type = /obj/item/ammo_casing/caseless/spinfusor + caliber = "spinfusor" + max_ammo = 1 + +/obj/item/gun/ballistic/automatic/spinfusor + name = "Stormhammer Magnetic Cannon" + desc = "An innovative weapon utilizing mag-lev technology to spin up a magnetic fusor and launch it at extreme velocities." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "spinfusor" + item_state = "spinfusor" + mag_type = /obj/item/ammo_box/magazine/internal/spinfusor + fire_sound = 'sound/weapons/rocketlaunch.ogg' + w_class = WEIGHT_CLASS_BULKY + can_suppress = 0 + burst_size = 1 + fire_delay = 20 + select = 0 + actions_types = list() + casing_ejector = 0 + origin_tech = "combat=6;magnets=6" + +/obj/item/gun/ballistic/automatic/spinfusor/attackby(obj/item/A, mob/user, params) + var/num_loaded = magazine.attackby(A, user, params, 1) + if(num_loaded) + to_chat(user, "You load [num_loaded] disk\s into \the [src].") + update_icon() + chamber_round() + +/obj/item/gun/ballistic/automatic/spinfusor/attack_self(mob/living/user) + return //caseless rounds are too glitchy to unload properly. Best to make it so that you cannot remove disks from the spinfusor + +/obj/item/gun/ballistic/automatic/spinfusor/update_icon() + ..() + icon_state = "spinfusor[magazine ? "-[get_ammo(1)]" : ""]" + +/obj/item/ammo_box/aspinfusor + name = "ammo box (spinfusor disks)" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "spinfusorbox" + ammo_type = /obj/item/ammo_casing/caseless/spinfusor + max_ammo = 8 + +/datum/supply_pack/security/armory/spinfusor + name = "Stormhammer Spinfusor Crate" + cost = 7000 + contains = list(/obj/item/gun/ballistic/automatic/spinfusor, + /obj/item/gun/ballistic/automatic/spinfusor) + crate_name = "spinfusor crate" + +/datum/supply_pack/security/armory/spinfusorammo + name = "Spinfusor Disk Crate" + cost = 4000 + contains = list(/obj/item/ammo_box/aspinfusor, + /obj/item/ammo_box/aspinfusor, + /obj/item/ammo_box/aspinfusor, + /obj/item/ammo_box/aspinfusor) + crate_name = "spinfusor disk crate" + +///////XCOM X9 AR/////// + +/obj/item/gun/ballistic/automatic/x9 //will be adminspawn only so ERT or something can use them + name = "\improper X9 Assault Rifle" + desc = "A rather old design of a cheap, reliable assault rifle made for combat against unknown enemies. Uses 5.56mm ammo." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "x9" + item_state = "arg" + slot_flags = 0 + origin_tech = "combat=7;engineering=7" + mag_type = /obj/item/ammo_box/magazine/m556 //Uses the m90gl's magazine, just like the NT-ARG + fire_sound = 'sound/weapons/gunshot_smg.ogg' + can_suppress = 0 + burst_size = 6 //in line with XCOMEU stats. This can fire 5 bursts from a full magazine. + fire_delay = 1 + spread = 30 //should be 40 for XCOM memes, but since its adminspawn only, might as well make it useable + recoil = 1 + +///toy memes/// + +/obj/item/ammo_box/magazine/toy/x9 + name = "foam force X9 magazine" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "toy9magazine" + max_ammo = 30 + multiple_sprites = 2 + +/obj/item/gun/ballistic/automatic/x9/toy + name = "donksoft X9" + desc = "An old but reliable assault rifle made for combat against unknown enemies. Appears to be hastily converted. Ages 8 and up." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "toy9" + can_suppress = 0 + needs_permit = 0 + mag_type = /obj/item/ammo_box/magazine/toy/x9 + casing_ejector = 0 + spread = 45 //MAXIMUM XCOM MEMES (actually that'd be 90 spread) + + +////////XCOM2 Magpistol///////// + +//////projectiles////// + +/obj/item/projectile/bullet/mags + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magjectile" + damage = 25 + armour_penetration = 10 + light_range = 2 + light_color = LIGHT_COLOR_RED + +/obj/item/projectile/bullet/nlmags //non-lethal boolets + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magjectile-nl" + damage = 2 + knockdown = 15 + stamina = 50 + armour_penetration = -10 + light_range = 2 + light_color = LIGHT_COLOR_BLUE + + +/////actual ammo///// + +/obj/item/ammo_casing/caseless/amags + desc = "A ferromagnetic slug intended to be launched out of a compatible weapon." + caliber = "mags" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "mag-casing-live" + projectile_type = /obj/item/projectile/bullet/mags + +/obj/item/ammo_casing/caseless/anlmags + desc = "A specialized ferromagnetic slug designed with a less-than-lethal payload." + caliber = "mags" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "mag-casing-live" + projectile_type = /obj/item/projectile/bullet/nlmags + +//////magazines///// + +/obj/item/ammo_box/magazine/mmag/small + name = "magpistol magazine (non-lethal disabler)" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "nlmagmag" + origin_tech = "magnets=5" + ammo_type = /obj/item/ammo_casing/caseless/anlmags + caliber = "mags" + max_ammo = 7 + multiple_sprites = 2 + +/obj/item/ammo_box/magazine/mmag/small/lethal + name = "magpistol magazine (lethal)" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "smallmagmag" + origin_tech = "combat=5" + ammo_type = /obj/item/ammo_casing/caseless/amags + +//////the gun itself////// + +/obj/item/gun/ballistic/automatic/pistol/mag + name = "magpistol" + desc = "A handgun utilizing maglev technologies to propel a ferromagnetic slug to extreme velocities." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magpistol" + force = 10 + fire_sound = 'sound/weapons/magpistol.ogg' + mag_type = /obj/item/ammo_box/magazine/mmag/small + can_suppress = 0 + casing_ejector = 0 + fire_delay = 5 + origin_tech = "combat=4;magnets=4" + +/obj/item/gun/ballistic/automatic/pistol/mag/update_icon() + ..() + if(magazine) + cut_overlays() + add_overlay("magpistol-magazine") + else + cut_overlays() + icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" + +///research memes/// + +/obj/item/gun/ballistic/automatic/pistol/mag/nopin + pin = null + +/datum/design/magpistol + name = "Magpistol" + desc = "A weapon which fires ferromagnetic slugs." + id = "magpisol" + req_tech = list("combat" = 5, "magnets" = 6, "powerstorage" = 5) + build_type = PROTOLATHE + materials = list(MAT_METAL = 7500, MAT_GLASS = 1000, MAT_URANIUM = 1000, MAT_TITANIUM = 5000, MAT_SILVER = 2000) + build_path = /obj/item/gun/ballistic/automatic/pistol/mag/nopin + category = list("Weapons") + +/datum/design/mag_magpistol + name = "Magpistol Magazine" + desc = "A 7 round magazine for the Magpistol." + id = "mag_magpistol" + req_tech = list("combat" = 5, "magnets" = 6, "materials" = 5, "syndicate" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 4000, MAT_SILVER = 500) + build_path = /obj/item/ammo_box/magazine/mmag/small/lethal + category = list("Ammo") + +/datum/design/mag_magpistol/nl + name = "Magpistol Magazine (Non-Lethal)" + desc = "A 7 round non-lethal magazine for the Magpistol." + id = "mag_magpistol_nl" + req_tech = list("combat" = 5, "magnets" = 6, "materials" = 5) + materials = list(MAT_METAL = 3000, MAT_SILVER = 250, MAT_TITANIUM = 250) + build_path = /obj/item/ammo_box/magazine/mmag/small + +//////toy memes///// + +/obj/item/projectile/bullet/reusable/foam_dart/mag + name = "magfoam dart" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magjectile-toy" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag + light_range = 2 + light_color = LIGHT_COLOR_YELLOW + +/obj/item/ammo_casing/caseless/foam_dart/mag + name = "magfoam dart" + desc = "A foam dart with fun light-up projectiles powered by magnets!" + projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/mag + +/obj/item/ammo_box/magazine/internal/shot/toy/mag + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag + max_ammo = 7 + +/obj/item/gun/ballistic/shotgun/toy/mag + name = "foam force magpistol" + desc = "A fancy toy sold alongside light-up foam force darts. Ages 8 and up." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "toymag" + item_state = "gun" + mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/mag + fire_sound = 'sound/weapons/magpistol.ogg' + slot_flags = SLOT_BELT + w_class = WEIGHT_CLASS_SMALL + +/obj/item/ammo_box/foambox/mag + name = "ammo box (Magnetic Foam Darts)" + icon = 'icons/obj/guns/toy.dmi' + icon_state = "foambox" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag + max_ammo = 42 + +/datum/design/magfoam_dart + name = "Box of MagFoam Darts" + id = "magfoam_dart" + build_type = AUTOLATHE + materials = list(MAT_METAL = 300, MAT_GLASS = 200) + build_path = /obj/item/ammo_box/foambox/mag + category = list("initial", "Misc") + +/datum/design/foam_magpistol + name = "Foam Force Magpistol" + id = "magfoam_launcher" + build_type = AUTOLATHE + materials = list(MAT_METAL = 7500, MAT_GLASS = 1000) + build_path = /obj/item/gun/ballistic/shotgun/toy/mag + category = list("hacked", "Misc") + +//////Magrifle////// + +///projectiles/// + +/obj/item/projectile/bullet/magrifle + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magjectile-large" + damage = 30 + armour_penetration = 25 + light_range = 3 + light_color = LIGHT_COLOR_RED + +/obj/item/projectile/bullet/nlmagrifle //non-lethal boolets + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magjectile-large-nl" + damage = 5 + knockdown = 30 + stamina = 75 + armour_penetration = 0 + light_range = 3 + light_color = LIGHT_COLOR_BLUE + +///ammo casings/// + +/obj/item/ammo_casing/caseless/amagm + desc = "A large ferromagnetic slug intended to be launched out of a compatible weapon." + caliber = "magm" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "mag-casing-live" + projectile_type = /obj/item/projectile/bullet/magrifle + +/obj/item/ammo_casing/caseless/anlmagm + desc = "A large, specialized ferromagnetic slug designed with a less-than-lethal payload." + caliber = "magm" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "mag-casing-live" + projectile_type = /obj/item/projectile/bullet/nlmagrifle + +///magazines/// + +/obj/item/ammo_box/magazine/mmag/ + name = "magrifle magazine (non-lethal disabler)" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "mediummagmag" + origin_tech = "magnets=6" + ammo_type = /obj/item/ammo_casing/caseless/anlmagm + caliber = "magm" + max_ammo = 15 + multiple_sprites = 2 + +/obj/item/ammo_box/magazine/mmag/lethal + name = "magrifle magazine (lethal)" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "mediummagmag" + origin_tech = "combat=6" + ammo_type = /obj/item/ammo_casing/caseless/amagm + +///the gun itself/// + +/obj/item/gun/ballistic/automatic/magrifle + name = "\improper Magnetic Rifle" + desc = "A simple upscalling of the technologies used in the magpistol, the magrifle is capable of firing slightly larger slugs in bursts. Compatible with the magpistol's slugs." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magrifle" + item_state = "arg" + slot_flags = 0 + origin_tech = "combat=6;engineering=6;magnets=6" + mag_type = /obj/item/ammo_box/magazine/mmag + fire_sound = 'sound/weapons/magrifle.ogg' + can_suppress = 0 + burst_size = 3 + fire_delay = 2 + spread = 15 + recoil = 1 + casing_ejector = 0 + +///research/// + +/obj/item/gun/ballistic/automatic/magrifle/nopin + pin = null + +/datum/design/magrifle + name = "Magrifle" + desc = "An upscaled Magpistol in rifle form." + id = "magrifle" + req_tech = list("combat" = 7, "magnets" = 7, "powerstorage" = 7) + build_type = PROTOLATHE + materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 10000, MAT_SILVER = 4000, MAT_GOLD = 2000) + build_path = /obj/item/gun/ballistic/automatic/magrifle/nopin + category = list("Weapons") + +/datum/design/mag_magrifle + name = "Magrifle Magazine (Lethal)" + desc = "A 15 round magazine for the Magrifle." + id = "mag_magrifle" + req_tech = list("combat" = 7, "magnets" = 7, "materials" = 5, "syndicate" = 4) + build_type = PROTOLATHE + materials = list(MAT_METAL = 8000, MAT_SILVER = 1000) + build_path = /obj/item/ammo_box/magazine/mmag/lethal + category = list("Ammo") + +/datum/design/mag_magrifle/nl + name = "Magrifle Magazine (Non-Lethal)" + desc = "A 15 round non-lethal magazine for the Magrifle." + id = "mag_magrifle_nl" + req_tech = list("combat" = 7, "magnets" = 7, "materials" = 5) + materials = list(MAT_METAL = 6000, MAT_SILVER = 500, MAT_TITANIUM = 500) + build_path = /obj/item/ammo_box/magazine/mmag + +//////Hyper-Burst Rifle////// + +///projectiles/// + +/obj/item/projectile/bullet/mags/hyper + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "magjectile" + damage = 10 + armour_penetration = 10 + stamina = 10 + forcedodge = TRUE + range = 6 + light_range = 1 + light_color = LIGHT_COLOR_RED + +/obj/item/projectile/bullet/mags/hyper/inferno + icon_state = "magjectile-large" + stamina = 0 + forcedodge = FALSE + range = 25 + light_range = 4 + +/obj/item/projectile/bullet/mags/hyper/inferno/on_hit(atom/target, blocked = FALSE) + ..() + explosion(target, -1, 1, 2, 4, 5) + return 1 + +///ammo casings/// + +/obj/item/ammo_casing/caseless/ahyper + desc = "A large block of speciallized ferromagnetic material designed to be fired out of the experimental Hyper-Burst Rifle." + caliber = "hypermag" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "hyper-casing-live" + projectile_type = /obj/item/projectile/bullet/mags/hyper + pellets = 12 + variance = 40 + +/obj/item/ammo_casing/caseless/ahyper/inferno + projectile_type = /obj/item/projectile/bullet/mags/hyper/inferno + pellets = 1 + variance = 0 + +///magazines/// + +/obj/item/ammo_box/magazine/mhyper + name = "hyper-burst rifle magazine" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "hypermag-4" + ammo_type = /obj/item/ammo_casing/caseless/ahyper + caliber = "hypermag" + desc = "A magazine for the Hyper-Burst Rifle. Loaded with a special slug that fragments into 12 smaller shards which can absolutely puncture anything, but has rather short effective range." + max_ammo = 4 + +/obj/item/ammo_box/magazine/mhyper/update_icon() + ..() + icon_state = "hypermag-[ammo_count() ? "4" : "0"]" + +/obj/item/ammo_box/magazine/mhyper/inferno + name = "hyper-burst rifle magazine (inferno)" + ammo_type = /obj/item/ammo_casing/caseless/ahyper/inferno + desc = "A magazine for the Hyper-Burst Rifle. Loaded with a special slug that violently reacts with whatever surface it strikes, generating a massive amount of heat and light." + +///gun itself/// + +/obj/item/gun/ballistic/automatic/hyperburst + name = "\improper Hyper-Burst Rifle" + desc = "An extremely beefed up version of a stolen Nanotrasen weapon prototype, this 'rifle' is more like a cannon, with an extremely large bore barrel capable of generating several smaller magnetic 'barrels' to simultaneously launch multiple projectiles at once." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "hyperburst" + item_state = "arg" + slot_flags = 0 + origin_tech = "combat=6;engineering=6;magnets=6;syndicate=6" + mag_type = /obj/item/ammo_box/magazine/mhyper + fire_sound = 'sound/weapons/magburst.ogg' + can_suppress = 0 + burst_size = 1 + fire_delay = 40 + recoil = 2 + casing_ejector = 0 + weapon_weight = WEAPON_HEAVY + +/obj/item/gun/ballistic/automatic/hyperburst/update_icon() + ..() + icon_state = "hyperburst[magazine ? "-[get_ammo()]" : ""][chambered ? "" : "-e"]" + +/* made redundant by reskinnable stetchkins +//////Stealth Pistol////// + +/obj/item/gun/ballistic/automatic/pistol/stealth + name = "stealth pistol" + desc = "A unique bullpup pistol with a compact frame. Has an integrated surpressor." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "stealthpistol" + w_class = WEIGHT_CLASS_SMALL + origin_tech = "combat=3;materials=3;syndicate=4" + mag_type = /obj/item/ammo_box/magazine/m10mm + can_suppress = 0 + fire_sound = 'sound/weapons/gunshot_silenced.ogg' + suppressed = 1 + burst_size = 1 + +/obj/item/gun/ballistic/automatic/pistol/stealth/update_icon() + ..() + if(magazine) + cut_overlays() + add_overlay("stealthpistol-magazine") + else + cut_overlays() + icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" + +*/ + +//////10mm soporific bullets////// + +obj/item/projectile/bullet/c10mm/soporific + name ="10mm soporific bullet" + armour_penetration = 0 + nodamage = TRUE + dismemberment = 0 + knockdown = 0 + +/obj/item/projectile/bullet/c10mm/soporific/on_hit(atom/target, blocked = FALSE) + if((blocked != 100) && isliving(target)) + var/mob/living/L = target + L.blur_eyes(6) + if(L.staminaloss >= 60) + L.Sleeping(250) + else + L.adjustStaminaLoss(25) + return 1 + +/obj/item/ammo_casing/c10mm/soporific + name = ".10mm soporific bullet casing" + desc = "A 10mm soporific bullet casing." + projectile_type = /obj/item/projectile/bullet/c10mm/soporific + +/obj/item/ammo_box/magazine/m10mm/soporific + name = "pistol magazine (10mm soporific)" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "9x19pS" + desc = "A gun magazine. Loaded with rounds which inject the target with a variety of illegal substances to induce sleep in the target." + ammo_type = /obj/item/ammo_casing/c10mm/soporific + +/obj/item/ammo_box/c10mm/soporific + name = "ammo box (10mm soporific)" + ammo_type = /obj/item/ammo_casing/c10mm/soporific + max_ammo = 24 + +//////Flechette Launcher////// + +///projectiles/// + +/obj/item/projectile/bullet/cflechetteap //shreds armor + name = "flechette (armor piercing)" + damage = 8 + armour_penetration = 80 + +/obj/item/projectile/bullet/cflechettes //shreds flesh and forces bleeding + name = "flechette (serrated)" + damage = 8 + dismemberment = 10 + armour_penetration = -80 + +/obj/item/projectile/bullet/cflechettes/on_hit(atom/target, blocked = FALSE) + if((blocked != 100) && iscarbon(target)) + var/mob/living/carbon/C = target + C.bleed(10) + return ..() + +///ammo casings (CASELESS AMMO CASINGS WOOOOOOOO)/// + +/obj/item/ammo_casing/caseless/flechetteap + name = "flechette (armor piercing)" + desc = "A flechette made with a tungsten alloy." + projectile_type = /obj/item/projectile/bullet/cflechetteap + caliber = "flechette" + throwforce = 1 + throw_speed = 3 + +/obj/item/ammo_casing/caseless/flechettes + name = "flechette (serrated)" + desc = "A serrated flechette made of a special alloy intended to deform drastically upon penetration of human flesh." + projectile_type = /obj/item/projectile/bullet/cflechettes + caliber = "flechette" + throwforce = 2 + throw_speed = 3 + embed_chance = 75 + +///magazine/// + +/obj/item/ammo_box/magazine/flechette + name = "flechette magazine (armor piercing)" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "flechettemag" + origin_tech = "combat=5;syndicate=1" + ammo_type = /obj/item/ammo_casing/caseless/flechetteap + caliber = "flechette" + max_ammo = 40 + multiple_sprites = 2 + +/obj/item/ammo_box/magazine/flechette/s + name = "flechette magazine (serrated)" + ammo_type = /obj/item/ammo_casing/caseless/flechettes + +///the gun itself/// + +/obj/item/gun/ballistic/automatic/flechette + name = "\improper CX Flechette Launcher" + desc = "A flechette launching machine pistol with an unconventional bullpup frame." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "flechettegun" + item_state = "gun" + w_class = WEIGHT_CLASS_NORMAL + slot_flags = 0 + /obj/item/device/firing_pin/implant/pindicate + origin_tech = "combat=6;materials=2;syndicate=5" + mag_type = /obj/item/ammo_box/magazine/flechette/ + fire_sound = 'sound/weapons/gunshot_smg.ogg' + can_suppress = 0 + burst_size = 5 + fire_delay = 1 + casing_ejector = 0 + spread = 20 + +/obj/item/gun/ballistic/automatic/flechette/update_icon() + ..() + if(magazine) + cut_overlays() + add_overlay("flechettegun-magazine") + else + cut_overlays() + icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" + +///unique variant/// + +/obj/item/projectile/bullet/cflechetteshredder + name = "flechette (shredder)" + damage = 5 + dismemberment = 40 + +/obj/item/ammo_casing/caseless/flechetteshredder + name = "flechette (shredder)" + desc = "A serrated flechette made of a special alloy that forms a monofilament edge." + projectile_type = /obj/item/projectile/bullet/cflechettes + +/obj/item/ammo_box/magazine/flechette/shredder + name = "flechette magazine (shredder)" + icon_state = "shreddermag" + ammo_type = /obj/item/ammo_casing/caseless/flechetteshredder + +/obj/item/gun/ballistic/automatic/flechette/shredder + name = "\improper CX Shredder" + desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofillament flechettes." + w_class = WEIGHT_CLASS_SMALL + mag_type = /obj/item/ammo_box/magazine/flechette/shredder + spread = 30 + +/obj/item/gun/ballistic/automatic/flechette/shredder/update_icon() + ..() + if(magazine) + cut_overlays() + add_overlay("shreddergun-magazine") + else + cut_overlays() + icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" + +//////modular pistol////// (reskinnable stetchkins) + +/obj/item/gun/ballistic/automatic/pistol/modular + name = "modular pistol" + desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "cde" + can_unsuppress = TRUE + unique_rename = TRUE + unique_reskin = list("Default" = "cde", + "NT-99" = "n99", + "Stealth" = "stealthpistol", + "HKVP-78" = "vp78", + "Luger" = "p08b", + "Mk.58" = "secguncomp", + "PX4 Storm" = "px4" + ) + +/obj/item/gun/ballistic/automatic/pistol/modular/update_icon() + ..() + if(current_skin) + icon_state = "[unique_reskin[current_skin]][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" + else + icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" + if(magazine && suppressed) + cut_overlays() + add_overlay("[unique_reskin[current_skin]]-magazine-sup") //Yes, this means the default iconstate can't have a magazine overlay + else if (magazine) + cut_overlays() + add_overlay("[unique_reskin[current_skin]]-magazine") + else + cut_overlays() \ No newline at end of file diff --git a/code/citadel/cit_reagents.dm b/code/citadel/cit_reagents.dm index 4a0e91479b..30b4da7ccf 100644 --- a/code/citadel/cit_reagents.dm +++ b/code/citadel/cit_reagents.dm @@ -46,7 +46,7 @@ name = "Female Ejaculate" id = "femcum" description = "Vaginal lubricant found in most mammals and other animals of similar nature. Where you found this is your own business." - taste_description = "female arousal" + taste_description = "something with a tang" // wew coders who haven't eaten out a girl. taste_mult = 2 data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null) reagent_state = LIQUID @@ -90,7 +90,7 @@ //aphrodisiac & anaphrodisiac -/datum/reagent/aphrodisiac +/datum/reagent/drug/aphrodisiac name = "Crocin" id = "aphro" description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac." @@ -98,7 +98,7 @@ taste_mult = 2 //Hide the roofies in stronger flavors color = "#FFADFF"//PINK, rgb(255, 173, 255) -/datum/reagent/aphrodisiac/on_mob_life(mob/living/M) +/datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M) if(prob(33)) M.adjustArousalLoss(2) if(prob(5)) @@ -108,7 +108,7 @@ to_chat(M, "[aroused_message]") ..() -/datum/reagent/aphrodisiacplus +/datum/reagent/drug/aphrodisiacplus name = "Hexacrocin" id = "aphro+" description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\ @@ -119,7 +119,7 @@ addiction_threshold = 20 overdose_threshold = 20 -/datum/reagent/aphrodisiacplus/on_mob_life(mob/living/M) +/datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M) if(prob(33)) M.adjustArousalLoss(6)//not quite six times as powerful, but still considerably more powerful. if(prob(5)) @@ -135,21 +135,21 @@ aroused_message = pick("You feel a bit hot.", "You feel strong sexual urges.", "You feel in the mood.", "You're ready to go down on someone.") to_chat(M, "[aroused_message]") -/datum/reagent/aphrodisiacplus/addiction_act_stage2(mob/living/M) +/datum/reagent/drug/aphrodisiacplus/addiction_act_stage2(mob/living/M) if(prob(30)) M.adjustBrainLoss(2) ..() -/datum/reagent/aphrodisiacplus/addiction_act_stage3(mob/living/M) +/datum/reagent/drug/aphrodisiacplus/addiction_act_stage3(mob/living/M) if(prob(30)) M.adjustBrainLoss(3) ..() -/datum/reagent/aphrodisiacplus/addiction_act_stage4(mob/living/M) +/datum/reagent/drug/aphrodisiacplus/addiction_act_stage4(mob/living/M) if(prob(30)) M.adjustBrainLoss(4) ..() -/datum/reagent/aphrodisiacplus/overdose_process(mob/living/M) +/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M) if(prob(33)) if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna()) var/mob/living/carbon/human/H = M @@ -163,7 +163,7 @@ M.adjustArousalLoss(2) ..() -/datum/reagent/anaphrodisiac +/datum/reagent/drug/anaphrodisiac name = "Camphor" id = "anaphro" description = "Naturally found in some species of evergreen trees, camphor is a waxy substance. When injested by most animals, it acts as an anaphrodisiac\ @@ -173,12 +173,12 @@ color = "#D9D9D9"//rgb(217, 217, 217) reagent_state = SOLID -/datum/reagent/anaphrodisiac/on_mob_life(mob/living/M) +/datum/reagent/drug/anaphrodisiac/on_mob_life(mob/living/M) if(prob(33)) M.adjustArousalLoss(-2) ..() -/datum/reagent/anaphrodisiacplus +/datum/reagent/drug/anaphrodisiacplus name = "Hexacamphor" id = "anaphro+" description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive." @@ -187,12 +187,12 @@ reagent_state = SOLID overdose_threshold = 20 -/datum/reagent/anaphrodisiacplus/on_mob_life(mob/living/M) +/datum/reagent/drug/anaphrodisiacplus/on_mob_life(mob/living/M) if(prob(33)) M.adjustArousalLoss(-4) ..() -/datum/reagent/anaphrodisiacplus/overdose_process(mob/living/M) +/datum/reagent/drug/anaphrodisiacplus/overdose_process(mob/living/M) if(prob(33)) if(M.min_arousal > 0) M.min_arousal -= 1 diff --git a/code/citadel/cit_uniforms.dm b/code/citadel/cit_uniforms.dm index 1e2fc3a914..fc7e03a676 100644 --- a/code/citadel/cit_uniforms.dm +++ b/code/citadel/cit_uniforms.dm @@ -7,6 +7,7 @@ body_parts_covered = CHEST|ARMS can_adjust = 1 icon = 'icons/obj/clothing/turtlenecks.dmi' + icon_override = 'icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/bb_sweater/black name = "black sweater" diff --git a/code/citadel/cit_vendors.dm b/code/citadel/cit_vendors.dm index d35d11a5f8..18bdde040a 100644 --- a/code/citadel/cit_vendors.dm +++ b/code/citadel/cit_vendors.dm @@ -22,7 +22,7 @@ ) premium = list() refill_canister = /obj/item/vending_refill/kink - +/* /obj/machinery/vending/nazivend name = "Nazivend" desc = "A vending machine containing Nazi German supplies. A label reads: \"Remember the gorrilions lost.\"" @@ -34,20 +34,20 @@ /obj/item/clothing/head/stalhelm = 20, /obj/item/clothing/head/panzer = 20, /obj/item/clothing/suit/soldiercoat = 20, - /obj/item/clothing/under/soldieruniform = 20, + // /obj/item/clothing/under/soldieruniform = 20, /obj/item/clothing/shoes/jackboots = 20 ) contraband = list( /obj/item/clothing/head/naziofficer = 10, - /obj/item/clothing/suit/officercoat = 10, - /obj/item/clothing/under/officeruniform = 10, + // /obj/item/clothing/suit/officercoat = 10, + // /obj/item/clothing/under/officeruniform = 10, /obj/item/clothing/suit/space/hardsuit/nazi = 3, /obj/item/gun/energy/plasma/MP40k = 4 ) premium = list() refill_canister = /obj/item/vending_refill/nazi - +*/ /obj/machinery/vending/sovietvend name = "KomradeVendtink" desc = "Rodina-mat' zovyot!" diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm index d620dd9017..397f4c6576 100644 --- a/code/citadel/custom_loadout/custom_items.dm +++ b/code/citadel/custom_loadout/custom_items.dm @@ -8,4 +8,137 @@ icon = 'icons/obj/custom.dmi' icon_state = "cebu" w_class = WEIGHT_CLASS_TINY - flags_1 = NOBLUDGEON_1 \ No newline at end of file + flags_1 = NOBLUDGEON_1 + + +/*Inferno707*/ + +/obj/item/clothing/neck/cloak/inferno + name = "Kiara's Cloak" + desc = "The design on this seems a little too familiar." + icon = 'icons/obj/clothing/cloaks.dmi' + icon_state = "infcloak" + item_state = "infcloak" + w_class = WEIGHT_CLASS_SMALL + body_parts_covered = CHEST|GROIN|LEGS|ARMS + +/obj/item/clothing/neck/petcollar/inferno + name = "Kiara's Collar" + desc = "A soft black collar that seems to stretch to fit whoever wears it." + icon_state = "infcollar" + item_state = "infcollar" + item_color = null + tagname = null + +/obj/item/clothing/accessory/medal/steele + name = "Insignia Of Steele" + desc = "An intricate pendant given to those who help a key member of the Steele Corporation." + icon = 'icons/obj/custom.dmi' + icon_state = "steele" + item_color = "steele" + medaltype = "medal-silver" + +/*DirtyOldHarry*/ + +/obj/item/lighter/gold + name = "\improper Engraved Zippo" + desc = "A shiny and relatively expensive zippo lighter. There's a small etched in verse on the bottom that reads, 'No Gods, No Masters, Only Man.'" + icon = 'icons/obj/cigarettes.dmi' + icon_state = "gold_zippo" + item_state = "gold_zippo" + w_class = WEIGHT_CLASS_TINY + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + heat = 1500 + resistance_flags = FIRE_PROOF + light_color = LIGHT_COLOR_FIRE + + +/*Zombierobin*/ + +/obj/item/clothing/neck/scarf/zomb //Default white color, same functionality as beanies. + name = "A special scarf" + icon_state = "zombscarf" + desc = "A fashionable collar" + item_color = "zombscarf" + dog_fashion = /datum/dog_fashion/head + +/obj/item/clothing/suit/toggle/labcoat/mad/red + name = "\improper The Mad's labcoat" + desc = "An oddly special looking coat." + icon_state = "labred" + item_state = "labred" + + +/*PLACEHOLDER*/ + +/obj/item/toy/plush/carrot + name = "carrot plushie" + desc = "While a normal carrot would be good for your eyes, this one seems a bit more for hugging then eating." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "carrot" + item_state = "carrot" + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("slapped") + resistance_flags = FLAMMABLE + squeak_override = list('sound/items/bikehorn.ogg'= 1) + +/obj/item/clothing/neck/cloak/carrot + name = "carrot cloak" + desc = "A cloak in the shape and color of a carrot!" + icon = 'icons/obj/clothing/cloaks.dmi' + icon_override = 'icons/mob/citadel/suit.dmi' + icon_state = "carrotcloak" + item_state = "carrotcloak" + w_class = WEIGHT_CLASS_SMALL + body_parts_covered = CHEST|GROIN|LEGS|ARMS + + +/*Zigfie*/ + +/obj/item/clothing/mask/luchador/zigfie + name = "Alboroto Rosa mask" + icon = 'icons/mob/mask.dmi' + icon_state = "lucharzigfie" + item_state = "lucharzigfie" + + +/*PLACEHOLDER*/ + +/obj/item/clothing/head/hardhat/reindeer/fluff + name = "novelty reindeer hat" + desc = "Some fake antlers and a very fake red nose - Sponsored by PWR Game(tm)" + icon_state = "hardhat0_reindeer" + item_state = "hardhat0_reindeer" + item_color = "reindeer" + flags_inv = 0 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) + brightness_on = 0 //luminosity when on + dynamic_hair_suffix = "" + +/obj/item/clothing/head/santa/fluff + name = "santa's hat" + desc = "On the first day of christmas my employer gave to me! - From Vlad with Salad" + icon_state = "santahatnorm" + item_state = "that" + dog_fashion = /datum/dog_fashion/head/santa + + +/*Brian*/ + +/obj/item/clothing/suit/trenchcoat/green + name = "Reece's Great Coat" + desc = "You would swear this was in your nightmares after eating too many veggies." + icon_state = "hos-g" + item_state = "hos-g" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + + +/*Slomek*/ +/obj/item/reagent_containers/food/drinks/flask/russian + name = "russian flask" + desc = "Every good russian spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go." + icon = 'icons/obj/custom.dmi' + icon_state = "russianflask" + item_state = "russianflask" + volume = 60 diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 4f3eae0fb7..ee5cfd2fd9 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -23,7 +23,6 @@ attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed") w_class = 3 sharpness = IS_SHARP - var/emagged = 0 /obj/item/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user) ..() @@ -173,7 +172,6 @@ icon_state = "synthtongue" hitsound = 'sound/effects/attackblob.ogg' cleanspeed = 80 - var/emagged = 0 /obj/item/soap/tongue/New() ..() @@ -339,7 +337,6 @@ /obj/item/hand_tele, /obj/item/card/id/captains_spare, /obj/item/device/aicard, - /obj/item/device/paicard, /obj/item/gun, /obj/item/pinpointer, /obj/item/clothing/shoes/magboots, @@ -354,7 +351,9 @@ /obj/item/nuke_core_container, /obj/item/areaeditor/blueprints, /obj/item/documents/syndicate, - /obj/item/disk/nuclear) + /obj/item/disk/nuclear, + /obj/item/bombcore, + /obj/item/grenade) /obj/item/device/dogborg/sleeper/New() ..() diff --git a/code/citadel/plasmacases.dm b/code/citadel/plasmacases.dm new file mode 100644 index 0000000000..ac3621b58a --- /dev/null +++ b/code/citadel/plasmacases.dm @@ -0,0 +1,23 @@ +/obj/structure/guncase/plasma + name = "plasma rifle locker" + desc = "A locker that holds plasma rifles. Only opens in dire emergencies." + icon_state = "ecase" + case_type = "egun" + gun_category = /obj/item/gun/energy/plasma + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //because fuck you, powergaming nerds. + +/obj/structure/guncase/plasma/attackby(obj/item/W, mob/user, params) + return + +/obj/structure/guncase/plasma/MouseDrop(over_object, src_location, over_location) + if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA) + . = ..() + else + to_chat(usr, "The storage unit will only unlock during a Red or Delta security alert.") + +/obj/structure/guncase/plasma/attack_hand(mob/user) + return MouseDrop(user) + +/obj/structure/guncase/plasma/emag_act() + to_chat(usr, "The locking mechanism is fitted with old style parts, The card has no effect.") + return \ No newline at end of file diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 01a6b2a46d..1e4a574e13 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -1,281 +1,156 @@ -//Configuraton defines //TODO: Move all yes/no switches into bitflags +GLOBAL_VAR_INIT(config_dir, "config/") +GLOBAL_PROTECT(config_dir) -//Used by jobs_have_maint_access -#define ASSISTANTS_HAVE_MAINT_ACCESS 1 -#define SECURITY_HAS_MAINT_ACCESS 2 -#define EVERYONE_HAS_MAINT_ACCESS 4 +/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) + if(Get(/datum/config_entry/flag/maprotation)) + 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 -/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") - if(var_name in banned_edits) - return FALSE - return ..() +/datum/controller/configuration/proc/InitEntries() + var/list/_entries = list() + entries = _entries + var/list/_entries_by_type = list() + entries_by_type = _entries_by_type -/datum/configuration - var/name = "Configuration" // datum name + . = list() - var/autoadmin = 0 - var/autoadmin_rank = "Game Admin" + 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 - 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 +/datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE) + entries -= CE.name + entries_by_type -= CE.type - 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 +/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 - 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 + if(copytext(L, 1, 2) == "#") + continue - 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/pos = findtext(L, " ") + var/entry = null + var/value = null - var/forbid_singulo_possession = 0 - var/useircbot = 0 + if(pos) + entry = lowertext(copytext(L, 1, pos)) + value = copytext(L, pos + 1) + else + entry = lowertext(L) - var/check_randomizer = 0 + if(!entry) + continue - var/panic_server_name - var/panic_address //Reconnect a player this linked server if this server isn't accepting new players + var/datum/config_entry/E = _entries[entry] + if(!E) + log_config("Unknown setting in configuration: '[entry]'") + continue - //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" + if(filename != E.resident_file) + log_config("Found [entry] in [filename] when it should have been in [E.resident_file]! Ignoring.") + continue - 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/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.") - 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 + if(validated) + E.modified = TRUE - //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." +/datum/controller/configuration/can_vv_get(var_name) + return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..() - //game_options.txt configs - var/force_random_names = 0 - var/list/mode_names = 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() +/datum/controller/configuration/vv_edit_var(var_name, var_value) + return !(var_name in list("entries_by_type", "entries")) && ..() - 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? +/datum/controller/configuration/stat_entry() + if(!statclick) + statclick = new/obj/effect/statclick/debug(null, "Edit", src) + stat("[name]:", statclick) - var/traitor_scaling_coeff = 6 //how much does the amount of players get divided by to determine traitors - 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 +/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 - var/traitor_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 +/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) - 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() - -/datum/configuration/New() - gamemode_cache = typecacheof(/datum/game_mode,TRUE) +/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). @@ -283,545 +158,18 @@ 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/config.txt") - load("config/comms.txt", "comms") - load("config/game_options.txt","game_options") - load("config/policies.txt", "policies") - loadsql("config/dbconfig.txt") - reload_custom_roundstart_items_list() - if (maprotation) - loadmaplist("config/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 - 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("show_irc_name") - showircname = 1 - if("see_own_notes") - see_own_notes = 1 - 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 - 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("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("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("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) +/datum/controller/configuration/proc/loadmaplist(filename) + filename = "[GLOB.config_dir][filename]" var/list/Lines = world.file2list(filename) var/datum/map_config/currentmap = null @@ -855,7 +203,7 @@ if ("map") currentmap = new ("_maps/[data].json") if(currentmap.defaulted) - log_world("Failed to load map config for [data]!") + log_config("Failed to load map config for [data]!") if ("minplayers","minplayer") currentmap.config_min_users = text2num(data) if ("maxplayers","maxplayer") @@ -865,6 +213,7 @@ if ("default","defaultmap") defaultmap = currentmap if ("endmap") + LAZYINITLIST(maplist) maplist[currentmap.map_name] = currentmap currentmap = null if ("disabled") @@ -873,64 +222,25 @@ WRITE_FILE(GLOB.config_error_log, "Unknown command in map vote config: '[command]'") -/datum/configuration/proc/loadsql(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) +/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 = new T() - if(M.config_tag && M.config_tag == mode_name) - return M - qdel(M) + 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() +/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() - //to_chat(world, "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]") if(!(M.config_tag in modes)) qdel(M) continue @@ -942,12 +252,22 @@ if(max_pop[M.config_tag]) M.maximum_players = max_pop[M.config_tag] if(M.can_start()) - runnable_modes[M] = probabilities[M.config_tag] - //to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]") + 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) +/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)) @@ -965,9 +285,3 @@ 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.dm.rej b/code/controllers/configuration.dm.rej deleted file mode 100644 index 5d5c2c5055..0000000000 --- a/code/controllers/configuration.dm.rej +++ /dev/null @@ -1,24 +0,0 @@ -diff a/code/controllers/configuration.dm b/code/controllers/configuration.dm (rejected hunks) -@@ -337,17 +337,17 @@ - if("use_account_age_for_jobs") - use_account_age_for_jobs = 1 - if("use_exp_tracking") -- use_exp_tracking = 1 -+ use_exp_tracking = TRUE - if("use_exp_restrictions_heads") -- use_exp_restrictions_heads = 1 -+ 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 = 1 -+ use_exp_restrictions_heads_department = TRUE - if("use_exp_restrictions_other") -- use_exp_restrictions_other = 1 -+ use_exp_restrictions_other = TRUE - if("use_exp_restrictions_admin_bypass") -- use_exp_restrictions_admin_bypass = 1 -+ use_exp_restrictions_admin_bypass = TRUE - if("lobby_countdown") - lobby_countdown = text2num(value) - if("round_end_countdown") diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm new file mode 100644 index 0000000000..5358073dbe --- /dev/null +++ b/code/controllers/configuration/config_entry.dm @@ -0,0 +1,178 @@ +#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/ValidateAndSet(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) + 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) + 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) + 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) + 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) + 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) + 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) + 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 0000000000..49ccb411fc --- /dev/null +++ b/code/controllers/configuration/configuration.dm @@ -0,0 +1,287 @@ +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/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 + + 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 0000000000..bf099f6cb6 --- /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 0000000000..ec96e88553 --- /dev/null +++ b/code/controllers/configuration/entries/config.dm @@ -0,0 +1,354 @@ +#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/useircbot) //tgs2 support + protection = CONFIG_ENTRY_LOCKED + +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 0000000000..c46880686a --- /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 0000000000..106804a576 --- /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/failsafe.dm b/code/controllers/failsafe.dm index d5298f7dde..2ca208642c 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -1,102 +1,102 @@ - /** - * Failsafe - * - * Pretty much pokes the MC to make sure it's still alive. - **/ - -GLOBAL_REAL(Failsafe, /datum/controller/failsafe) - -/datum/controller/failsafe // This thing pretty much just keeps poking the master controller - name = "Failsafe" - - // The length of time to check on the MC (in deciseconds). - // Set to 0 to disable. - var/processing_interval = 20 - // The alert level. For every failed poke, we drop a DEFCON level. Once we hit DEFCON 1, restart the MC. - var/defcon = 5 - //the world.time of the last check, so the mc can restart US if we hang. - // (Real friends look out for *eachother*) - var/lasttick = 0 - - // Track the MC iteration to make sure its still on track. - var/master_iteration = 0 - var/running = TRUE - -/datum/controller/failsafe/New() - // Highlander-style: there can only be one! Kill off the old and replace it with the new. - if(Failsafe != src) - if(istype(Failsafe)) - qdel(Failsafe) - Failsafe = src - Initialize() - -/datum/controller/failsafe/Initialize() - set waitfor = 0 - Failsafe.Loop() - if(!QDELETED(src)) - qdel(src) //when Loop() returns, we delete ourselves and let the mc recreate us - -/datum/controller/failsafe/Destroy() - running = FALSE - ..() - return QDEL_HINT_HARDDEL_NOW - -/datum/controller/failsafe/proc/Loop() - while(running) - lasttick = world.time - if(!Master) - // Replace the missing Master! This should never, ever happen. - new /datum/controller/master() - // Only poke it if overrides are not in effect. - if(processing_interval > 0) - if(Master.processing && Master.iteration) - // Check if processing is done yet. - if(Master.iteration == master_iteration) - switch(defcon) - if(4,5) - --defcon - if(3) - to_chat(GLOB.admins, "Notice: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks.") - --defcon - if(2) - to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.") - --defcon - if(1) - - to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...") - --defcon - var/rtn = Recreate_MC() - if(rtn > 0) - defcon = 4 - master_iteration = 0 - to_chat(GLOB.admins, "MC restarted successfully") - else if(rtn < 0) - log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0") - to_chat(GLOB.admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.") - //if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again - //no need to handle that specially when defcon 0 can handle it - if(0) //DEFCON 0! (mc failed to restart) - var/rtn = Recreate_MC() - if(rtn > 0) - defcon = 4 - master_iteration = 0 - to_chat(GLOB.admins, "MC restarted successfully") - else - defcon = min(defcon + 1,5) - master_iteration = Master.iteration - if (defcon <= 1) - sleep(processing_interval*2) - else - sleep(processing_interval) - else - defcon = 5 - sleep(initial(processing_interval)) - -/datum/controller/failsafe/proc/defcon_pretty() - return defcon - -/datum/controller/failsafe/stat_entry() - if(!statclick) - statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) - - stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])")) + /** + * Failsafe + * + * Pretty much pokes the MC to make sure it's still alive. + **/ + +GLOBAL_REAL(Failsafe, /datum/controller/failsafe) + +/datum/controller/failsafe // This thing pretty much just keeps poking the master controller + name = "Failsafe" + + // The length of time to check on the MC (in deciseconds). + // Set to 0 to disable. + var/processing_interval = 20 + // The alert level. For every failed poke, we drop a DEFCON level. Once we hit DEFCON 1, restart the MC. + var/defcon = 5 + //the world.time of the last check, so the mc can restart US if we hang. + // (Real friends look out for *eachother*) + var/lasttick = 0 + + // Track the MC iteration to make sure its still on track. + var/master_iteration = 0 + var/running = TRUE + +/datum/controller/failsafe/New() + // Highlander-style: there can only be one! Kill off the old and replace it with the new. + if(Failsafe != src) + if(istype(Failsafe)) + qdel(Failsafe) + Failsafe = src + Initialize() + +/datum/controller/failsafe/Initialize() + set waitfor = 0 + Failsafe.Loop() + if(!QDELETED(src)) + qdel(src) //when Loop() returns, we delete ourselves and let the mc recreate us + +/datum/controller/failsafe/Destroy() + running = FALSE + ..() + return QDEL_HINT_HARDDEL_NOW + +/datum/controller/failsafe/proc/Loop() + while(running) + lasttick = world.time + if(!Master) + // Replace the missing Master! This should never, ever happen. + new /datum/controller/master() + // Only poke it if overrides are not in effect. + if(processing_interval > 0) + if(Master.processing && Master.iteration) + // Check if processing is done yet. + if(Master.iteration == master_iteration) + switch(defcon) + if(4,5) + --defcon + if(3) + message_admins("Notice: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks.") + --defcon + if(2) + to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.") + --defcon + if(1) + + to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...") + --defcon + var/rtn = Recreate_MC() + if(rtn > 0) + defcon = 4 + master_iteration = 0 + to_chat(GLOB.admins, "MC restarted successfully") + else if(rtn < 0) + log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0") + to_chat(GLOB.admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.") + //if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again + //no need to handle that specially when defcon 0 can handle it + if(0) //DEFCON 0! (mc failed to restart) + var/rtn = Recreate_MC() + if(rtn > 0) + defcon = 4 + master_iteration = 0 + to_chat(GLOB.admins, "MC restarted successfully") + else + defcon = min(defcon + 1,5) + master_iteration = Master.iteration + if (defcon <= 1) + sleep(processing_interval*2) + else + sleep(processing_interval) + else + defcon = 5 + sleep(initial(processing_interval)) + +/datum/controller/failsafe/proc/defcon_pretty() + return defcon + +/datum/controller/failsafe/stat_entry() + if(!statclick) + statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) + + stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])")) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 6981748198..6ed3121179 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 @@ -422,7 +422,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new // in those cases, so we just let them run) if (queue_node_flags & SS_NO_TICK_CHECK) if (queue_node.tick_usage > TICK_LIMIT_RUNNING - TICK_USAGE && ran_non_ticker) - queue_node.queued_priority += queue_priority_count * 0.10 + queue_node.queued_priority += queue_priority_count * 0.1 queue_priority_count -= queue_node_priority queue_priority_count += queue_node.queued_priority current_tick_budget -= queue_node_priority diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index eee6945c41..e160c132b9 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 8eb7392db8..b5dbabb934 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -164,6 +164,7 @@ SUBSYSTEM_DEF(air) currentrun.len-- if(!M || (M.process_atmos(seconds) == PROCESS_KILL)) atmos_machinery.Remove(M) + M.SendSignal(COMSIG_MACHINE_PROCESS_ATMOS) if(MC_TICK_CHECK) return @@ -321,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) @@ -382,4 +383,4 @@ SUBSYSTEM_DEF(air) #undef SSAIR_EXCITEDGROUPS #undef SSAIR_HIGHPRESSURE #undef SSAIR_HOTSPOT -#undef SSAIR_SUPERCONDUCTIVITY +#undef SSAIR_SUPERCONDUCTIVITY \ No newline at end of file diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index 32086f52ed..38e9724b5f 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 b85e99a0b9..56238d5b85 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -18,16 +18,14 @@ SUBSYSTEM_DEF(blackbox) var/list/msg_other = list() var/list/feedback = list() //list of datum/feedback_variable - var/triggertime = 0 var/sealed = FALSE //time to stop tracking stats? - + /datum/controller/subsystem/blackbox/Initialize() triggertime = world.time . = ..() - //poll population /datum/controller/subsystem/blackbox/fire() if(!SSdbcore.Connect()) @@ -37,16 +35,14 @@ SUBSYSTEM_DEF(blackbox) if(M.client) playercount += 1 var/admincount = GLOB.admins.len - var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')") + 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) - /datum/controller/subsystem/blackbox/Recover() msg_common = SSblackbox.msg_common msg_science = SSblackbox.msg_science @@ -189,8 +185,7 @@ SUBSYSTEM_DEF(blackbox) return if(!L || !L.key || !L.mind) return - var/turf/T = get_turf(L) - var/area/placeofdeath = get_area(T.loc) + var/area/placeofdeath = get_area(L) var/sqlname = sanitizeSQL(L.real_name) var/sqlkey = sanitizeSQL(L.ckey) var/sqljob = sanitizeSQL(L.mind.assigned_role) @@ -212,8 +207,10 @@ SUBSYSTEM_DEF(blackbox) var/x_coord = sanitizeSQL(L.x) var/y_coord = sanitizeSQL(L.y) var/z_coord = sanitizeSQL(L.z) + var/last_words = sanitizeSQL(L.last_words) + var/suicide = sanitizeSQL(L.suiciding) var/map = sanitizeSQL(SSmapping.config.map_name) - var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss) VALUES ('[sqlpod]', '[x_coord]', '[y_coord]', '[z_coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', [GLOB.round_id], '[SQLtime()]', '[sqljob]', '[sqlspecial]', '[sqlname]', '[sqlkey]', '[laname]', '[lakey]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina])") + var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, last_words, suicide) VALUES ('[sqlpod]', '[x_coord]', '[y_coord]', '[z_coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', [GLOB.round_id], '[SQLtime()]', '[sqljob]', '[sqlspecial]', '[sqlname]', '[sqlkey]', '[laname]', '[lakey]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[last_words]', [suicide])") query_report_death.Execute() /datum/controller/subsystem/blackbox/proc/Seal() @@ -229,7 +226,7 @@ SUBSYSTEM_DEF(blackbox) /datum/feedback_variable var/variable var/value - var/details + var/list/details /datum/feedback_variable/New(param_variable, param_value = 0) variable = param_variable @@ -267,19 +264,17 @@ SUBSYSTEM_DEF(blackbox) /datum/feedback_variable/proc/get_variable() return variable -/datum/feedback_variable/proc/set_details(text) - if (istext(text)) - details = text +/datum/feedback_variable/proc/set_details(deets) + details = list("\"[deets]\"") -/datum/feedback_variable/proc/add_details(text) - if (istext(text)) - if (!details) - details = "\"[text]\"" - else - details += " | \"[text]\"" +/datum/feedback_variable/proc/add_details(deets) + if (!details) + set_details(deets) + else + details += "\"[deets]\"" /datum/feedback_variable/proc/get_details() - return details + return details ? details.Join(" | ") : null /datum/feedback_variable/proc/get_parsed() - return list(variable,value,details) \ No newline at end of file + return list(variable,value,details.Join(" | ")) diff --git a/code/controllers/subsystem/blackbox.dm.rej b/code/controllers/subsystem/blackbox.dm.rej deleted file mode 100644 index 5bd713172b..0000000000 --- a/code/controllers/subsystem/blackbox.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm (rejected hunks) -@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(blackbox) - - if(config.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 -- SSblackbox.update_exp(10,FALSE) -+ update_exp(10,FALSE) - - - /datum/controller/subsystem/blackbox/Recover() diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 864274b8fb..12a5342e33 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/disease.dm b/code/controllers/subsystem/disease.dm index c75063c256..327ba95196 100644 --- a/code/controllers/subsystem/disease.dm +++ b/code/controllers/subsystem/disease.dm @@ -14,3 +14,10 @@ SUBSYSTEM_DEF(disease) /datum/controller/subsystem/disease/stat_entry(msg) ..("P:[active_diseases.len]") + +/datum/controller/subsystem/disease/proc/get_disease_name(id) + var/datum/disease/advance/A = archive_diseases[id] + if(A.name) + return A.name + else + return "Unknown" diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index c41f422575..f435d7e819 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 @@ -116,6 +116,8 @@ SUBSYSTEM_DEF(events) //allows a client to trigger an event //aka Badmin Central +// > Not in modules/admin +// REEEEEEEEE /client/proc/forceEvent() set name = "Trigger Event" set category = "Fun" @@ -131,7 +133,7 @@ SUBSYSTEM_DEF(events) var/magic = "" var/holiday = "" for(var/datum/round_event_control/E in SSevents.control) - dat = "
[E]" + dat = "
[E]" if(E.holidayID) holiday += dat else if(E.wizardevent) @@ -169,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/garbage.dm b/code/controllers/subsystem/garbage.dm index 8502280aaf..d202c08d39 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -1,40 +1,44 @@ SUBSYSTEM_DEF(garbage) name = "Garbage" priority = 15 - wait = 20 + wait = 2 SECONDS flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY - var/collection_timeout = 3000// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object - var/delslasttick = 0 // number of del()'s we've done this tick - var/gcedlasttick = 0 // number of things that gc'ed last tick + var/list/collection_timeout = list(0, 2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level + + //Stat tracking + var/delslasttick = 0 // number of del()'s we've done this tick + var/gcedlasttick = 0 // number of things that gc'ed last tick var/totaldels = 0 var/totalgcs = 0 var/highest_del_time = 0 var/highest_del_tickusage = 0 - var/list/queue = list() // list of refID's of things that should be garbage collected - // refID's are associated with the time at which they time out and need to be manually del() - // we do this so we aren't constantly locating them and preventing them from being gc'd + var/list/pass_counts + var/list/fail_counts - var/list/tobequeued = list() //We store the references of things to be added to the queue separately so we can spread out GC overhead over a few ticks + var/list/items = list() // Holds our qdel_item statistics datums - var/list/didntgc = list() // list of all types that have failed to GC associated with the number of times that's happened. - // the types are stored as strings - var/list/sleptDestroy = list() //Same as above but these are paths that slept during their Destroy call + //Queue + var/list/queues - var/list/noqdelhint = list()// list of all types that do not return a QDEL_HINT - // all types that did not respect qdel(A, force=TRUE) and returned one - // of the immortality qdel hints - var/list/noforcerespect = list() -#ifdef TESTING - var/list/qdel_list = list() // list of all types that have been qdel()eted -#endif +/datum/controller/subsystem/garbage/PreInit() + queues = new(GC_QUEUE_COUNT) + pass_counts = new(GC_QUEUE_COUNT) + fail_counts = new(GC_QUEUE_COUNT) + for(var/i in 1 to GC_QUEUE_COUNT) + queues[i] = list() + pass_counts[i] = 0 + fail_counts[i] = 0 /datum/controller/subsystem/garbage/stat_entry(msg) - msg += "Q:[queue.len]|D:[delslasttick]|G:[gcedlasttick]|" + var/list/counts = list() + for (var/list/L in queues) + counts += length(L) + msg += "Q:[counts.Join(",")]|D:[delslasttick]|G:[gcedlasttick]|" msg += "GR:" if (!(delslasttick+gcedlasttick)) msg += "n/a|" @@ -46,116 +50,179 @@ SUBSYSTEM_DEF(garbage) msg += "n/a|" else msg += "TGR:[round((totalgcs/(totaldels+totalgcs))*100, 0.01)]%" + msg += " P:[pass_counts.Join(",")]" + msg += "|F:[fail_counts.Join(",")]" ..(msg) /datum/controller/subsystem/garbage/Shutdown() - //Adds the del() log to world.log in a format condensable by the runtime condenser found in tools - if(didntgc.len || sleptDestroy.len) - var/list/dellog = list() - for(var/path in didntgc) - dellog += "Path : [path] \n" - dellog += "Failures : [didntgc[path]] \n" - if(path in sleptDestroy) - dellog += "Sleeps : [sleptDestroy[path]] \n" - sleptDestroy -= path - for(var/path in sleptDestroy) - dellog += "Path : [path] \n" - dellog += "Sleeps : [sleptDestroy[path]] \n" - text2file(dellog.Join(), "[GLOB.log_directory]/qdel.log") + //Adds the del() log to the qdel log file + var/list/dellog = list() + + //sort by how long it's wasted hard deleting + sortTim(items, cmp=/proc/cmp_qdel_item_time, associative = TRUE) + for(var/path in items) + var/datum/qdel_item/I = items[path] + dellog += "Path: [path]" + if (I.failures) + dellog += "\tFailures: [I.failures]" + dellog += "\tqdel() Count: [I.qdels]" + dellog += "\tDestroy() Cost: [I.destroy_time]ms" + if (I.hard_deletes) + dellog += "\tTotal Hard Deletes [I.hard_deletes]" + dellog += "\tTime Spent Hard Deleting: [I.hard_delete_time]ms" + if (I.slept_destroy) + dellog += "\tSleeps: [I.slept_destroy]" + if (I.no_respect_force) + dellog += "\tIgnored force: [I.no_respect_force] times" + if (I.no_hint) + dellog += "\tNo hint: [I.no_hint] times" + log_qdel(dellog.Join("\n")) /datum/controller/subsystem/garbage/fire() - HandleToBeQueued() - if(state == SS_RUNNING) - HandleQueue() - + //the fact that this resets its processing each fire (rather then resume where it left off) is intentional. + var/queue = GC_QUEUE_PREQUEUE + + while (state == SS_RUNNING) + switch (queue) + if (GC_QUEUE_PREQUEUE) + HandlePreQueue() + queue = GC_QUEUE_PREQUEUE+1 + if (GC_QUEUE_CHECK) + HandleQueue(GC_QUEUE_CHECK) + queue = GC_QUEUE_CHECK+1 + if (GC_QUEUE_HARDDELETE) + HandleQueue(GC_QUEUE_HARDDELETE) + break + if (state == SS_PAUSED) //make us wait again before the next run. - state = SS_RUNNING + state = SS_RUNNING //If you see this proc high on the profile, what you are really seeing is the garbage collection/soft delete overhead in byond. //Don't attempt to optimize, not worth the effort. -/datum/controller/subsystem/garbage/proc/HandleToBeQueued() - var/list/tobequeued = src.tobequeued - var/starttime = world.time - var/starttimeofday = world.timeofday - while(tobequeued.len && starttime == world.time && starttimeofday == world.timeofday) - if (MC_TICK_CHECK) - break - var/ref = tobequeued[1] - Queue(ref) - tobequeued.Cut(1, 2) +/datum/controller/subsystem/garbage/proc/HandlePreQueue() + var/list/tobequeued = queues[GC_QUEUE_PREQUEUE] + var/static/count = 0 + if (count) + var/c = count + count = 0 //so if we runtime on the Cut, we don't try again. + tobequeued.Cut(1,c+1) -/datum/controller/subsystem/garbage/proc/HandleQueue() - delslasttick = 0 - gcedlasttick = 0 - var/time_to_kill = world.time - collection_timeout // Anything qdel() but not GC'd BEFORE this time needs to be manually del() - var/list/queue = src.queue - var/starttime = world.time - var/starttimeofday = world.timeofday - while(queue.len && starttime == world.time && starttimeofday == world.timeofday) + for (var/ref in tobequeued) + count++ + Queue(ref, GC_QUEUE_PREQUEUE+1) if (MC_TICK_CHECK) break - var/refID = queue[1] + if (count) + tobequeued.Cut(1,count+1) + count = 0 + +/datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_CHECK) + if (level == GC_QUEUE_CHECK) + delslasttick = 0 + gcedlasttick = 0 + var/cut_off_time = world.time - collection_timeout[level] //ignore entries newer then this + var/list/queue = queues[level] + var/static/lastlevel + var/static/count = 0 + if (count) //runtime last run before we could do this. + var/c = count + count = 0 //so if we runtime on the Cut, we don't try again. + var/list/lastqueue = queues[lastlevel] + lastqueue.Cut(1, c+1) + + lastlevel = level + + for (var/refID in queue) if (!refID) - queue.Cut(1, 2) + count++ + if (MC_TICK_CHECK) + break continue var/GCd_at_time = queue[refID] - if(GCd_at_time > time_to_kill) + if(GCd_at_time > cut_off_time) break // Everything else is newer, skip them - queue.Cut(1, 2) - var/datum/A - A = locate(refID) - if (A && A.gc_destroyed == GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake - #ifdef GC_FAILURE_HARD_LOOKUP - A.find_references() - #endif + count++ - // Something's still referring to the qdel'd object. Kill it. - var/type = A.type - testing("GC: -- \ref[A] | [type] was unable to be GC'd and was deleted --") - didntgc["[type]"]++ - - HardDelete(A) + var/datum/D + D = locate(refID) - ++delslasttick - ++totaldels - else + if (!D || D.gc_destroyed != GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake ++gcedlasttick ++totalgcs + pass_counts[level]++ + if (MC_TICK_CHECK) + break + continue -/datum/controller/subsystem/garbage/proc/QueueForQueuing(datum/A) - if (istype(A) && A.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) - tobequeued += A - A.gc_destroyed = GC_QUEUED_FOR_QUEUING + // Something's still referring to the qdel'd object. + fail_counts[level]++ + switch (level) + if (GC_QUEUE_CHECK) + #ifdef GC_FAILURE_HARD_LOOKUP + D.find_references() + #endif + var/type = D.type + var/datum/qdel_item/I = items[type] + testing("GC: -- \ref[D] | [type] was unable to be GC'd --") + I.failures++ + if (GC_QUEUE_HARDDELETE) + HardDelete(D) + if (MC_TICK_CHECK) + break + continue -/datum/controller/subsystem/garbage/proc/Queue(datum/A) - if (isnull(A) || (!isnull(A.gc_destroyed) && A.gc_destroyed >= 0)) + Queue(D, level+1) + + if (MC_TICK_CHECK) + break + if (count) + queue.Cut(1,count+1) + count = 0 + +/datum/controller/subsystem/garbage/proc/PreQueue(datum/D) + if (D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) + queues[GC_QUEUE_PREQUEUE] += D + D.gc_destroyed = GC_QUEUED_FOR_QUEUING + +/datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_CHECK) + if (isnull(D)) return - if (A.gc_destroyed == GC_QUEUED_FOR_HARD_DEL) - HardDelete(A) + if (D.gc_destroyed == GC_QUEUED_FOR_HARD_DEL) + level = GC_QUEUE_HARDDELETE + if (level > GC_QUEUE_COUNT) + HardDelete(D) return var/gctime = world.time - var/refid = "\ref[A]" - - A.gc_destroyed = gctime + var/refid = "\ref[D]" + D.gc_destroyed = gctime + var/list/queue = queues[level] if (queue[refid]) queue -= refid // Removing any previous references that were GC'd so that the current object will be at the end of the list. queue[refid] = gctime -//this is purely to separate things profile wise. -/datum/controller/subsystem/garbage/proc/HardDelete(datum/A) +//this is mainly to separate things profile wise. +/datum/controller/subsystem/garbage/proc/HardDelete(datum/D) var/time = world.timeofday var/tick = TICK_USAGE var/ticktime = world.time - - var/type = A.type - var/refID = "\ref[A]" - - del(A) - + ++delslasttick + ++totaldels + var/type = D.type + var/refID = "\ref[D]" + + del(D) + tick = (TICK_USAGE-tick+((world.time-ticktime)/world.tick_lag*100)) + + var/datum/qdel_item/I = items[type] + + I.hard_deletes++ + I.hard_delete_time += TICK_DELTA_TO_MS(tick) + + if (tick > highest_del_tickusage) highest_del_tickusage = tick time = world.timeofday - time @@ -166,18 +233,33 @@ SUBSYSTEM_DEF(garbage) if (time > 10) log_game("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete)") message_admins("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete).") - postpone(time/5) - -/datum/controller/subsystem/garbage/proc/HardQueue(datum/A) - if (istype(A) && A.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) - tobequeued += A - A.gc_destroyed = GC_QUEUED_FOR_HARD_DEL + postpone(time) + +/datum/controller/subsystem/garbage/proc/HardQueue(datum/D) + if (D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) + queues[GC_QUEUE_PREQUEUE] += D + D.gc_destroyed = GC_QUEUED_FOR_HARD_DEL /datum/controller/subsystem/garbage/Recover() - if (istype(SSgarbage.queue)) - queue |= SSgarbage.queue - if (istype(SSgarbage.tobequeued)) - tobequeued |= SSgarbage.tobequeued + if (istype(SSgarbage.queues)) + for (var/i in 1 to SSgarbage.queues.len) + queues[i] |= SSgarbage.queues[i] + + +/datum/qdel_item + var/name = "" + var/qdels = 0 //Total number of times it's passed thru qdel. + var/destroy_time = 0 //Total amount of milliseconds spent processing this type's Destroy() + var/failures = 0 //Times it was queued for soft deletion but failed to soft delete. + var/hard_deletes = 0 //Different from failures because it also includes QDEL_HINT_HARDDEL deletions + var/hard_delete_time = 0//Total amount of milliseconds spent hard deleting this type. + var/no_respect_force = 0//Number of times it's not respected force=TRUE + var/no_hint = 0 //Number of times it's not even bother to give a qdel hint + var/slept_destroy = 0 //Number of times it's slept in its destroy + +/datum/qdel_item/New(mytype) + name = "[mytype]" + // Should be treated as a replacement for the 'del' keyword. // Datums passed to this will be given a chance to clean up references to allow the GC to collect them. @@ -185,21 +267,27 @@ SUBSYSTEM_DEF(garbage) if(!istype(D)) del(D) return -#ifdef TESTING - SSgarbage.qdel_list += "[D.type]" -#endif + var/datum/qdel_item/I = SSgarbage.items[D.type] + if (!I) + I = SSgarbage.items[D.type] = new /datum/qdel_item(D.type) + I.qdels++ + + if(isnull(D.gc_destroyed)) D.SendSignal(COMSIG_PARENT_QDELETED) D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED var/start_time = world.time + var/start_tick = world.tick_usage var/hint = D.Destroy(force) // Let our friend know they're about to get fucked up. if(world.time != start_time) - SSgarbage.sleptDestroy["[D.type]"]++ + I.slept_destroy++ + else + I.destroy_time += TICK_USAGE_TO_MS(start_tick) if(!D) return switch(hint) if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion. - SSgarbage.QueueForQueuing(D) + SSgarbage.PreQueue(D) if (QDEL_HINT_IWILLGC) D.gc_destroyed = world.time return @@ -209,28 +297,33 @@ SUBSYSTEM_DEF(garbage) return // Returning LETMELIVE after being told to force destroy // indicates the objects Destroy() does not respect force - if(!SSgarbage.noforcerespect["[D.type]"]) - SSgarbage.noforcerespect["[D.type]"] = "[D.type]" + #ifdef TESTING + if(!I.no_respect_force) testing("WARNING: [D.type] has been force deleted, but is \ returning an immortal QDEL_HINT, indicating it does \ not respect the force flag for qdel(). It has been \ placed in the queue, further instances of this type \ will also be queued.") - SSgarbage.QueueForQueuing(D) + #endif + I.no_respect_force++ + + SSgarbage.PreQueue(D) if (QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete using a hard reference to save time from the locate() SSgarbage.HardQueue(D) if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste. SSgarbage.HardDelete(D) if (QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion. - SSgarbage.QueueForQueuing(D) + SSgarbage.PreQueue(D) #ifdef TESTING D.find_references() #endif else - if(!SSgarbage.noqdelhint["[D.type]"]) - SSgarbage.noqdelhint["[D.type]"] = "[D.type]" + #ifdef TESTING + if(!I.no_hint) testing("WARNING: [D.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.") - SSgarbage.QueueForQueuing(D) + #endif + I.no_hint++ + SSgarbage.PreQueue(D) else if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) CRASH("[D.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic") @@ -281,15 +374,6 @@ SUBSYSTEM_DEF(garbage) SSgarbage.can_fire = 1 SSgarbage.next_fire = world.time + world.tick_lag -/client/verb/purge_all_destroyed_objects() - set category = "Debug" - while(SSgarbage.queue.len) - var/datum/o = locate(SSgarbage.queue[1]) - if(istype(o) && o.gc_destroyed) - del(o) - SSgarbage.totaldels++ - SSgarbage.queue.Cut(1, 2) - /datum/verb/qdel_then_find_references() set category = "Debug" set name = "qdel() then Find References" @@ -300,24 +384,6 @@ SUBSYSTEM_DEF(garbage) if(!running_find_references) find_references(TRUE) -/client/verb/show_qdeleted() - set category = "Debug" - set name = "Show qdel() Log" - set desc = "Render the qdel() log and display it" - - var/dat = "List of things that have been qdel()eted this round
" - - var/tmplist = list() - for(var/elem in SSgarbage.qdel_list) - if(!(elem in tmplist)) - tmplist[elem] = 0 - tmplist[elem]++ - - for(var/path in tmplist) - dat += "[path] - [tmplist[path]] times
" - - usr << browse(dat, "window=qdeletedlog") - /datum/proc/DoSearchVar(X, Xname) if(usr && usr.client && !usr.client.running_find_references) return if(istype(X, /datum)) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index d64739698a..1eb6c75cc5 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 78e8b150c3..989c5b43c4 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/machines.dm b/code/controllers/subsystem/machines.dm index eab61d4ef9..db6af6d686 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -40,6 +40,7 @@ SUBSYSTEM_DEF(machines) var/obj/machinery/thing = currentrun[currentrun.len] currentrun.len-- if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL) + thing.SendSignal(COMSIG_MACHINE_PROCESS) if(thing.use_power) thing.auto_use_power() //add back the power state else @@ -61,4 +62,4 @@ SUBSYSTEM_DEF(machines) if (istype(SSmachines.processing)) processing = SSmachines.processing if (istype(SSmachines.powernets)) - powernets = SSmachines.powernets + powernets = SSmachines.powernets \ No newline at end of file diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 2c36e10d31..ab2ba54431 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. @@ -117,7 +117,7 @@ SUBSYSTEM_DEF(mapping) var/start_time = REALTIMEOFDAY INIT_ANNOUNCE("Loading [config.map_name]...") - TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION) + TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION_PRIMARY) INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!") if(SSdbcore.Connect()) var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]") @@ -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 10c6f8e5c4..463b82b13e 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -5,11 +5,11 @@ SUBSYSTEM_DEF(minimap) var/const/MINIMAP_SIZE = 2048 var/const/TILE_SIZE = 8 - var/list/z_levels = list(ZLEVEL_STATION) + var/list/z_levels = list(ZLEVEL_STATION_PRIMARY) /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 0137953a65..22d0315487 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(persistence) var/list/obj/structure/chisel_message/chisel_messages = list() var/list/saved_messages = list() - + var/list/saved_modes = list(1,2,3) var/list/saved_trophies = list() /datum/controller/subsystem/persistence/Initialize() @@ -16,53 +16,60 @@ SUBSYSTEM_DEF(persistence) LoadPoly() LoadChiselMessages() LoadTrophies() + LoadRecentModes() ..() /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 - 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 - 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() - for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,ZLEVEL_STATION), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,ZLEVEL_STATION)))) //Nontrivially expensive but it's roundstart only + + 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() @@ -84,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 @@ -129,13 +135,22 @@ 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"] SetUpTrophies(saved_trophies.Copy()) +/datum/controller/subsystem/persistence/proc/LoadRecentModes() + var/json_file = file("data/RecentModes.json") + if(!fexists(json_file)) + return + var/list/json = json_decode(file2text(json_file)) + if(!json) + return + saved_modes = json["data"] + + /datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items) for(var/A in GLOB.trophy_cases) var/obj/structure/displaycase/trophy/T = A @@ -165,13 +180,14 @@ SUBSYSTEM_DEF(persistence) CollectChiselMessages() CollectSecretSatchels() CollectTrophies() + 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 || F.invisibility != INVISIBILITY_MAXIMUM) + if(QDELETED(F) || F.z != ZLEVEL_STATION_PRIMARY || F.invisibility != INVISIBILITY_MAXIMUM) continue var/list/savable_obj = list() for(var/obj/O in F) @@ -187,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() @@ -224,3 +241,13 @@ SUBSYSTEM_DEF(persistence) data["message"] = T.trophy_message data["placer_key"] = T.placer_key saved_trophies += list(data) + +/datum/controller/subsystem/persistence/proc/CollectRoundtype() + saved_modes[3] = saved_modes[2] + saved_modes[2] = saved_modes[1] + saved_modes[1] = SSticker.mode.config_tag + var/json_file = file("data/RecentModes.json") + var/list/file_data = list() + file_data["data"] = saved_modes + fdel(json_file) + WRITE_FILE(json_file, json_encode(file_data)) \ No newline at end of file diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index ec34cfb8ed..0b8fa750b6 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/server_maint.dm.rej b/code/controllers/subsystem/server_maint.dm.rej deleted file mode 100644 index 486375b505..0000000000 --- a/code/controllers/subsystem/server_maint.dm.rej +++ /dev/null @@ -1,30 +0,0 @@ -diff a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm (rejected hunks) -@@ -6,18 +6,16 @@ SUBSYSTEM_DEF(server_maint) - flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY - priority = 10 - var/list/currentrun -- var/triggertime = null - - /datum/controller/subsystem/server_maint/Initialize(timeofday) - if (config.hub) - world.visibility = 1 -- triggertime = REALTIMEOFDAY - ..() - - /datum/controller/subsystem/server_maint/fire(resumed = FALSE) - if(!resumed) - src.currentrun = GLOB.clients.Copy() -- -+ - var/list/currentrun = src.currentrun - var/round_started = SSticker.HasRoundStarted() - -@@ -39,8 +37,3 @@ SUBSYSTEM_DEF(server_maint) - return - - #undef PING_BUFFER_TIME -- if(config.sql_enabled) -- sql_poll_population() -- if(config.use_exp_tracking) -- if(REALTIMEOFDAY > (triggertime +3000)) //server maint fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire -- update_exp(10,0) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index f9774f8cb5..705f0dbd81 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -176,9 +176,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) @@ -220,7 +220,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) @@ -290,7 +290,7 @@ SUBSYSTEM_DEF(shuttle) continue var/turf/T = get_turf(thing) - if(T && T.z == ZLEVEL_STATION) + if(T && (T.z in GLOB.station_z_levels)) callShuttle = 0 break @@ -384,7 +384,7 @@ SUBSYSTEM_DEF(shuttle) var/travel_dir = M.preferred_direction // Remember, the direction is the direction we appear to be // coming from - var/dock_angle = dir2angle(M.preferred_direction) + M.port_angle + 180 + var/dock_angle = dir2angle(M.preferred_direction) + dir2angle(M.port_direction) + 180 var/dock_dir = angle2dir(dock_angle) var/transit_width = SHUTTLE_TRANSIT_BORDER * 2 @@ -430,17 +430,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 | | | | @@ -478,11 +475,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 d94efd0a4a..0148011e8b 100644 --- a/code/controllers/subsystem/squeak.dm +++ b/code/controllers/subsystem/squeak.dm @@ -1,6 +1,6 @@ // The Squeak // because this is about placement of mice mobs, and nothing to do with -// mice - the computer peripheral +// mice - the computer peripheral SUBSYSTEM_DEF(squeak) name = "Squeak" @@ -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 f245b0766c..97d84a0d3b 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 b0c432f8ac..060fe93219 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" @@ -69,6 +69,9 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/Initialize(timeofday) load_mode() var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n") + var/old_login_music = trim(file2text("data/last_round_lobby_music.txt")) + if(music.len > 1) + music -= old_login_music login_music = pick(music) if(!GLOB.syndicate_code_phrase) @@ -76,16 +79,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() @@ -134,9 +139,10 @@ SUBSYSTEM_DEF(ticker) scripture_states = scripture_unlock_alert(scripture_states) SSshuttle.autoEnd() - 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(1) // Turn it on + toggle_ooc(TRUE) // Turn it on + toggle_dooc(TRUE) declare_completion(force_ending) Master.SetRunLevel(RUNLEVEL_POSTGAME) @@ -163,6 +169,8 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.") return 0 mode = pickweight(runnable_modes) + if(!mode) //too few roundtypes all run too recently + mode = pick(runnable_modes) else mode = config.pick_mode(GLOB.master_mode) @@ -201,8 +209,8 @@ SUBSYSTEM_DEF(ticker) else mode.announce() - if(!config.ooc_during_round) - toggle_ooc(0) // Turn it off + if(!CONFIG_GET(flag/ooc_during_round)) + toggle_ooc(FALSE) // Turn it off CHECK_TICK GLOB.start_landmarks_list = shuffle(GLOB.start_landmarks_list) //Shuffle the order of spawn points so they dont always predictably spawn bottom-up and right-to-left @@ -238,10 +246,10 @@ SUBSYSTEM_DEF(ticker) PostSetup() - return 1 + return TRUE /datum/controller/subsystem/ticker/proc/PostSetup() - set waitfor = 0 + set waitfor = FALSE mode.post_setup() GLOB.start_state = new /datum/station_state() GLOB.start_state.count(1) @@ -267,149 +275,7 @@ SUBSYSTEM_DEF(ticker) qdel(bomb) 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 - if("gang war") //Gang Domination (just show the override screen) - cinematic.icon_state = "intro_malf_still" - flick("intro_malf",cinematic) - 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 - - 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) @@ -469,6 +335,8 @@ 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) @@ -504,7 +372,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 @@ -524,7 +392,7 @@ SUBSYSTEM_DEF(ticker) //Silicon laws report for (var/mob/living/silicon/ai/aiPlayer in GLOB.mob_list) - if (aiPlayer.stat != 2 && aiPlayer.mind) + if (aiPlayer.stat != DEAD && aiPlayer.mind) to_chat(world, "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws at the end of the round were:") aiPlayer.show_laws(1) else if (aiPlayer.mind) //if the dead ai has a mind, use its key instead @@ -544,7 +412,7 @@ SUBSYSTEM_DEF(ticker) for (var/mob/living/silicon/robot/robo in GLOB.mob_list) if (!robo.connected_ai && robo.mind) - if (robo.stat != 2) + if (robo.stat != DEAD) to_chat(world, "[robo.name] (Played by: [robo.mind.key]) survived as an AI-less borg! Its laws were:") else to_chat(world, "[robo.name] (Played by: [robo.mind.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:") @@ -565,7 +433,7 @@ SUBSYSTEM_DEF(ticker) CHECK_TICK - if(config.cross_allowed) + if(CONFIG_GET(string/cross_server_address)) send_news_report() CHECK_TICK @@ -631,7 +499,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++ @@ -639,7 +508,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')) @@ -653,7 +522,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 @@ -663,7 +532,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) @@ -710,13 +579,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 modevoted = SSticker.modevoted @@ -739,10 +606,6 @@ SUBSYSTEM_DEF(ticker) news_message = "We would like to reassure all employees that the reports of a Syndicate backed nuclear attack on [station_name()] are, in fact, a hoax. Have a secure day!" if(STATION_EVACUATED) news_message = "The crew of [station_name()] has been evacuated amid unconfirmed reports of enemy activity." - if(GANG_LOSS) - news_message = "Organized crime aboard [station_name()] has been stamped out by members of our ever vigilant security team. Remember to thank your assigned officers today!" - if(GANG_TAKEOVER) - news_message = "Contact with [station_name()] has been lost after a sophisticated hacking attack by organized criminal elements. Stay vigilant!" if(BLOB_WIN) news_message = "[station_name()] was overcome by an unknown biological outbreak, killing all crew on board. Don't let it happen to you! Remember, a clean work station is a safe work station." if(BLOB_NUKE) @@ -829,7 +692,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) @@ -865,3 +728,4 @@ SUBSYSTEM_DEF(ticker) ) SEND_SOUND(world, sound(round_end_sound)) + text2file(login_music, "data/last_round_lobby_music.txt") diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index c8d5b69e61..804e430ef9 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -69,7 +69,7 @@ SUBSYSTEM_DEF(timer) if (ctime_timer.timeToRun <= REALTIMEOFDAY) --clienttime_timers.len var/datum/callback/callBack = ctime_timer.callBack - ctime_timer.spent = TRUE + ctime_timer.spent = REALTIMEOFDAY callBack.InvokeAsync() qdel(ctime_timer) else @@ -105,11 +105,11 @@ SUBSYSTEM_DEF(timer) if (!callBack) qdel(timer) bucket_resolution = null //force bucket recreation - CRASH("Invalid timer: [timer] timer.timeToRun=[timer.timeToRun]||QDELETED(timer)=[QDELETED(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]") + CRASH("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") if (!timer.spent) spent += timer - timer.spent = TRUE + timer.spent = world.time callBack.InvokeAsync() last_invoke_tick = world.time @@ -135,9 +135,11 @@ SUBSYSTEM_DEF(timer) . = "Timer: [TE]" . += "Prev: [TE.prev ? TE.prev : "NULL"], Next: [TE.next ? TE.next : "NULL"]" if(TE.spent) - . += ", SPENT" + . += ", SPENT([TE.spent])" if(QDELETED(TE)) . += ", QDELETED" + if(!TE.callBack) + . += ", NO CALLBACK" /datum/controller/subsystem/timer/proc/shift_buckets() var/list/bucket_list = src.bucket_list @@ -216,7 +218,7 @@ SUBSYSTEM_DEF(timer) var/timeToRun var/hash var/list/flags - var/spent = FALSE //set to true right before running. + var/spent = 0 //time we ran the timer. var/name //for easy debugging. //cicular doublely linked list var/datum/timedevent/next @@ -243,6 +245,9 @@ SUBSYSTEM_DEF(timer) name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])" + if (spent) + CRASH("HOLY JESUS. WHAT IS THAT? WHAT THE FUCK IS THAT?") + if (callBack.object != GLOBAL_PROC) LAZYADD(callBack.object.active_timers, src) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 0dbc7c5d3a..d377329312 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) @@ -146,7 +146,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) @@ -158,7 +158,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 @@ -169,7 +169,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() @@ -198,8 +198,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 @@ -238,20 +239,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 @@ -275,15 +278,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/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 88102e260c..e66fd4ffeb 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -14,8 +14,8 @@ SUBSYSTEM_DEF(weather) if(W.aesthetic) continue for(var/mob/living/L in GLOB.mob_list) - if(W.can_impact(L)) - W.impact(L) + if(W.can_weather_act(L)) + W.weather_act(L) for(var/Z in eligible_zlevels) var/list/possible_weather_for_this_z = list() for(var/V in existing_weather) @@ -30,8 +30,7 @@ SUBSYSTEM_DEF(weather) /datum/controller/subsystem/weather/Initialize(start_timeofday) ..() for(var/V in subtypesof(/datum/weather)) - var/datum/weather/W = V - new W //weather->New will handle adding itself to the list + new V //Weather's New() will handle adding stuff to the list /datum/controller/subsystem/weather/proc/run_weather(weather_name, Z) if(!weather_name) diff --git a/code/datums/action.dm b/code/datums/action.dm index 8e32e8968f..a65294fa40 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -421,7 +421,7 @@ /datum/action/item_action/ninjapulse name = "EM Burst (25E)" - desc = "Disable any nearby technology with a electro-magnetic pulse." + desc = "Disable any nearby technology with an electro-magnetic pulse." button_icon_state = "emp" icon_icon = 'icons/mob/actions/actions_spells.dmi' @@ -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 diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 24daad00f9..8d86507271 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 0000000000..6d08d61b8a --- /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_brother.dm b/code/datums/antagonists/datum_brother.dm new file mode 100644 index 0000000000..1f799b1bf8 --- /dev/null +++ b/code/datums/antagonists/datum_brother.dm @@ -0,0 +1,48 @@ +/datum/antagonist/brother + name = "Brother" + var/special_role = "blood brother" + var/datum/objective_team/brother_team/team + +/datum/antagonist/brother/New(datum/mind/new_owner, datum/objective_team/brother_team/T) + team = T + return ..() + +/datum/antagonist/brother/on_gain() + SSticker.mode.brothers += owner + owner.special_role = special_role + owner.objectives += team.objectives + finalize_brother() + return ..() + +/datum/antagonist/brother/on_removal() + SSticker.mode.brothers -= owner + team.members -= owner + owner.objectives -= team.objectives + if(owner.current) + to_chat(owner.current,"You are no longer the [special_role]!") + owner.special_role = null + return ..() + +/datum/antagonist/brother/proc/give_meeting_area() + if(!owner.current || !team || !team.meeting_area) + return + to_chat(owner.current, "Your designated meeting area: [team.meeting_area]") + owner.store_memory("Meeting Area: [team.meeting_area]") + +/datum/antagonist/brother/greet() + var/brother_text = "" + var/list/brothers = team.members - owner + for(var/i = 1 to brothers.len) + var/datum/mind/M = brothers[i] + brother_text += M.name + if(i == brothers.len - 1) + brother_text += " and " + else if(i != brothers.len) + brother_text += ", " + to_chat(owner.current, "You are the [owner.special_role] of [brother_text].") + to_chat(owner.current, "The Syndicate only accepts those that have proven themself. Prove yourself and prove your [team.member_name]s by completing your objectives together!") + owner.announce_objectives() + give_meeting_area() + +/datum/antagonist/brother/proc/finalize_brother() + SSticker.mode.update_brother_icons_added(owner) diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index 5dd7a48923..09309a184a 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_cult.dm b/code/datums/antagonists/datum_cult.dm index d17b799ca2..8c05c54b21 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -40,7 +40,7 @@ if(!GLOB.summon_spots.len) while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES) var/area/summon = pick(GLOB.sortedAreas - GLOB.summon_spots) - if(summon && (summon.z == ZLEVEL_STATION) && summon.valid_territory) + if(summon && (summon.z in GLOB.station_z_levels) && summon.valid_territory) GLOB.summon_spots += summon SSticker.mode.cult_objectives += "eldergod" diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm index 245c620dd3..83b61e4cda 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 @@ -173,22 +174,15 @@ if(prob(30)) objective_count += forge_single_objective() + 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) - for(var/i = objective_count, i < config.traitor_objectives_amount, i++) - if(prob(20)) //AI's are less likely to look for a late-joiner than normal traitors - var/datum/objective/assassinate/late/late_objective = new - late_objective.owner = owner - late_objective.find_target() - add_objective(late_objective) - else - 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 @@ -216,10 +210,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 9839dfe4ac..f66fc5a3b2 100644 --- a/code/datums/antagonists/devil.dm +++ b/code/datums/antagonists/devil.dm @@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", update_hud() switch(SOULVALUE) if(0) - to_chat(owner.current, "Your hellish powers have been restored.") + to_chat(owner.current, "Your hellish powers have been restored.") give_appropriate_spells() if(BLOOD_THRESHOLD) increase_blood_lizard() @@ -189,10 +189,10 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", regress_humanoid() if(SOULVALUE < 0) give_appropriate_spells() - to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.") + to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.") /datum/antagonist/devil/proc/regress_humanoid() - to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.") + to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.") if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current H.set_species(/datum/species/human, 1) @@ -204,8 +204,8 @@ 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 + to_chat(D, "Your powers weaken, have more contracts be signed to regain power.") + D.oldform.forceMove(D.drop_location()) owner.transfer_to(D.oldform) give_appropriate_spells() qdel(D) @@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_blood_lizard() - to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") + to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") sleep(50) if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current @@ -232,11 +232,11 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_true_devil() - to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") + to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") 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() @@ -248,7 +248,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", if(!ascendable) return var/mob/living/carbon/true_devil/D = owner.current - to_chat(D, "You feel as though your form is about to ascend.") + to_chat(D, "You feel as though your form is about to ascend.") sleep(50) if(!D) return diff --git a/code/datums/antagonists/ninja.dm b/code/datums/antagonists/ninja.dm index 230a4d64e4..f51b22dde2 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 c854d20f18..cae6e04e9b 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -256,7 +256,6 @@ winset(user, windowid, "on-close=\".windowclose [param]\"") - //to_chat(world, "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]") // the on-close client verb @@ -268,12 +267,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() @@ -281,6 +278,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/callback.dm b/code/datums/callback.dm index 624fed58a6..0fc500e467 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -131,7 +131,7 @@ //runs a list of callbacks asynchronously, returning once all of them return. //callbacks can be repeated. -//callbacks-args is a optional list of argument lists, in the same order as the callbacks, +//callbacks-args is an optional list of argument lists, in the same order as the callbacks, // the inner lists will be sent to the callbacks when invoked() as additional args. //can optionly save and return a list of return values, in the same order as the original list of callbacks //resolution is the number of byond ticks between checks. diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm new file mode 100644 index 0000000000..3f72ff995b --- /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 93a846035f..81218700c1 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 6b902a6ac6..a4c85f7816 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/archaeology.dm b/code/datums/components/archaeology.dm new file mode 100644 index 0000000000..7c61613c41 --- /dev/null +++ b/code/datums/components/archaeology.dm @@ -0,0 +1,92 @@ +/datum/component/archaeology + dupe_type = COMPONENT_DUPE_UNIQUE + var/list/archdrops + var/prob2drop + var/dug + +/datum/component/archaeology/Initialize(_prob2drop, list/_archdrops = list()) + prob2drop = Clamp(_prob2drop, 0, 100) + archdrops = _archdrops + RegisterSignal(COMSIG_PARENT_ATTACKBY,.proc/Dig) + RegisterSignal(COMSIG_ATOM_EX_ACT, .proc/BombDig) + RegisterSignal(COMSIG_ATOM_SING_PULL, .proc/SingDig) + +/datum/component/archaeology/InheritComponent(datum/component/archaeology/A, i_am_original) + var/list/other_archdrops = A.archdrops + var/list/_archdrops = archdrops + for(var/I in other_archdrops) + _archdrops[I] += other_archdrops[I] + +/datum/component/archaeology/proc/Dig(obj/item/W, mob/living/user) + if(dug) + to_chat(user, "Looks like someone has dug here already.") + return FALSE + else + var/digging_speed + if (istype(W, /obj/item/shovel)) + var/obj/item/shovel/S = W + digging_speed = S.digspeed + else if (istype(W, /obj/item/pickaxe)) + var/obj/item/pickaxe/P = W + digging_speed = P.digspeed + + if (digging_speed && isturf(user.loc)) + to_chat(user, "You start digging...") + playsound(parent, 'sound/effects/shovel_dig.ogg', 50, 1) + + if(do_after(user, digging_speed, target = parent)) + to_chat(user, "You dig a hole.") + gets_dug() + dug = TRUE + SSblackbox.add_details("pick_used_mining",W.type) + return TRUE + return FALSE + +/datum/component/archaeology/proc/gets_dug() + if(dug) + return + else + var/turf/open/OT = get_turf(parent) + for(var/thing in archdrops) + var/maxtodrop = archdrops[thing] + for(var/i in 1 to maxtodrop) + if(prob(prob2drop)) // can't win them all! + new thing(OT) + + if(isopenturf(OT)) + if(OT.postdig_icon_change) + if(istype(OT, /turf/open/floor/plating/asteroid/) && !OT.postdig_icon) + var/turf/open/floor/plating/asteroid/AOT = parent + AOT.icon_plating = "[AOT.environment_type]_dug" + AOT.icon_state = "[AOT.environment_type]_dug" + else + if(isplatingturf(OT)) + var/turf/open/floor/plating/POT = parent + POT.icon_plating = "[POT.postdig_icon]" + POT.icon_state = "[OT.postdig_icon]" + + if(OT.slowdown) //Things like snow slow you down until you dig them. + OT.slowdown = 0 + dug = TRUE + +/datum/component/archaeology/proc/SingDig(S, current_size) + switch(current_size) + if(STAGE_THREE) + if(prob(30)) + gets_dug() + if(STAGE_FOUR) + if(prob(50)) + gets_dug() + else + if(current_size >= STAGE_FIVE && prob(70)) + gets_dug() + +/datum/component/archaeology/proc/BombDig(severity, target) + switch(severity) + if(3) + return + if(2) + if(prob(20)) + gets_dug() + if(1) + gets_dug() diff --git a/code/datums/material_container.dm b/code/datums/components/material_container.dm similarity index 59% rename from code/datums/material_container.dm rename to code/datums/components/material_container.dm index a8863c70bc..d4b75e3892 100644 --- a/code/datums/material_container.dm +++ b/code/datums/components/material_container.dm @@ -5,22 +5,35 @@ amount - raw amount of the mineral this container is holding, calculated by the defined value MINERAL_MATERIAL_AMOUNT=2000. max_amount - max raw amount of mineral this container can hold. sheet_type - type of the mineral sheet the container handles, used for output. - owner - object that this container is being used by, used for output. + parent - object that this container is being used by, used for output. MAX_STACK_SIZE - size of a stack of mineral sheets. Constant. */ -/datum/material_container +/datum/component/material_container var/total_amount = 0 var/max_amount var/sheet_type - var/obj/owner - var/list/materials = list() + var/list/materials + 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 //MAX_STACK_SIZE = 50 //MINERAL_MATERIAL_AMOUNT = 2000 -/datum/material_container/New(obj/O, list/mat_list, max_amt = 0) - owner = O +/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition) + materials = list() max_amount = max(0, max_amt) + show_on_examine = _show_on_examine + if(allowed_types) + allowed_typecache = typecacheof(allowed_types) + precondition = _precondition + + RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy) + RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/OnExamine) var/list/possible_mats = list() for(var/mat_type in subtypesof(/datum/material)) @@ -31,12 +44,50 @@ var/mat_path = possible_mats[id] materials[id] = new mat_path() -/datum/material_container/Destroy() - owner = null - return ..() +/datum/component/material_container/proc/OnExamine(mob/user) + for(var/I in materials) + var/datum/material/M = materials[I] + var/amt = amount(M.id) + if(amt) + to_chat(user, "It has [amt] units of [lowertext(M.name)] stored.") + +/datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user) + var/list/tc = allowed_typecache + 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 + var/datum/callback/pc = precondition + if(pc && !pc.Invoke()) + return + var/material_amount = get_item_material_amount(I) + if(!material_amount) + to_chat(user, "[I] does not contain sufficient amounts of metal or glass to be accepted by [parent].") + return + if(!has_space(material_amount)) + to_chat(user, "[parent] is full. Please remove metal or glass from [parent] in order to insert more.") + return + if(!user.temporarilyRemoveItemFromInventory(I)) + to_chat(user, "[I] is stuck to you and cannot be placed into [parent].") + return + var/inserted = insert_item(I) + if(inserted) + last_insert_success = TRUE + if(istype(I, /obj/item/stack)) + to_chat(user, "You insert [inserted] sheet[inserted>1 ? "s" : ""] into [parent].") + if(!QDELETED(I)) + user.put_in_active_hand(I) + else + to_chat(user, "You insert a material total of [inserted] into [parent].") + qdel(I) + else + user.put_in_active_hand(I) //For inserting an amount of material -/datum/material_container/proc/insert_amount(amt, id = null) +/datum/component/material_container/proc/insert_amount(amt, id = null) if(amt > 0 && has_space(amt)) var/total_amount_saved = total_amount if(id) @@ -52,7 +103,7 @@ return (total_amount - total_amount_saved) return 0 -/datum/material_container/proc/insert_stack(obj/item/stack/S, amt = 0) +/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt = 0) if(amt <= 0) return 0 if(amt > S.amount) @@ -66,11 +117,13 @@ 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 return amt -/datum/material_container/proc/insert_item(obj/item/I, multiplier = 1) +/datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1) if(!I) return 0 if(istype(I, /obj/item/stack)) @@ -81,19 +134,26 @@ 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/material_container/proc/insert_materials(obj/item/I, multiplier = 1) //for internal usage only +/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) -/datum/material_container/proc/use_amount(list/mats, multiplier=1) +/datum/component/material_container/proc/use_amount(list/mats, multiplier=1) if(!mats || !mats.len) return 0 @@ -112,7 +172,7 @@ return total_amount_save - total_amount -/datum/material_container/proc/use_amount_type(amt, id) +/datum/component/material_container/proc/use_amount_type(amt, id) var/datum/material/M = materials[id] if(M) if(M.amount >= amt) @@ -121,7 +181,7 @@ return amt return 0 -/datum/material_container/proc/can_use_amount(amt, id, list/mats) +/datum/component/material_container/proc/can_use_amount(amt, id, list/mats) if(amt && id) var/datum/material/M = materials[id] if(M && M.amount >= amt) @@ -136,7 +196,7 @@ return FALSE //For spawning mineral sheets; internal use only -/datum/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null) +/datum/component/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null) if(!M.sheet_type) return 0 if(sheet_amt > 0) @@ -144,12 +204,12 @@ sheet_amt = round(M.amount / MINERAL_MATERIAL_AMOUNT) var/count = 0 while(sheet_amt > MAX_STACK_SIZE) - new M.sheet_type(get_turf(owner), MAX_STACK_SIZE) + new M.sheet_type(get_turf(parent), MAX_STACK_SIZE) count += MAX_STACK_SIZE use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id) sheet_amt -= MAX_STACK_SIZE if(round((sheet_amt * MINERAL_MATERIAL_AMOUNT) / MINERAL_MATERIAL_AMOUNT)) - var/obj/item/stack/sheet/s = new M.sheet_type(get_turf(owner), sheet_amt) + var/obj/item/stack/sheet/s = new M.sheet_type(get_turf(parent), sheet_amt) if(target) s.forceMove(target) count += sheet_amt @@ -157,15 +217,15 @@ return count return 0 -/datum/material_container/proc/retrieve_sheets(sheet_amt, id, target = null) +/datum/component/material_container/proc/retrieve_sheets(sheet_amt, id, target = null) if(materials[id]) return retrieve(sheet_amt, materials[id], target) return 0 -/datum/material_container/proc/retrieve_amount(amt, id, target) +/datum/component/material_container/proc/retrieve_amount(amt, id, target) return retrieve_sheets(amount2sheet(amt), id, target) -/datum/material_container/proc/retrieve_all(target = null) +/datum/component/material_container/proc/retrieve_all(target = null) var/result = 0 var/datum/material/M for(var/MAT in materials) @@ -173,10 +233,10 @@ result += retrieve_sheets(amount2sheet(M.amount), MAT, target) return result -/datum/material_container/proc/has_space(amt = 0) +/datum/component/material_container/proc/has_space(amt = 0) return (total_amount + amt) <= max_amount -/datum/material_container/proc/has_materials(list/mats, multiplier=1) +/datum/component/material_container/proc/has_materials(list/mats, multiplier=1) if(!mats || !mats.len) return 0 @@ -187,23 +247,23 @@ return 0 return 1 -/datum/material_container/proc/amount2sheet(amt) +/datum/component/material_container/proc/amount2sheet(amt) if(amt >= MINERAL_MATERIAL_AMOUNT) return round(amt / MINERAL_MATERIAL_AMOUNT) return 0 -/datum/material_container/proc/sheet2amount(sheet_amt) +/datum/component/material_container/proc/sheet2amount(sheet_amt) if(sheet_amt > 0) return sheet_amt * MINERAL_MATERIAL_AMOUNT return 0 -/datum/material_container/proc/amount(id) +/datum/component/material_container/proc/amount(id) var/datum/material/M = materials[id] return M ? M.amount : 0 //returns the amount of material relevant to this container; //if this container does not support glass, any glass in 'I' will not be taken into account -/datum/material_container/proc/get_item_material_amount(obj/item/I) +/datum/component/material_container/proc/get_item_material_amount(obj/item/I) if(!istype(I)) return 0 var/material_amount = 0 diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 321d407e92..573bb81d11 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 new file mode 100644 index 0000000000..7b9a7866ca --- /dev/null +++ b/code/datums/components/squeek.dm @@ -0,0 +1,48 @@ +/datum/component/squeak + var/static/list/default_squeak_sounds = list('sound/items/toysqueak1.ogg'=1, 'sound/items/toysqueak2.ogg'=1, 'sound/items/toysqueak3.ogg'=1) + var/list/override_squeak_sounds + var/squeak_chance = 100 + var/volume = 30 + + // This is so shoes don't squeak every step + var/steps = 0 + var/step_delay = 1 + + // This is to stop squeak spam from inhand usage + var/last_use = 0 + var/use_delay = 20 + +/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override) + if(custom_sounds) + override_squeak_sounds = custom_sounds + if(chance_override) + squeak_chance = chance_override + if(volume_override) + volume = volume_override + if(step_delay_override) + step_delay = step_delay_override + if(use_delay_override) + use_delay = use_delay_override + + 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)) + if(!override_squeak_sounds) + playsound(parent, pickweight(default_squeak_sounds), volume, 1, -1) + else + playsound(parent, pickweight(override_squeak_sounds), volume, 1, -1) + +/datum/component/squeak/proc/step_squeak() + if(steps > step_delay) + play_squeak() + steps = 0 + else + steps++ + +/datum/component/squeak/proc/use_squeak() + if(last_use + use_delay < world.time) + last_use = world.time + play_squeak() \ No newline at end of file diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 005c02c355..299f6dbac9 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -1,287 +1,287 @@ - -/datum/datacore - var/medical[] = list() - var/medicalPrintCount = 0 - var/general[] = list() - var/security[] = list() - var/securityPrintCount = 0 - var/securityCrimeCounter = 0 - //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). - var/locked[] = list() - -/datum/data - var/name = "data" - -/datum/data/record - name = "record" - var/list/fields = list() - -/datum/data/record/Destroy() - if(src in GLOB.data_core.medical) - GLOB.data_core.medical -= src - if(src in GLOB.data_core.security) - GLOB.data_core.security -= src - if(src in GLOB.data_core.general) - GLOB.data_core.general -= src - if(src in GLOB.data_core.locked) - GLOB.data_core.locked -= src - . = ..() - -/datum/data/crime - name = "crime" - var/crimeName = "" - var/crimeDetails = "" - var/author = "" - var/time = "" - var/dataId = 0 - -/datum/datacore/proc/createCrimeEntry(cname = "", cdetails = "", author = "", time = "") - var/datum/data/crime/c = new /datum/data/crime - c.crimeName = cname - c.crimeDetails = cdetails - c.author = author - c.time = time - c.dataId = ++securityCrimeCounter - return c - -/datum/datacore/proc/addMinorCrime(id = "", datum/data/crime/crime) - for(var/datum/data/record/R in security) - if(R.fields["id"] == id) - var/list/crimes = R.fields["mi_crim"] - crimes |= crime - return - -/datum/datacore/proc/removeMinorCrime(id, cDataId) - for(var/datum/data/record/R in security) - if(R.fields["id"] == id) - var/list/crimes = R.fields["mi_crim"] - for(var/datum/data/crime/crime in crimes) - if(crime.dataId == text2num(cDataId)) - crimes -= crime - return - -/datum/datacore/proc/removeMajorCrime(id, cDataId) - for(var/datum/data/record/R in security) - if(R.fields["id"] == id) - var/list/crimes = R.fields["ma_crim"] - for(var/datum/data/crime/crime in crimes) - if(crime.dataId == text2num(cDataId)) - crimes -= crime - return - -/datum/datacore/proc/addMajorCrime(id = "", datum/data/crime/crime) - for(var/datum/data/record/R in security) - if(R.fields["id"] == id) - var/list/crimes = R.fields["ma_crim"] - crimes |= crime - return - -/datum/datacore/proc/manifest() - for(var/mob/dead/new_player/N in GLOB.player_list) - if(ishuman(N.new_character)) - manifest_inject(N.new_character, N.client) - CHECK_TICK - -/datum/datacore/proc/manifest_modify(name, assignment) - var/datum/data/record/foundrecord = find_record("name", name, GLOB.data_core.general) - if(foundrecord) - foundrecord.fields["rank"] = assignment - -/datum/datacore/proc/get_manifest(monochrome, OOC) - var/list/heads = list() - var/list/sec = list() - var/list/eng = list() - var/list/med = list() - var/list/sci = list() - var/list/sup = list() - var/list/civ = list() - var/list/bot = list() - var/list/misc = list() - var/dat = {" - -
- (E) (C) (-) " - else - header = "
- (E) (C) (M) " - else - header = "
- "
-
- var/item
- if (isnull(value))
- item = "[VV_HTML_ENCODE(name)] = null"
-
- else if (istext(value))
- item = "[VV_HTML_ENCODE(name)] = \"[VV_HTML_ENCODE(value)]\""
-
- else if (isicon(value))
- #ifdef VARSICON
- var/icon/I = new/icon(value)
- var/rnd = rand(1,10000)
- var/rname = "tmp\ref[I][rnd].png"
- usr << browse_rsc(I, rname)
- item = "[VV_HTML_ENCODE(name)] = ([value])
" - #else - item = "[VV_HTML_ENCODE(name)] = /icon ([value])" - #endif - -/* else if (istype(value, /image)) - #ifdef VARSICON - var/rnd = rand(1, 10000) - var/image/I = value - - src << browse_rsc(I.icon, "tmp\ref[value][rnd].png") - html += "[name] =
![](\"tmp\ref[value][rnd].png\")
"
- #else
- html += "[name] = /image ([value])"
- #endif
-*/
- else if (isfile(value))
- item = "[VV_HTML_ENCODE(name)] = '[value]'"
-
- //else if (istype(value, /client))
- // var/client/C = value
- // item = "[VV_HTML_ENCODE(name)] \ref[value] = [C] [C.type]"
-
- else if (istype(value, /datum))
- var/datum/D = value
- if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.
- item = "[VV_HTML_ENCODE(name)] \ref[value] = [D] [D.type]"
- else
- item = "[VV_HTML_ENCODE(name)] \ref[value] = [D.type]"
-
- else if (islist(value))
- var/list/L = value
- var/list/items = list()
-
- if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150)))
- for (var/i in 1 to L.len)
- var/key = L[i]
- var/val
- if (IS_NORMAL_LIST(L) && !isnum(key))
- val = L[key]
- if (!val)
- val = key
- key = i
-
- items += debug_variable(key, val, level + 1, sanitize = sanitize)
-
- item = "[VV_HTML_ENCODE(name)] = /list ([L.len])- [items.Join()]
"
-
-#undef VV_HTML_ENCODE
-
-/client/proc/view_var_Topic(href, href_list, hsrc)
- if( (usr.client != src) || !src.holder )
- return
- if(href_list["Vars"])
- debug_variables(locate(href_list["Vars"]))
-
- else if(href_list["datumrefresh"])
- var/datum/DAT = locate(href_list["datumrefresh"])
- if(!DAT) //can't be an istype() because /client etc aren't datums
- return
- src.debug_variables(DAT)
-
- else if(href_list["mob_player_panel"])
- if(!check_rights(0))
- return
-
+ var/atom/A = D
+ if(isliving(A))
+ atomsnowflake += "[D]"
+ if(A.dir)
+ atomsnowflake += " - (E) (C) (-) " + else + header = "
- (E) (C) (M) " + else + header = "
- "
+
+ var/item
+ if (isnull(value))
+ item = "[VV_HTML_ENCODE(name)] = null"
+
+ else if (istext(value))
+ item = "[VV_HTML_ENCODE(name)] = \"[VV_HTML_ENCODE(value)]\""
+
+ else if (isicon(value))
+ #ifdef VARSICON
+ var/icon/I = new/icon(value)
+ var/rnd = rand(1,10000)
+ var/rname = "tmp\ref[I][rnd].png"
+ usr << browse_rsc(I, rname)
+ item = "[VV_HTML_ENCODE(name)] = ([value]) "
+ #else
+ html += "[name] = /image ([value])"
+ #endif
+*/
+ else if (isfile(value))
+ item = "[VV_HTML_ENCODE(name)] = '[value]'"
+
+ //else if (istype(value, /client))
+ // var/client/C = value
+ // item = "[VV_HTML_ENCODE(name)] \ref[value] = [C] [C.type]"
+
+ else if (istype(value, /datum))
+ var/datum/D = value
+ if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.
+ item = "[VV_HTML_ENCODE(name)] \ref[value] = [D] [D.type]"
+ else
+ item = "[VV_HTML_ENCODE(name)] \ref[value] = [D.type]"
+
+ else if (islist(value))
+ var/list/L = value
+ var/list/items = list()
+
+ if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150)))
+ for (var/i in 1 to L.len)
+ var/key = L[i]
+ var/val
+ if (IS_NORMAL_LIST(L) && !isnum(key))
+ val = L[key]
+ if (!val)
+ val = key
+ key = i
+
+ items += debug_variable(key, val, level + 1, sanitize = sanitize)
+
+ item = "[VV_HTML_ENCODE(name)] = /list ([L.len])
- [items.Join()]
"
+
+#undef VV_HTML_ENCODE
+
+/client/proc/view_var_Topic(href, href_list, hsrc)
+ if( (usr.client != src) || !src.holder || !holder.CheckAdminHref(href, href_list))
+ return
+ if(href_list["Vars"])
+ debug_variables(locate(href_list["Vars"]))
+
+ else if(href_list["datumrefresh"])
+ var/datum/DAT = locate(href_list["datumrefresh"])
+ if(!DAT) //can't be an istype() because /client etc aren't datums
+ return
+ src.debug_variables(DAT)
+
+ else if(href_list["mob_player_panel"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["mob_player_panel"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.holder.show_player_panel(M)
- href_list["datumrefresh"] = href_list["mob_player_panel"]
-
- else if(href_list["godmode"])
- if(!check_rights(R_ADMIN))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ src.holder.show_player_panel(M)
+ href_list["datumrefresh"] = href_list["mob_player_panel"]
+
+ else if(href_list["godmode"])
+ if(!check_rights(R_ADMIN))
+ return
+
var/mob/M = locate(href_list["godmode"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.cmd_admin_godmode(M)
- href_list["datumrefresh"] = href_list["godmode"]
-
- else if(href_list["mark_object"])
- if(!check_rights(0))
- return
-
- var/datum/D = locate(href_list["mark_object"])
- if(!istype(D))
- to_chat(usr, "This can only be done to instances of type /datum")
- return
-
- src.holder.marked_datum = D
- href_list["datumrefresh"] = href_list["mark_object"]
-
- else if(href_list["proc_call"])
- if(!check_rights(0))
- return
-
- var/T = locate(href_list["proc_call"])
-
- if(T)
- callproc_datum(T)
-
- else if(href_list["delete"])
- if(!check_rights(R_DEBUG, 0))
- return
-
- var/datum/D = locate(href_list["delete"])
- if(!D)
- to_chat(usr, "Unable to locate item!")
- admin_delete(D)
- href_list["datumrefresh"] = href_list["delete"]
-
- else if(href_list["regenerateicons"])
- if(!check_rights(0))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ src.cmd_admin_godmode(M)
+ href_list["datumrefresh"] = href_list["godmode"]
+
+ else if(href_list["mark_object"])
+ if(!check_rights(0))
+ return
+
+ var/datum/D = locate(href_list["mark_object"])
+ if(!istype(D))
+ to_chat(usr, "This can only be done to instances of type /datum")
+ return
+
+ src.holder.marked_datum = D
+ href_list["datumrefresh"] = href_list["mark_object"]
+
+ else if(href_list["proc_call"])
+ if(!check_rights(0))
+ return
+
+ var/T = locate(href_list["proc_call"])
+
+ if(T)
+ callproc_datum(T)
+
+ else if(href_list["delete"])
+ if(!check_rights(R_DEBUG, 0))
+ return
+
+ var/datum/D = locate(href_list["delete"])
+ if(!D)
+ to_chat(usr, "Unable to locate item!")
+ admin_delete(D)
+ href_list["datumrefresh"] = href_list["delete"]
+
+ else if(href_list["regenerateicons"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["regenerateicons"]) in GLOB.mob_list
- if(!ismob(M))
- to_chat(usr, "This can only be done to instances of type /mob")
- return
- M.regenerate_icons()
-
-//Needs +VAREDIT past this point
-
- else if(check_rights(R_VAREDIT))
-
-
- //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records).
-
- if(href_list["rename"])
- if(!check_rights(0))
- return
-
+ if(!ismob(M))
+ to_chat(usr, "This can only be done to instances of type /mob")
+ return
+ M.regenerate_icons()
+ else if(href_list["expose"])
+ if(!check_rights(R_ADMIN, FALSE))
+ return
+ var/thing = locate(href_list["expose"])
+ if (!thing)
+ return
+ var/value = vv_get_value(VV_CLIENT)
+ if (value["class"] != VV_CLIENT)
+ return
+ var/client/C = value["value"]
+ if (!C)
+ return
+ var/prompt = alert("Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anything nor open nested vv windows unless they themselves are an admin)", "Confirm", "Yes", "No")
+ if (prompt != "Yes" || !usr.client)
+ return
+ message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window")
+ log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [thing]")
+ to_chat(C, "[usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window")
+ C.debug_variables(thing)
+
+
+//Needs +VAREDIT past this point
+
+ else if(check_rights(R_VAREDIT))
+
+
+ //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records).
+
+ if(href_list["rename"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["rename"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- var/new_name = stripped_input(usr,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN)
- if( !new_name || !M )
- return
-
- message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].")
- M.fully_replace_character_name(M.real_name,new_name)
- href_list["datumrefresh"] = href_list["rename"]
-
- else if(href_list["varnameedit"] && href_list["datumedit"])
- if(!check_rights(0))
- return
-
- var/D = locate(href_list["datumedit"])
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ var/new_name = stripped_input(usr,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN)
+ if( !new_name || !M )
+ return
+
+ message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].")
+ M.fully_replace_character_name(M.real_name,new_name)
+ href_list["datumrefresh"] = href_list["rename"]
+
+ else if(href_list["varnameedit"] && href_list["datumedit"])
+ if(!check_rights(0))
+ return
+
+ var/D = locate(href_list["datumedit"])
if(!istype(D, /datum))
- to_chat(usr, "This can only be used on datums")
- return
-
- modify_variables(D, href_list["varnameedit"], 1)
-
- else if(href_list["varnamechange"] && href_list["datumchange"])
- if(!check_rights(0))
- return
-
- var/D = locate(href_list["datumchange"])
+ to_chat(usr, "This can only be used on datums")
+ return
+
+ modify_variables(D, href_list["varnameedit"], 1)
+
+ else if(href_list["varnamechange"] && href_list["datumchange"])
+ if(!check_rights(0))
+ return
+
+ var/D = locate(href_list["datumchange"])
if(!istype(D, /datum))
- to_chat(usr, "This can only be used on datums")
- return
-
- modify_variables(D, href_list["varnamechange"], 0)
-
- else if(href_list["varnamemass"] && href_list["datummass"])
- if(!check_rights(0))
- return
-
- var/datum/D = locate(href_list["datummass"])
- if(!istype(D))
- to_chat(usr, "This can only be used on instances of type /datum")
- return
-
- cmd_mass_modify_object_variables(D, href_list["varnamemass"])
-
- else if(href_list["listedit"] && href_list["index"])
- var/index = text2num(href_list["index"])
- if (!index)
- return
-
- var/list/L = locate(href_list["listedit"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- mod_list(L, null, "list", "contents", index, autodetect_class = TRUE)
-
- else if(href_list["listchange"] && href_list["index"])
- var/index = text2num(href_list["index"])
- if (!index)
- return
-
- var/list/L = locate(href_list["listchange"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- mod_list(L, null, "list", "contents", index, autodetect_class = FALSE)
-
- else if(href_list["listremove"] && href_list["index"])
- var/index = text2num(href_list["index"])
- if (!index)
- return
-
- var/list/L = locate(href_list["listremove"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- var/variable = L[index]
- var/prompt = alert("Do you want to remove item number [index] from list?", "Confirm", "Yes", "No")
- if (prompt != "Yes")
- return
- L.Cut(index, index+1)
- log_world("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]")
- log_admin("[key_name(src)] modified list's contents: REMOVED=[variable]")
- message_admins("[key_name_admin(src)] modified list's contents: REMOVED=[variable]")
-
- else if(href_list["listadd"])
- var/list/L = locate(href_list["listadd"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- mod_list_add(L, null, "list", "contents")
-
- else if(href_list["listdupes"])
- var/list/L = locate(href_list["listdupes"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- uniqueList_inplace(L)
- log_world("### ListVarEdit by [src]: /list contents: CLEAR DUPES")
- log_admin("[key_name(src)] modified list's contents: CLEAR DUPES")
- message_admins("[key_name_admin(src)] modified list's contents: CLEAR DUPES")
-
- else if(href_list["listnulls"])
- var/list/L = locate(href_list["listnulls"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- listclearnulls(L)
- log_world("### ListVarEdit by [src]: /list contents: CLEAR NULLS")
- log_admin("[key_name(src)] modified list's contents: CLEAR NULLS")
- message_admins("[key_name_admin(src)] modified list's contents: CLEAR NULLS")
-
- else if(href_list["listlen"])
- var/list/L = locate(href_list["listlen"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
- var/value = vv_get_value(VV_NUM)
- if (value["class"] != VV_NUM)
- return
-
- L.len = value["value"]
- log_world("### ListVarEdit by [src]: /list len: [L.len]")
- log_admin("[key_name(src)] modified list's len: [L.len]")
- message_admins("[key_name_admin(src)] modified list's len: [L.len]")
-
- else if(href_list["listshuffle"])
- var/list/L = locate(href_list["listshuffle"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- shuffle_inplace(L)
- log_world("### ListVarEdit by [src]: /list contents: SHUFFLE")
- log_admin("[key_name(src)] modified list's contents: SHUFFLE")
- message_admins("[key_name_admin(src)] modified list's contents: SHUFFLE")
-
- else if(href_list["give_spell"])
- if(!check_rights(0))
- return
-
+ to_chat(usr, "This can only be used on datums")
+ return
+
+ modify_variables(D, href_list["varnamechange"], 0)
+
+ else if(href_list["varnamemass"] && href_list["datummass"])
+ if(!check_rights(0))
+ return
+
+ var/datum/D = locate(href_list["datummass"])
+ if(!istype(D))
+ to_chat(usr, "This can only be used on instances of type /datum")
+ return
+
+ cmd_mass_modify_object_variables(D, href_list["varnamemass"])
+
+ else if(href_list["listedit"] && href_list["index"])
+ var/index = text2num(href_list["index"])
+ if (!index)
+ return
+
+ var/list/L = locate(href_list["listedit"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+
+ mod_list(L, null, "list", "contents", index, autodetect_class = TRUE)
+
+ else if(href_list["listchange"] && href_list["index"])
+ var/index = text2num(href_list["index"])
+ if (!index)
+ return
+
+ var/list/L = locate(href_list["listchange"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+
+ mod_list(L, null, "list", "contents", index, autodetect_class = FALSE)
+
+ else if(href_list["listremove"] && href_list["index"])
+ var/index = text2num(href_list["index"])
+ if (!index)
+ return
+
+ var/list/L = locate(href_list["listremove"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+
+ var/variable = L[index]
+ var/prompt = alert("Do you want to remove item number [index] from list?", "Confirm", "Yes", "No")
+ if (prompt != "Yes")
+ return
+ L.Cut(index, index+1)
+ log_world("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]")
+ log_admin("[key_name(src)] modified list's contents: REMOVED=[variable]")
+ message_admins("[key_name_admin(src)] modified list's contents: REMOVED=[variable]")
+
+ else if(href_list["listadd"])
+ var/list/L = locate(href_list["listadd"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+
+ mod_list_add(L, null, "list", "contents")
+
+ else if(href_list["listdupes"])
+ var/list/L = locate(href_list["listdupes"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+
+ uniqueList_inplace(L)
+ log_world("### ListVarEdit by [src]: /list contents: CLEAR DUPES")
+ log_admin("[key_name(src)] modified list's contents: CLEAR DUPES")
+ message_admins("[key_name_admin(src)] modified list's contents: CLEAR DUPES")
+
+ else if(href_list["listnulls"])
+ var/list/L = locate(href_list["listnulls"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+
+ listclearnulls(L)
+ log_world("### ListVarEdit by [src]: /list contents: CLEAR NULLS")
+ log_admin("[key_name(src)] modified list's contents: CLEAR NULLS")
+ message_admins("[key_name_admin(src)] modified list's contents: CLEAR NULLS")
+
+ else if(href_list["listlen"])
+ var/list/L = locate(href_list["listlen"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+ var/value = vv_get_value(VV_NUM)
+ if (value["class"] != VV_NUM)
+ return
+
+ L.len = value["value"]
+ log_world("### ListVarEdit by [src]: /list len: [L.len]")
+ log_admin("[key_name(src)] modified list's len: [L.len]")
+ message_admins("[key_name_admin(src)] modified list's len: [L.len]")
+
+ else if(href_list["listshuffle"])
+ var/list/L = locate(href_list["listshuffle"])
+ if (!istype(L))
+ to_chat(usr, "This can only be used on instances of type /list")
+ return
+
+ shuffle_inplace(L)
+ log_world("### ListVarEdit by [src]: /list contents: SHUFFLE")
+ log_admin("[key_name(src)] modified list's contents: SHUFFLE")
+ message_admins("[key_name_admin(src)] modified list's contents: SHUFFLE")
+
+ else if(href_list["give_spell"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["give_spell"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.give_spell(M)
- href_list["datumrefresh"] = href_list["give_spell"]
-
- else if(href_list["remove_spell"])
- if(!check_rights(0))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ src.give_spell(M)
+ href_list["datumrefresh"] = href_list["give_spell"]
+
+ else if(href_list["remove_spell"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["remove_spell"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- remove_spell(M)
- href_list["datumrefresh"] = href_list["remove_spell"]
-
- else if(href_list["give_disease"])
- if(!check_rights(0))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ remove_spell(M)
+ href_list["datumrefresh"] = href_list["remove_spell"]
+
+ else if(href_list["give_disease"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["give_disease"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.give_disease(M)
- href_list["datumrefresh"] = href_list["give_spell"]
-
- else if(href_list["gib"])
- if(!check_rights(R_FUN))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ src.give_disease(M)
+ href_list["datumrefresh"] = href_list["give_spell"]
+
+ else if(href_list["gib"])
+ if(!check_rights(R_FUN))
+ return
+
var/mob/M = locate(href_list["gib"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.cmd_admin_gib(M)
-
- else if(href_list["build_mode"])
- if(!check_rights(R_BUILDMODE))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ src.cmd_admin_gib(M)
+
+ else if(href_list["build_mode"])
+ if(!check_rights(R_BUILDMODE))
+ return
+
var/mob/M = locate(href_list["build_mode"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- togglebuildmode(M)
- href_list["datumrefresh"] = href_list["build_mode"]
-
- else if(href_list["drop_everything"])
- if(!check_rights(0))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ togglebuildmode(M)
+ href_list["datumrefresh"] = href_list["build_mode"]
+
+ else if(href_list["drop_everything"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["drop_everything"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- if(usr.client)
- usr.client.cmd_admin_drop_everything(M)
-
- else if(href_list["direct_control"])
- if(!check_rights(0))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ if(usr.client)
+ usr.client.cmd_admin_drop_everything(M)
+
+ else if(href_list["direct_control"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["direct_control"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- if(usr.client)
- usr.client.cmd_assume_direct_control(M)
-
- else if(href_list["offer_control"])
- if(!check_rights(0))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+
+ if(usr.client)
+ usr.client.cmd_assume_direct_control(M)
+
+ else if(href_list["offer_control"])
+ if(!check_rights(0))
+ return
+
var/mob/M = locate(href_list["offer_control"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
- offer_control(M)
-
- else if(href_list["delall"])
- if(!check_rights(R_DEBUG|R_SERVER))
- return
-
- var/obj/O = locate(href_list["delall"])
- if(!isobj(O))
- to_chat(usr, "This can only be used on instances of type /obj")
- return
-
- var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel")
- if(action_type == "Cancel" || !action_type)
- return
-
- if(alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No") != "Yes")
- return
-
- if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes")
- return
-
- var/O_type = O.type
- switch(action_type)
- if("Strict type")
- var/i = 0
- for(var/obj/Obj in world)
- if(Obj.type == O_type)
- i++
- qdel(Obj)
- CHECK_TICK
- if(!i)
- to_chat(usr, "No objects of this type exist")
- return
- log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
- message_admins("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
- if("Type and subtypes")
- var/i = 0
- for(var/obj/Obj in world)
- if(istype(Obj,O_type))
- i++
- qdel(Obj)
- CHECK_TICK
- if(!i)
- to_chat(usr, "No objects of this type exist")
- return
- log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
- message_admins("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
-
- else if(href_list["addreagent"])
- if(!check_rights(0))
- return
-
- var/atom/A = locate(href_list["addreagent"])
-
- if(!A.reagents)
- var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num
- if(amount)
- A.create_reagents(amount)
-
- if(A.reagents)
- var/chosen_id
- var/list/reagent_options = sortList(GLOB.chemical_reagents_list)
- switch(alert(usr, "Choose a method.", "Add Reagents", "Enter ID", "Choose ID"))
- if("Enter ID")
- var/valid_id
- while(!valid_id)
- chosen_id = stripped_input(usr, "Enter the ID of the reagent you want to add.")
- if(!chosen_id) //Get me out of here!
- break
- for(var/ID in reagent_options)
- if(ID == chosen_id)
- valid_id = 1
- if(!valid_id)
- to_chat(usr, "A reagent with that ID doesn't exist!")
- if("Choose ID")
- chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in reagent_options
- if(chosen_id)
- var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num
- if(amount)
- A.reagents.add_reagent(chosen_id, amount)
- log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]")
- message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]")
-
- href_list["datumrefresh"] = href_list["addreagent"]
-
- else if(href_list["explode"])
- if(!check_rights(R_FUN))
- return
-
- var/atom/A = locate(href_list["explode"])
- if(!isobj(A) && !ismob(A) && !isturf(A))
- to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
- return
-
- src.cmd_admin_explosion(A)
- href_list["datumrefresh"] = href_list["explode"]
-
- else if(href_list["emp"])
- if(!check_rights(R_FUN))
- return
-
- var/atom/A = locate(href_list["emp"])
- if(!isobj(A) && !ismob(A) && !isturf(A))
- to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
- return
-
- src.cmd_admin_emp(A)
- href_list["datumrefresh"] = href_list["emp"]
-
- else if(href_list["rotatedatum"])
- if(!check_rights(0))
- return
-
- var/atom/A = locate(href_list["rotatedatum"])
- if(!istype(A))
- to_chat(usr, "This can only be done to instances of type /atom")
- return
-
- switch(href_list["rotatedir"])
- if("right")
- A.setDir(turn(A.dir, -45))
- if("left")
- A.setDir(turn(A.dir, 45))
- href_list["datumrefresh"] = href_list["rotatedatum"]
-
- else if(href_list["editorgans"])
- if(!check_rights(0))
- return
-
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ return
+ offer_control(M)
+
+ else if(href_list["delall"])
+ if(!check_rights(R_DEBUG|R_SERVER))
+ return
+
+ var/obj/O = locate(href_list["delall"])
+ if(!isobj(O))
+ to_chat(usr, "This can only be used on instances of type /obj")
+ return
+
+ var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel")
+ if(action_type == "Cancel" || !action_type)
+ return
+
+ if(alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No") != "Yes")
+ return
+
+ if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes")
+ return
+
+ var/O_type = O.type
+ switch(action_type)
+ if("Strict type")
+ var/i = 0
+ for(var/obj/Obj in world)
+ if(Obj.type == O_type)
+ i++
+ qdel(Obj)
+ CHECK_TICK
+ if(!i)
+ to_chat(usr, "No objects of this type exist")
+ return
+ log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
+ message_admins("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
+ if("Type and subtypes")
+ var/i = 0
+ for(var/obj/Obj in world)
+ if(istype(Obj,O_type))
+ i++
+ qdel(Obj)
+ CHECK_TICK
+ if(!i)
+ to_chat(usr, "No objects of this type exist")
+ return
+ log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
+ message_admins("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
+
+ else if(href_list["addreagent"])
+ if(!check_rights(0))
+ return
+
+ var/atom/A = locate(href_list["addreagent"])
+
+ if(!A.reagents)
+ var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num
+ if(amount)
+ A.create_reagents(amount)
+
+ if(A.reagents)
+ var/chosen_id
+ var/list/reagent_options = sortList(GLOB.chemical_reagents_list)
+ switch(alert(usr, "Choose a method.", "Add Reagents", "Enter ID", "Choose ID"))
+ if("Enter ID")
+ var/valid_id
+ while(!valid_id)
+ chosen_id = stripped_input(usr, "Enter the ID of the reagent you want to add.")
+ if(!chosen_id) //Get me out of here!
+ break
+ for(var/ID in reagent_options)
+ if(ID == chosen_id)
+ valid_id = 1
+ if(!valid_id)
+ to_chat(usr, "A reagent with that ID doesn't exist!")
+ if("Choose ID")
+ chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in reagent_options
+ if(chosen_id)
+ var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num
+ if(amount)
+ A.reagents.add_reagent(chosen_id, amount)
+ log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]")
+ message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]")
+
+ href_list["datumrefresh"] = href_list["addreagent"]
+
+ else if(href_list["explode"])
+ if(!check_rights(R_FUN))
+ return
+
+ var/atom/A = locate(href_list["explode"])
+ if(!isobj(A) && !ismob(A) && !isturf(A))
+ to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
+ return
+
+ src.cmd_admin_explosion(A)
+ href_list["datumrefresh"] = href_list["explode"]
+
+ else if(href_list["emp"])
+ if(!check_rights(R_FUN))
+ return
+
+ var/atom/A = locate(href_list["emp"])
+ if(!isobj(A) && !ismob(A) && !isturf(A))
+ to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
+ return
+
+ src.cmd_admin_emp(A)
+ href_list["datumrefresh"] = href_list["emp"]
+
+ else if(href_list["rotatedatum"])
+ if(!check_rights(0))
+ return
+
+ var/atom/A = locate(href_list["rotatedatum"])
+ if(!istype(A))
+ to_chat(usr, "This can only be done to instances of type /atom")
+ return
+
+ switch(href_list["rotatedir"])
+ if("right")
+ A.setDir(turn(A.dir, -45))
+ if("left")
+ A.setDir(turn(A.dir, 45))
+ href_list["datumrefresh"] = href_list["rotatedatum"]
+
+ else if(href_list["editorgans"])
+ if(!check_rights(0))
+ return
+
var/mob/living/carbon/C = locate(href_list["editorgans"]) in GLOB.mob_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- manipulate_organs(C)
- href_list["datumrefresh"] = href_list["editorgans"]
-
+ if(!istype(C))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
+ return
+
+ manipulate_organs(C)
+ href_list["datumrefresh"] = href_list["editorgans"]
+
else if(href_list["hallucinate"])
if(!check_rights(0))
return
@@ -949,238 +970,238 @@
if(result)
new result(C, TRUE)
- else if(href_list["makehuman"])
- if(!check_rights(R_SPAWN))
- return
-
+ else if(href_list["makehuman"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list
- if(!istype(Mo))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!Mo)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("humanone"=href_list["makehuman"]))
-
- else if(href_list["makemonkey"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(Mo))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey")
+ return
+
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ if(!Mo)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ holder.Topic(href, list("humanone"=href_list["makehuman"]))
+
+ else if(href_list["makemonkey"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/human/H = locate(href_list["makemonkey"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("monkeyone"=href_list["makemonkey"]))
-
- else if(href_list["makerobot"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(H))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
+ return
+
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ if(!H)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ holder.Topic(href, list("monkeyone"=href_list["makemonkey"]))
+
+ else if(href_list["makerobot"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/human/H = locate(href_list["makerobot"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("makerobot"=href_list["makerobot"]))
-
- else if(href_list["makealien"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(H))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
+ return
+
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ if(!H)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ holder.Topic(href, list("makerobot"=href_list["makerobot"]))
+
+ else if(href_list["makealien"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/human/H = locate(href_list["makealien"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("makealien"=href_list["makealien"]))
-
- else if(href_list["makeslime"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(H))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
+ return
+
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ if(!H)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ holder.Topic(href, list("makealien"=href_list["makealien"]))
+
+ else if(href_list["makeslime"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/human/H = locate(href_list["makeslime"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("makeslime"=href_list["makeslime"]))
-
- else if(href_list["makeai"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(H))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
+ return
+
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ if(!H)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ holder.Topic(href, list("makeslime"=href_list["makeslime"]))
+
+ else if(href_list["makeai"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/H = locate(href_list["makeai"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("makeai"=href_list["makeai"]))
-
- else if(href_list["setspecies"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(H))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
+ return
+
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ if(!H)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ holder.Topic(href, list("makeai"=href_list["makeai"]))
+
+ else if(href_list["setspecies"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/human/H = locate(href_list["setspecies"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- var/result = input(usr, "Please choose a new species","Species") as null|anything in GLOB.species_list
-
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- if(result)
- var/newtype = GLOB.species_list[result]
- admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [H] to [result]")
- H.set_species(newtype)
-
- else if(href_list["editbodypart"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(H))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
+ return
+
+ var/result = input(usr, "Please choose a new species","Species") as null|anything in GLOB.species_list
+
+ if(!H)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+
+ if(result)
+ var/newtype = GLOB.species_list[result]
+ admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [H] to [result]")
+ H.set_species(newtype)
+
+ else if(href_list["editbodypart"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/C = locate(href_list["editbodypart"]) in GLOB.mob_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("add","remove", "augment")
- if(!edit_action)
- return
- var/list/limb_list = list("head", "l_arm", "r_arm", "l_leg", "r_leg")
- if(edit_action == "augment")
- limb_list += "chest"
- var/result = input(usr, "Please choose which body part to [edit_action]","[capitalize(edit_action)] Body Part") as null|anything in limb_list
-
- if(!C)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- if(result)
- var/obj/item/bodypart/BP = C.get_bodypart(result)
- switch(edit_action)
- if("remove")
- if(BP)
- BP.drop_limb()
- else
- to_chat(usr, "[C] doesn't have such bodypart.")
- if("add")
- if(BP)
- to_chat(usr, "[C] already has such bodypart.")
- else
- if(!C.regenerate_limb(result))
- to_chat(usr, "[C] cannot have such bodypart.")
- if("augment")
- if(ishuman(C))
- if(BP)
- BP.change_bodypart_status(BODYPART_ROBOTIC, TRUE, TRUE)
- else
- to_chat(usr, "[C] doesn't have such bodypart.")
- else
- to_chat(usr, "Only humans can be augmented.")
- admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [C]")
-
-
- else if(href_list["purrbation"])
- if(!check_rights(R_SPAWN))
- return
-
+ if(!istype(C))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
+ return
+
+ var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("add","remove", "augment")
+ if(!edit_action)
+ return
+ var/list/limb_list = list("head", "l_arm", "r_arm", "l_leg", "r_leg")
+ if(edit_action == "augment")
+ limb_list += "chest"
+ var/result = input(usr, "Please choose which body part to [edit_action]","[capitalize(edit_action)] Body Part") as null|anything in limb_list
+
+ if(!C)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+
+ if(result)
+ var/obj/item/bodypart/BP = C.get_bodypart(result)
+ switch(edit_action)
+ if("remove")
+ if(BP)
+ BP.drop_limb()
+ else
+ to_chat(usr, "[C] doesn't have such bodypart.")
+ if("add")
+ if(BP)
+ to_chat(usr, "[C] already has such bodypart.")
+ else
+ if(!C.regenerate_limb(result))
+ to_chat(usr, "[C] cannot have such bodypart.")
+ if("augment")
+ if(ishuman(C))
+ if(BP)
+ BP.change_bodypart_status(BODYPART_ROBOTIC, TRUE, TRUE)
+ else
+ to_chat(usr, "[C] doesn't have such bodypart.")
+ else
+ to_chat(usr, "Only humans can be augmented.")
+ admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [C]")
+
+
+ else if(href_list["purrbation"])
+ if(!check_rights(R_SPAWN))
+ return
+
var/mob/living/carbon/human/H = locate(href_list["purrbation"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
- if(!ishumanbasic(H))
- to_chat(usr, "This can only be done to the basic human species at the moment.")
- return
-
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- var/success = purrbation_toggle(H)
- if(success)
- to_chat(usr, "Put [H] on purrbation.")
- log_admin("[key_name(usr)] has put [key_name(H)] on purrbation.")
- var/msg = "[key_name_admin(usr)] has put [key_name(H)] on purrbation."
- message_admins(msg)
- admin_ticket_log(H, msg)
-
- else
- to_chat(usr, "Removed [H] from purrbation.")
- log_admin("[key_name(usr)] has removed [key_name(H)] from purrbation.")
- var/msg = "[key_name_admin(usr)] has removed [key_name(H)] from purrbation."
- message_admins(msg)
- admin_ticket_log(H, msg)
-
- else if(href_list["adjustDamage"] && href_list["mobToDamage"])
- if(!check_rights(0))
- return
-
+ if(!istype(H))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
+ return
+ if(!ishumanbasic(H))
+ to_chat(usr, "This can only be done to the basic human species at the moment.")
+ return
+
+ if(!H)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+
+ var/success = purrbation_toggle(H)
+ if(success)
+ to_chat(usr, "Put [H] on purrbation.")
+ log_admin("[key_name(usr)] has put [key_name(H)] on purrbation.")
+ var/msg = "[key_name_admin(usr)] has put [key_name(H)] on purrbation."
+ message_admins(msg)
+ admin_ticket_log(H, msg)
+
+ else
+ to_chat(usr, "Removed [H] from purrbation.")
+ log_admin("[key_name(usr)] has removed [key_name(H)] from purrbation.")
+ var/msg = "[key_name_admin(usr)] has removed [key_name(H)] from purrbation."
+ message_admins(msg)
+ admin_ticket_log(H, msg)
+
+ else if(href_list["adjustDamage"] && href_list["mobToDamage"])
+ if(!check_rights(0))
+ return
+
var/mob/living/L = locate(href_list["mobToDamage"]) in GLOB.mob_list
- if(!istype(L))
- return
-
- var/Text = href_list["adjustDamage"]
-
- var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
-
- if(!L)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- switch(Text)
- if("brute")
- L.adjustBruteLoss(amount)
- if("fire")
- L.adjustFireLoss(amount)
- if("toxin")
- L.adjustToxLoss(amount)
- if("oxygen")
- L.adjustOxyLoss(amount)
- if("brain")
- L.adjustBrainLoss(amount)
- if("clone")
- L.adjustCloneLoss(amount)
- if("stamina")
- L.adjustStaminaLoss(amount)
- else
- to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]")
- return
-
- if(amount != 0)
- log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
- var/msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [L] "
- message_admins(msg)
- admin_ticket_log(L, msg)
- href_list["datumrefresh"] = href_list["mobToDamage"]
-
+ if(!istype(L))
+ return
+
+ var/Text = href_list["adjustDamage"]
+
+ var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
+
+ if(!L)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+
+ switch(Text)
+ if("brute")
+ L.adjustBruteLoss(amount)
+ if("fire")
+ L.adjustFireLoss(amount)
+ if("toxin")
+ L.adjustToxLoss(amount)
+ if("oxygen")
+ L.adjustOxyLoss(amount)
+ if("brain")
+ L.adjustBrainLoss(amount)
+ if("clone")
+ L.adjustCloneLoss(amount)
+ if("stamina")
+ L.adjustStaminaLoss(amount)
+ else
+ to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]")
+ return
+
+ if(amount != 0)
+ log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
+ var/msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [L] "
+ message_admins(msg)
+ admin_ticket_log(L, msg)
+ href_list["datumrefresh"] = href_list["mobToDamage"]
+
diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
index 1d3e7f2a12..a00d43ad8f 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 7f09ffa48c..26f42fa059 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
@@ -413,7 +408,7 @@
AD.Refresh()
for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list))
- if(H.z != ZLEVEL_STATION)
+ if(!(H.z in GLOB.station_z_levels))
continue
if(!H.HasDisease(D))
H.ForceContractDisease(D)
diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm
index 07809d3555..1a197f0f34 100644
--- a/code/datums/diseases/advance/presets.dm
+++ b/code/datums/diseases/advance/presets.dm
@@ -34,20 +34,20 @@
..(process, D, copy)
-// Hullucigen
+// Hallucigen
-/datum/disease/advance/hullucigen/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
+/datum/disease/advance/hallucigen/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
if(!D)
- name = "Reality Impairment"
+ name = "Second Sight"
symptoms = list(new/datum/symptom/hallucigen)
..(process, D, copy)
// Sensory Restoration
-/datum/disease/advance/sensory_restoration/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
+/datum/disease/advance/mind_restoration/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
if(!D)
- name = "Reality Enhancer"
- symptoms = list(new/datum/symptom/sensory_restoration)
+ name = "Intelligence Booster"
+ symptoms = list(new/datum/symptom/mind_restoration)
..(process, D, copy)
// Sensory Destruction
diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm
index 2f8635301e..aa3919f3cf 100644
--- a/code/datums/diseases/advance/symptoms/beard.dm
+++ b/code/datums/diseases/advance/symptoms/beard.dm
@@ -17,6 +17,7 @@ BONUS
/datum/symptom/beard
name = "Facial Hypertrichosis"
+ desc = "The virus increases hair production significantly, causing rapid beard growth."
stealth = -3
resistance = -1
stage_speed = -3
diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm
index a46ef690ef..f7f998f2b1 100644
--- a/code/datums/diseases/advance/symptoms/choking.dm
+++ b/code/datums/diseases/advance/symptoms/choking.dm
@@ -18,6 +18,7 @@ Bonus
/datum/symptom/choking
name = "Choking"
+ desc = "The virus causes inflammation of the host's air conduits, leading to intermittent choking."
stealth = -3
resistance = -2
stage_speed = -2
@@ -27,6 +28,8 @@ Bonus
base_message_chance = 15
symptom_delay_min = 10
symptom_delay_max = 30
+ threshold_desc = "Stage Speed 8: Causes choking more frequently. - Conspirator: [M.name] " + output += "
- 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! \ +
- " - if(R.amount > 0) - dat += "Vend " - else - dat += "Sold out " - dat += "[sanitize(R.product_name)]:" - dat += " [R.amount]" - dat += " " - dat += "
- " + if(R.amount > 0) + dat += "Vend " + else + dat += "Sold out " + dat += "[sanitize(R.product_name)]:" + dat += " [R.amount]" + dat += " " + dat += "
- 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. \
- ??? \
- \[-\][key] " + . += "
- \[-\][key] " . += "\n" /datum/admins/proc/stickyban_show() @@ -185,7 +185,7 @@
- [path]
- "
+ if (I.failures)
+ dellog += "
- Failures: [I.failures] " + dellog += "
- qdel() Count: [I.qdels] " + dellog += "
- Destroy() Cost: [I.destroy_time]ms " + if (I.hard_deletes) + dellog += "
- Total Hard Deletes [I.hard_deletes] " + dellog += "
- Time Spent Hard Deleting: [I.hard_delete_time]ms " + if (I.slept_destroy) + dellog += "
- Sleeps: [I.slept_destroy] " + if (I.no_respect_force) + dellog += "
- Ignored force: [I.no_respect_force] " + if (I.no_hint) + dellog += "
- No hint: [I.no_hint] " + dellog += "
"
- dat += "List of paths that did not return a qdel hint in Destroy()
| Name | Rank | |
|---|---|---|
| Heads | [name] | [heads[name]] | " - even = !even - if(sec.len > 0) - dat += "
| Security | [name] | [sec[name]] | " - even = !even - if(eng.len > 0) - dat += "
| Engineering | [name] | [eng[name]] | " - even = !even - if(med.len > 0) - dat += "
| Medical | [name] | [med[name]] | " - even = !even - if(sci.len > 0) - dat += "
| Science | [name] | [sci[name]] | " - even = !even - if(sup.len > 0) - dat += "
| Supply | [name] | [sup[name]] | " - even = !even - if(civ.len > 0) - dat += "
| Civilian | [name] | [civ[name]] | " - even = !even - // in case somebody is insane and added them to the manifest, why not - if(bot.len > 0) - dat += "
| Silicon | [name] | [bot[name]] | " - even = !even - // misc guys - if(misc.len > 0) - dat += "
| Miscellaneous | [name] | [misc[name]] | " - even = !even - - dat += "
| Name | Rank | |
|---|---|---|
| Heads | [name] | [heads[name]] | " + even = !even + if(sec.len > 0) + dat += "
| Security | [name] | [sec[name]] | " + even = !even + if(eng.len > 0) + dat += "
| Engineering | [name] | [eng[name]] | " + even = !even + if(med.len > 0) + dat += "
| Medical | [name] | [med[name]] | " + even = !even + if(sci.len > 0) + dat += "
| Science | [name] | [sci[name]] | " + even = !even + if(sup.len > 0) + dat += "
| Supply | [name] | [sup[name]] | " + even = !even + if(civ.len > 0) + dat += "
| Civilian | [name] | [civ[name]] | " + even = !even + // in case somebody is insane and added them to the manifest, why not + if(bot.len > 0) + dat += "
| Silicon | [name] | [bot[name]] | " + even = !even + // misc guys + if(misc.len > 0) + dat += "
| Miscellaneous | [name] | [misc[name]] | " + even = !even + + dat += "
<< [dir2text(A.dir)] >>" - var/mob/living/M = A - atomsnowflake += {" -
[M.ckey ? M.ckey : "No ckey"] / [M.real_name ? M.real_name : "No real name"] -
- BRUTE:[M.getBruteLoss()] - FIRE:[M.getFireLoss()] - TOXIN:[M.getToxLoss()] - OXY:[M.getOxyLoss()] - CLONE:[M.getCloneLoss()] - BRAIN:[M.getBrainLoss()] - STAMINA:[M.getStaminaLoss()] - - "} - else - atomsnowflake += "[D]" - if(A.dir) - atomsnowflake += "
<< [dir2text(A.dir)] >>" - else - atomsnowflake += "[D]" - - var/formatted_type = "[type]" - if(length(formatted_type) > 25) - var/middle_point = length(formatted_type) / 2 - var/splitpoint = findtext(formatted_type,"/",middle_point) - if(splitpoint) - formatted_type = "[copytext(formatted_type,1,splitpoint)]
[copytext(formatted_type,splitpoint)]" - else - formatted_type = "Type too long" //No suitable splitpoint (/) found. - - var/marked - if(holder.marked_datum && holder.marked_datum == D) - marked = "
Marked Object" - var/varedited_line = "" - if(!islist && D.var_edited) - varedited_line = "
Var Edited" - - var/list/dropdownoptions = list() - if (islist) - dropdownoptions = list( - "---", - "Add Item" = "?_src_=vars;listadd=[refid]", - "Remove Nulls" = "?_src_=vars;listnulls=[refid]", - "Remove Dupes" = "?_src_=vars;listdupes=[refid]", - "Set len" = "?_src_=vars;listlen=[refid]", - "Shuffle" = "?_src_=vars;listshuffle=[refid]" - ) - else - dropdownoptions = D.vv_get_dropdown() - var/list/dropdownoptions_html = list() - - for (var/name in dropdownoptions) - var/link = dropdownoptions[name] - if (link) - dropdownoptions_html += "" - else - dropdownoptions_html += "" - - var/list/names = list() - if (!islist) - for (var/V in D.vars) - names += V - sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects. - - var/list/variable_html = list() - if (islist) - var/list/L = D - for (var/i in 1 to L.len) - var/key = L[i] - var/value - if (IS_NORMAL_LIST(L) && !isnum(key)) - value = L[key] - variable_html += debug_variable(i, value, 0, D) - else - - names = sortList(names) - for (var/V in names) - if(D.can_vv_get(V)) - variable_html += D.vv_get_var(V) - - var/html = {" - - -
-
- [formatted_type]
- [marked]
- [varedited_line]
-
- |
-
-
- Refresh
-
-
- |
-
- - E - Edit, tries to determine the variable type by itself.
- C - Change, asks you for the var type first.
- M - Mass modify: changes this variable for all objects of this type.
- -
-
|
-
- Search:
-
- |
- - - | -
-
-
- [variable_html.Join()]
-
<< [dir2text(A.dir)] >>" + var/mob/living/M = A + atomsnowflake += {" +
[M.ckey ? M.ckey : "No ckey"] / [M.real_name ? M.real_name : "No real name"] +
+ BRUTE:[M.getBruteLoss()] + FIRE:[M.getFireLoss()] + TOXIN:[M.getToxLoss()] + OXY:[M.getOxyLoss()] + CLONE:[M.getCloneLoss()] + BRAIN:[M.getBrainLoss()] + STAMINA:[M.getStaminaLoss()] + + "} + else + atomsnowflake += "[D]" + if(A.dir) + atomsnowflake += "
<< [dir2text(A.dir)] >>" + else + atomsnowflake += "[D]" + + var/formatted_type = "[type]" + if(length(formatted_type) > 25) + var/middle_point = length(formatted_type) / 2 + var/splitpoint = findtext(formatted_type,"/",middle_point) + if(splitpoint) + formatted_type = "[copytext(formatted_type,1,splitpoint)]
[copytext(formatted_type,splitpoint)]" + else + formatted_type = "Type too long" //No suitable splitpoint (/) found. + + var/marked + if(holder && holder.marked_datum && holder.marked_datum == D) + marked = "
Marked Object" + var/varedited_line = "" + if(!islist && D.var_edited) + varedited_line = "
Var Edited" + + var/list/dropdownoptions = list() + if (islist) + dropdownoptions = list( + "---", + "Add Item" = "?_src_=vars;[HrefToken()];listadd=[refid]", + "Remove Nulls" = "?_src_=vars;[HrefToken()];listnulls=[refid]", + "Remove Dupes" = "?_src_=vars;[HrefToken()];listdupes=[refid]", + "Set len" = "?_src_=vars;[HrefToken()];listlen=[refid]", + "Shuffle" = "?_src_=vars;[HrefToken()];listshuffle=[refid]", + "Show VV To Player" = "?_src_=vars;[HrefToken()];expose=[refid]" + ) + else + dropdownoptions = D.vv_get_dropdown() + var/list/dropdownoptions_html = list() + + for (var/name in dropdownoptions) + var/link = dropdownoptions[name] + if (link) + dropdownoptions_html += "" + else + dropdownoptions_html += "" + + var/list/names = list() + if (!islist) + for (var/V in D.vars) + names += V + sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects. + + var/list/variable_html = list() + if (islist) + var/list/L = D + for (var/i in 1 to L.len) + var/key = L[i] + var/value + if (IS_NORMAL_LIST(L) && !isnum(key)) + value = L[key] + variable_html += debug_variable(i, value, 0, D) + else + + names = sortList(names) + for (var/V in names) + if(D.can_vv_get(V)) + variable_html += D.vv_get_var(V) + + var/html = {" + + +
+
+ [formatted_type]
+ [marked]
+ [varedited_line]
+
+ |
+
+
+ Refresh
+
+
+ |
+
+ + E - Edit, tries to determine the variable type by itself.
+ C - Change, asks you for the var type first.
+ M - Mass modify: changes this variable for all objects of this type.
+ +
+
|
+
+ Search:
+
+ |
+ + + | +
+
-
+ [variable_html.Join()]
+
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/choking/Start(datum/disease/advance/A) ..() @@ -84,6 +87,7 @@ Bonus /datum/symptom/asphyxiation name = "Acute respiratory distress syndrome" + desc = "The virus causes shrinking of the host's lungs, causing severe asphyxiation. May also lead to heart attacks." stealth = -2 resistance = -0 stage_speed = -1 diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index 45bf5d6182..2e252267c4 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/confusion name = "Confusion" + desc = "The virus interferes with the proper function of the neural system, leading to bouts of confusion and erratic movement." stealth = 1 resistance = -1 stage_speed = -3 @@ -28,6 +29,9 @@ Bonus symptom_delay_min = 10 symptom_delay_max = 30 var/brain_damage = FALSE + threshold_desc = "Resistance 6: Causes brain damage over time.
\ + Transmission 6: Increases confusion duration.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/confusion/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index a05d1d5e88..95577fe351 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -18,6 +18,7 @@ BONUS /datum/symptom/cough name = "Cough" + desc = "The virus irritates the throat of the host, causing occasional coughing." stealth = -1 resistance = 3 stage_speed = 1 @@ -28,6 +29,11 @@ BONUS symptom_delay_min = 2 symptom_delay_max = 15 var/infective = FALSE + threshold_desc = "Resistance 3: Host will drop small items when coughing.
\ + Resistance 10: Occasionally causes coughing fits that stun the host.
\ + Stage Speed 6: Increases cough frequency.
\ + If Airborne: Coughing will infect bystanders.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/cough/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index b6163a72a1..c43970563d 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/deafness name = "Deafness" + desc = "The virus causes inflammation of the eardrums, causing intermittent deafness." stealth = -1 resistance = -2 stage_speed = -1 @@ -27,6 +28,8 @@ Bonus base_message_chance = 100 symptom_delay_min = 25 symptom_delay_max = 80 + threshold_desc = "Resistance 9: Causes permanent deafness, instead of intermittent.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/deafness/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index 60e9989d4a..cb1bf11e63 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -18,7 +18,7 @@ Bonus /datum/symptom/dizzy // Not the egg name = "Dizziness" - stealth = 2 + desc = "The virus causes inflammation of the vestibular system, leading to bouts of dizziness." resistance = -2 stage_speed = -3 transmittable = -1 @@ -27,6 +27,8 @@ Bonus base_message_chance = 50 symptom_delay_min = 15 symptom_delay_max = 40 + threshold_desc = "Transmission 6: Also causes druggy vision.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/dizzy/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index e69c3bf0a2..673835b0ed 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -16,8 +16,8 @@ Bonus */ /datum/symptom/fever - name = "Fever" + desc = "The virus causes a febrile response from the host, raising its body temperature." stealth = 0 resistance = 3 stage_speed = 3 @@ -28,6 +28,8 @@ Bonus symptom_delay_min = 10 symptom_delay_max = 30 var/unsafe = FALSE //over the heat threshold + threshold_desc = "Resistance 5: Increases fever intensity, fever can overheat and harm the host.
\ + Resistance 10: Further increases fever intensity." /datum/symptom/fever/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index b8d80b8023..e12e705350 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/fire name = "Spontaneous Combustion" + desc = "The virus turns fat into an extremely flammable compound, and raises the body's temperature, making the host burst into flames spontaneously." stealth = 1 resistance = -4 stage_speed = -4 @@ -28,6 +29,10 @@ Bonus symptom_delay_min = 20 symptom_delay_max = 75 var/infective = FALSE + threshold_desc = "Stage Speed 4: Increases the intensity of the flames.
\ + Stage Speed 8: Further increases flame intensity.
\ + Transmission 8: Host will spread the virus through skin flakes when bursting into flame.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/fire/Start(datum/disease/advance/A) ..() @@ -94,6 +99,7 @@ Bonus /datum/symptom/alkali name = "Alkali perspiration" + desc = "The virus attaches to sudoriparous glands, synthesizing a chemical that bursts into flames when reacting with water, leading to self-immolation." stealth = 2 resistance = -2 stage_speed = -2 @@ -105,6 +111,9 @@ Bonus symptom_delay_max = 90 var/chems = FALSE var/explosion_power = 1 + threshold_desc = "Resistance 9: Doubles the intensity of the effect, but reduces its frequency.
\ + Stage Speed 8: Increases explosion radius when the host is wet.
\ + Transmission 8: Additionally synthesizes chlorine trifluoride and napalm inside the host." /datum/symptom/alkali/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 838d4481b5..16e2b5c065 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/flesh_eating name = "Necrotizing Fasciitis" + desc = "The virus aggressively attacks body cells, necrotizing tissues and organs." stealth = -3 resistance = -4 stage_speed = 0 @@ -29,6 +30,8 @@ Bonus symptom_delay_max = 60 var/bleed = FALSE var/pain = FALSE + threshold_desc = "Resistance 7: Host will bleed profusely during necrosis.
\ + Transmission 8: Causes extreme pain to the host, weakening it." /datum/symptom/flesh_eating/Start(datum/disease/advance/A) ..() @@ -80,6 +83,7 @@ Bonus /datum/symptom/flesh_death name = "Autophagocytosis Necrosis" + desc = "The virus rapidly consumes infected cells, leading to heavy and widespread damage." stealth = -2 resistance = -2 stage_speed = 1 @@ -91,6 +95,8 @@ Bonus symptom_delay_max = 6 var/chems = FALSE var/zombie = FALSE + threshold_desc = "Stage Speed 7: Synthesizes Heparin and Lipolicide inside the host, causing increased bleeding and hunger.
\ + Stealth 5: The symptom remains hidden until active." /datum/symptom/flesh_death/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 0b6ea5f808..1f654f2e97 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -16,8 +16,8 @@ Bonus */ /datum/symptom/genetic_mutation - name = "Deoxyribonucleic Acid Saboteur" + desc = "The virus bonds with the DNA of the host, causing damaging mutations until removed." stealth = -2 resistance = -3 stage_speed = 0 @@ -30,6 +30,9 @@ Bonus symptom_delay_min = 60 symptom_delay_max = 120 var/no_reset = FALSE + threshold_desc = "Resistance 8: Causes two harmful mutations at once.
\ + Stage Speed 10: Increases mutation frequency.
\ + Stealth 5: The mutations persist even if the virus is cured." /datum/symptom/genetic_mutation/Activate(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 9bfd5b0baf..d4cda525ad 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -16,8 +16,8 @@ Bonus */ /datum/symptom/hallucigen - name = "Hallucigen" + desc = "The virus stimulates the brain, causing occasional hallucinations." stealth = -2 resistance = -3 stage_speed = -3 @@ -28,6 +28,8 @@ Bonus symptom_delay_min = 25 symptom_delay_max = 90 var/fake_healthy = FALSE + threshold_desc = "Stage Speed 7: Increases the amount of hallucinations.
\ + Stealth 4: The virus mimics positive symptoms.." /datum/symptom/hallucigen/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index 3baeedea19..b0665e0870 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -19,6 +19,7 @@ BONUS /datum/symptom/headache name = "Headache" + desc = "The virus causes inflammation inside the brain, causing constant headaches." stealth = -1 resistance = 4 stage_speed = 2 @@ -28,6 +29,9 @@ BONUS base_message_chance = 100 symptom_delay_min = 15 symptom_delay_max = 30 + threshold_desc = "Stage Speed 6: Headaches will cause severe pain, that weakens the host.
\ + Stage Speed 9: Headaches become less frequent but far more intense, preventing any action from the host.
\ + Stealth 4: Reduces headache frequency until later stages." /datum/symptom/headache/Start(datum/disease/advance/A) ..() @@ -45,11 +49,11 @@ BONUS return var/mob/living/M = A.affected_mob if(power < 2) - if(prob(base_message_chance)) + if(prob(base_message_chance) || A.stage >=4) to_chat(M, "[pick("Your head hurts.", "Your head pounds.")]") - if(power >= 2) + if(power >= 2 && A.stage >= 4) to_chat(M, "[pick("Your head hurts a lot.", "Your head pounds incessantly.")]") M.adjustStaminaLoss(25) - if(power >= 3) + if(power >= 3 && A.stage >= 5) to_chat(M, "[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]") M.Stun(35) \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 7b31588240..5167b17e0d 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -1,5 +1,6 @@ /datum/symptom/heal name = "Basic Healing (does nothing)" //warning for adminspawn viruses + desc = "You should not be seeing this." stealth = 1 resistance = -4 stage_speed = -4 @@ -9,6 +10,9 @@ symptom_delay_min = 1 symptom_delay_max = 1 var/hide_healing = FALSE + threshold_desc = "Stage Speed 6: Doubles healing speed.
\ + Stage Speed 11: Triples healing speed.
\ + Stealth 4: Healing will no longer be visible to onlookers." /datum/symptom/heal/Start(datum/disease/advance/A) ..() @@ -51,6 +55,7 @@ Bonus /datum/symptom/heal/toxin name = "Toxic Filter" + desc = "The virus synthesizes regenerative chemicals in the bloodstream, repairing damage caused by toxins." stealth = 1 resistance = -4 stage_speed = -4 @@ -87,6 +92,7 @@ Bonus stage_speed = -2 transmittable = -2 level = 8 + desc = "The virus stimulates production of special stem cells in the bloodstream, causing rapid reparation of any damage caused by toxins." /datum/symptom/heal/toxin/plus/Heal(mob/living/M, datum/disease/advance/A) var/heal_amt = 2 * power @@ -115,6 +121,7 @@ Bonus /datum/symptom/heal/brute name = "Regeneration" + desc = "The virus stimulates the regenerative process in the host, causing faster wound healing." stealth = 1 resistance = -4 stage_speed = -4 @@ -158,6 +165,7 @@ Bonus /datum/symptom/heal/brute/plus name = "Flesh Mending" + desc = "The virus rapidly mutates into body cells, effectively allowing it to quickly fix the host's wounds." stealth = 0 resistance = 0 stage_speed = -2 @@ -207,6 +215,7 @@ Bonus /datum/symptom/heal/burn name = "Tissue Regrowth" + desc = "The virus recycles dead and burnt tissues, speeding up the healing of damage caused by burns." stealth = 1 resistance = -4 stage_speed = -4 @@ -248,7 +257,8 @@ Bonus /datum/symptom/heal/burn/plus - name = "Heat Resistance" + name = "Temperature Adaptation" + desc = "The virus quickly balances body heat, while also replacing tissues damaged by external sources." stealth = 0 resistance = 0 stage_speed = -2 @@ -297,6 +307,7 @@ Bonus /datum/symptom/heal/dna name = "Deoxyribonucleic Acid Restoration" + desc = "The virus repairs the host's genome, purging negative mutations." stealth = -1 resistance = -1 stage_speed = 0 @@ -304,9 +315,11 @@ Bonus level = 5 symptom_delay_min = 3 symptom_delay_max = 8 + threshold_desc = "Stage Speed 6: Additionally heals brain damage.
\ + Stage Speed 11: Increases brain damage healing." /datum/symptom/heal/dna/Heal(mob/living/carbon/M, datum/disease/advance/A) - var/amt_healed = 2 * power + var/amt_healed = 2 * (power - 1) M.adjustBrainLoss(-amt_healed) //Non-power mutations, excluding race, so the virus does not force monkey -> human transformations. var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations) - GLOB.mutations_list[RACEMUT] diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index 880ac1f3e6..119b04b48a 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -19,6 +19,7 @@ BONUS /datum/symptom/itching name = "Itching" + desc = "The virus irritates the skin, causing itching." stealth = 0 resistance = 3 stage_speed = 3 @@ -28,6 +29,8 @@ BONUS symptom_delay_min = 5 symptom_delay_max = 25 var/scratch = FALSE + threshold_desc = "Transmission 6: Increases frequency of itching.
\ + Stage Speed 7: The host will scrath itself when itching, causing superficial damage." /datum/symptom/itching/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/narcolepsy.dm b/code/datums/diseases/advance/symptoms/narcolepsy.dm index a5a2bd7a4c..d850d257cb 100644 --- a/code/datums/diseases/advance/symptoms/narcolepsy.dm +++ b/code/datums/diseases/advance/symptoms/narcolepsy.dm @@ -14,6 +14,7 @@ Bonus */ /datum/symptom/narcolepsy name = "Narcolepsy" + desc = "The virus causes a hormone imbalance, making the host sleepy and narcoleptic." stealth = -1 resistance = -2 stage_speed = -3 @@ -25,6 +26,8 @@ Bonus var/sleep_level = 0 var/sleepy_ticks = 0 var/stamina = FALSE + threshold_desc = "Transmission 7: Also relaxes the muscles, weakening and slowing the host.
\ + Resistance 10: Causes narcolepsy more often, increasing the chance of the host falling asleep." /datum/symptom/narcolepsy/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index 5949e84420..da085ab153 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/oxygen name = "Self-Respiration" + desc = "The virus rapidly synthesizes oxygen, effectively removing the need for breathing." stealth = 1 resistance = -3 stage_speed = -3 @@ -27,6 +28,7 @@ Bonus symptom_delay_min = 1 symptom_delay_max = 1 var/regenerate_blood = FALSE + threshold_desc = "Resistance 8:Additionally regenerates lost blood.
" /datum/symptom/oxygen/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 3063ee06f6..dd417e50ed 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -15,8 +15,9 @@ Bonus ////////////////////////////////////// */ -/datum/symptom/sensory_restoration - name = "Sensory Restoration" +/datum/symptom/mind_restoration + name = "Mind Restoration" + desc = "The virus strengthens the bonds between neurons, reducing the duration of any ailments of the mind." stealth = -1 resistance = -4 stage_speed = -4 @@ -27,15 +28,17 @@ Bonus symptom_delay_max = 10 var/purge_alcohol = FALSE var/brain_heal = FALSE + threshold_desc = "Resistance 6: Heals brain damage.
\ + Transmission 8: Purges alcohol in the bloodstream." -/datum/symptom/sensory_restoration/Start(datum/disease/advance/A) +/datum/symptom/mind_restoration/Start(datum/disease/advance/A) ..() if(A.properties["resistance"] >= 6) //heal brain damage brain_heal = TRUE if(A.properties["transmittable"] >= 8) //purge alcohol purge_alcohol = TRUE -/datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A) +/datum/symptom/mind_restoration/Activate(var/datum/disease/advance/A) if(!..()) return var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index cf88fcf6db..a578289e17 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -15,8 +15,8 @@ BONUS */ /datum/symptom/shedding - name = "Alopecia" + desc = "The virus causes rapid shedding of head and body hair." stealth = 0 resistance = 1 stage_speed = -1 diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index 4c9ec94a2b..f40fd151d9 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -16,8 +16,8 @@ Bonus */ /datum/symptom/shivering - name = "Shivering" + desc = "The virus inhibits the body's thermoregulation, cooling the body down." stealth = 0 resistance = 2 stage_speed = 2 @@ -27,6 +27,8 @@ Bonus symptom_delay_min = 10 symptom_delay_max = 30 var/unsafe = FALSE //over the cold threshold + threshold_desc = "Stage Speed 5: Increases cooling speed; the host can fall below safe temperature levels.
\ + Stage Speed 10: Further increases cooling speed." /datum/symptom/fever/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index 09eea77520..014607eb44 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -17,6 +17,7 @@ BONUS /datum/symptom/vitiligo name = "Vitiligo" + desc = "The virus destroys skin pigment cells, causing rapid loss of pigmentation in the host." stealth = -3 resistance = -1 stage_speed = -1 @@ -61,6 +62,7 @@ BONUS /datum/symptom/revitiligo name = "Revitiligo" + desc = "The virus causes increased production of skin pigment cells, making the host's skin grow darker over time." stealth = -3 resistance = -1 stage_speed = -1 diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index fda1fc765c..085b5ff592 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/sneeze name = "Sneezing" + desc = "The virus causes irritation of the nasal cavity, making the host sneeze occasionally." stealth = -2 resistance = 3 stage_speed = 0 @@ -26,6 +27,8 @@ Bonus severity = 1 symptom_delay_min = 5 symptom_delay_max = 35 + threshold_desc = "Transmission 9: Increases sneezing range, spreading the virus over a larger area.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/sneeze/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index 4bcb1b502f..8557375dbd 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -3,6 +3,8 @@ /datum/symptom // Buffs/Debuffs the symptom has to the overall engineered disease. var/name = "" + var/desc = "If you see this something went very wrong." //Basic symptom description + var/threshold_desc = "" //Description of threshold effects var/stealth = 0 var/resistance = 0 var/stage_speed = 0 @@ -25,6 +27,7 @@ var/power = 1 //A neutered symptom has no effect, and only affects statistics. var/neutered = FALSE + var/list/thresholds /datum/symptom/New() var/list/S = SSdisease.list_symptoms @@ -37,7 +40,6 @@ // Called when processing of the advance disease, which holds this symptom, starts. /datum/symptom/proc/Start(datum/disease/advance/A) next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10) //so it doesn't instantly activate on infection - return // Called when the advance disease is going to be deleted or when the advance disease stops processing. /datum/symptom/proc/End(datum/disease/advance/A) @@ -58,3 +60,6 @@ new_symp.id = id new_symp.neutered = neutered return new_symp + +/datum/symptom/proc/generate_threshold_desc() + return diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm index 49bb2d674c..ef8822470e 100644 --- a/code/datums/diseases/advance/symptoms/viral.dm +++ b/code/datums/diseases/advance/symptoms/viral.dm @@ -15,6 +15,7 @@ BONUS */ /datum/symptom/viraladaptation name = "Viral self-adaptation" + desc = "The virus mimics the function of normal body cells, becoming harder to spot and to eradicate, but reducing its speed." stealth = 3 resistance = 5 stage_speed = -3 @@ -38,6 +39,8 @@ BONUS */ /datum/symptom/viralevolution name = "Viral evolutionary acceleration" + desc = "The virus quickly adapts to spread as fast as possible both outside and inside a host. \ + This, however, makes the virus easier to spot, and less able to fight off a cure." stealth = -2 resistance = -3 stage_speed = 5 @@ -65,6 +68,8 @@ Bonus /datum/symptom/viralreverse name = "Viral aggressive metabolism" + 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 @@ -73,6 +78,8 @@ Bonus symptom_delay_min = 1 symptom_delay_max = 1 var/time_to_cure + threshold_desc = "Resistance/Stage Speed: Highest between these determines the amount of time before self-curing.
\ + Stealth 4: Doubles the time before the virus self-cures." /datum/symptom/viralreverse/Activate(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 9148139e50..04f5d72ba6 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/visionloss name = "Hyphema" + desc = "The virus causes inflammation of the retina, leading to eye damage and eventually blindness." stealth = -1 resistance = -4 stage_speed = -4 @@ -28,6 +29,8 @@ Bonus symptom_delay_min = 25 symptom_delay_max = 80 var/remove_eyes = FALSE + threshold_desc = "Resistance 12: Weakens extraocular muscles, eventually leading to complete detachment of the eyes.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/visionloss/Start(datum/disease/advance/A) ..() @@ -88,6 +91,7 @@ Bonus /datum/symptom/visionaid name = "Ocular Restoration" + desc = "The virus stimulates the production and replacement of eye cells, causing the host to regenerate its eyes when damaged." stealth = -1 resistance = -3 stage_speed = -2 diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 3abeb42f03..bdeb6321bc 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/voice_change name = "Voice Change" + desc = "The virus alters the pitch and tone of the host's vocal cords, changing how their voice sounds." stealth = -1 resistance = -2 stage_speed = -2 @@ -30,6 +31,9 @@ Bonus var/scramble_language = FALSE var/datum/language/current_language var/datum/language_holder/original_language + threshold_desc = "Transmission 14: The host's language center of the brain is damaged, leading to complete inability to speak or understand any language.
\ + Stage Speed 7: Changes voice more often.
\ + Stealth 3: The symptom remains hidden until active." /datum/symptom/voice_change/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index e2be924d6a..983d20a66d 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -22,6 +22,7 @@ Bonus /datum/symptom/vomit name = "Vomiting" + desc = "The virus causes nausea and irritates the stomach, causing occasional vomit." stealth = -2 resistance = -1 stage_speed = 0 @@ -33,6 +34,9 @@ Bonus symptom_delay_max = 80 var/vomit_blood = FALSE var/proj_vomit = 0 + threshold_desc = "Resistance 7: Host will vomit blood, causing internal damage.
\ + Transmission 7: Host will projectile vomit, increasing vomiting range.
\ + Stealth 4: The symptom remains hidden until active." /datum/symptom/vomit/Start(datum/disease/advance/A) ..() diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index ec371f1167..ea2577b800 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -18,6 +18,7 @@ Bonus /datum/symptom/weight_gain name = "Weight Gain" + desc = "The virus mutates the host's metabolism, making it gain weight much faster than normal." stealth = -3 resistance = -3 stage_speed = -2 @@ -27,6 +28,7 @@ Bonus base_message_chance = 100 symptom_delay_min = 15 symptom_delay_max = 45 + threshold_desc = "Stealth 4: The symptom is less noticeable." /datum/symptom/weight_gain/Start(datum/disease/advance/A) ..() @@ -66,6 +68,7 @@ Bonus /datum/symptom/weight_loss name = "Weight Loss" + desc = "The virus mutates the host's metabolism, making it almost unable to gain nutrition from food." stealth = -3 resistance = -2 stage_speed = -2 @@ -75,6 +78,7 @@ Bonus base_message_chance = 100 symptom_delay_min = 15 symptom_delay_max = 45 + threshold_desc = "Stealth 4: The symptom is less noticeable." /datum/symptom/weight_loss/Start(datum/disease/advance/A) ..() @@ -116,6 +120,7 @@ Bonus /datum/symptom/weight_even name = "Weight Even" + desc = "The virus alters the host's metabolism, making it far more efficient then normal, and synthesizing nutrients from normally unedible sources." stealth = -3 resistance = -2 stage_speed = -2 diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index 9793313354..6be34684e7 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -18,6 +18,8 @@ BONUS /datum/symptom/youth name = "Eternal Youth" + desc = "The virus becomes symbiotically connected to the cells in the host's body, preventing and reversing aging. \ + The virus, in turn, becomes more resistant, spreads faster, and is harder to spot, although it doesn't thrive as well without a host." stealth = 3 resistance = 4 stage_speed = 4 diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 2b77885359..c96a22d472 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -1,74 +1,74 @@ -/datum/disease/dnaspread - name = "Space Retrovirus" - max_stages = 4 - spread_text = "On contact" - spread_flags = CONTACT_GENERAL - cure_text = "Mutadone" - cures = list("mutadone") - disease_flags = CAN_CARRY|CAN_RESIST|CURABLE - agent = "S4E1 retrovirus" - viable_mobtypes = list(/mob/living/carbon/human) - var/datum/dna/original_dna = null - var/transformed = 0 - desc = "This disease transplants the genetic code of the initial vector into new hosts." - severity = MEDIUM - - -/datum/disease/dnaspread/stage_act() - ..() - if(!affected_mob.dna) - cure() - if(NOTRANSSTING in affected_mob.dna.species.species_traits) //Only species that can be spread by transformation sting can be spread by the retrovirus - cure() - - if(!strain_data["dna"]) - //Absorbs the target DNA. - strain_data["dna"] = new affected_mob.dna.type - affected_mob.dna.copy_dna(strain_data["dna"]) +/datum/disease/dnaspread + name = "Space Retrovirus" + max_stages = 4 + spread_text = "On contact" + spread_flags = CONTACT_GENERAL + cure_text = "Mutadone" + cures = list("mutadone") + disease_flags = CAN_CARRY|CAN_RESIST|CURABLE + agent = "S4E1 retrovirus" + viable_mobtypes = list(/mob/living/carbon/human) + var/datum/dna/original_dna = null + var/transformed = 0 + desc = "This disease transplants the genetic code of the initial vector into new hosts." + severity = MEDIUM + + +/datum/disease/dnaspread/stage_act() + ..() + if(!affected_mob.dna) + cure() + if((NOTRANSSTING in affected_mob.dna.species.species_traits) || (NO_DNA_COPY in affected_mob.dna.species.species_traits)) //Only species that can be spread by transformation sting can be spread by the retrovirus + cure() + + if(!strain_data["dna"]) + //Absorbs the target DNA. + strain_data["dna"] = new affected_mob.dna.type + affected_mob.dna.copy_dna(strain_data["dna"]) carrier = TRUE stage = 4 - return - - switch(stage) - if(2 || 3) //Pretend to be a cold and give time to spread. - if(prob(8)) - affected_mob.emote("sneeze") - if(prob(8)) - affected_mob.emote("cough") - if(prob(1)) - to_chat(affected_mob, "Your muscles ache.") - if(prob(20)) - affected_mob.take_bodypart_damage(1) - if(prob(1)) - to_chat(affected_mob, "Your stomach hurts.") - if(prob(20)) - affected_mob.adjustToxLoss(2) - affected_mob.updatehealth() - if(4) - if(!transformed && !carrier) - //Save original dna for when the disease is cured. - original_dna = new affected_mob.dna.type - affected_mob.dna.copy_dna(original_dna) - - to_chat(affected_mob, "You don't feel like yourself..") - var/datum/dna/transform_dna = strain_data["dna"] - - transform_dna.transfer_identity(affected_mob, transfer_SE = 1) - affected_mob.real_name = affected_mob.dna.real_name - affected_mob.updateappearance(mutcolor_update=1) - affected_mob.domutcheck() - - transformed = 1 - carrier = 1 //Just chill out at stage 4 - - return - -/datum/disease/dnaspread/Destroy() - if (original_dna && transformed && affected_mob) - original_dna.transfer_identity(affected_mob, transfer_SE = 1) - affected_mob.real_name = affected_mob.dna.real_name - affected_mob.updateappearance(mutcolor_update=1) - affected_mob.domutcheck() - - to_chat(affected_mob, "You feel more like yourself.") - return ..() \ No newline at end of file + return + + switch(stage) + if(2 || 3) //Pretend to be a cold and give time to spread. + if(prob(8)) + affected_mob.emote("sneeze") + if(prob(8)) + affected_mob.emote("cough") + if(prob(1)) + to_chat(affected_mob, "Your muscles ache.") + if(prob(20)) + affected_mob.take_bodypart_damage(1) + if(prob(1)) + to_chat(affected_mob, "Your stomach hurts.") + if(prob(20)) + affected_mob.adjustToxLoss(2) + affected_mob.updatehealth() + if(4) + if(!transformed && !carrier) + //Save original dna for when the disease is cured. + original_dna = new affected_mob.dna.type + affected_mob.dna.copy_dna(original_dna) + + to_chat(affected_mob, "You don't feel like yourself..") + var/datum/dna/transform_dna = strain_data["dna"] + + transform_dna.transfer_identity(affected_mob, transfer_SE = 1) + affected_mob.real_name = affected_mob.dna.real_name + affected_mob.updateappearance(mutcolor_update=1) + affected_mob.domutcheck() + + transformed = 1 + carrier = 1 //Just chill out at stage 4 + + return + +/datum/disease/dnaspread/Destroy() + if (original_dna && transformed && affected_mob) + original_dna.transfer_identity(affected_mob, transfer_SE = 1) + affected_mob.real_name = affected_mob.dna.real_name + affected_mob.updateappearance(mutcolor_update=1) + affected_mob.domutcheck() + + to_chat(affected_mob, "You feel more like yourself.") + return ..() diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm index 0df7e0f7d3..a5d87be980 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 fbdb107c83..66663162ee 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -1,115 +1,115 @@ -/datum/disease/wizarditis - name = "Wizarditis" - max_stages = 4 - spread_text = "Airborne" - cure_text = "The Manly Dorf" - cures = list("manlydorf") - cure_chance = 100 - agent = "Rincewindus Vulgaris" - viable_mobtypes = list(/mob/living/carbon/human) - disease_flags = CAN_CARRY|CAN_RESIST|CURABLE - permeability_mod = 0.75 - desc = "Some speculate that this virus is the cause of the Space Wizard Federation's existence. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." - severity = HARMFUL - required_organs = list(/obj/item/bodypart/head) - -/* -BIRUZ BENNAR -SCYAR NILA - teleport -NEC CANTIO - dis techno -EI NATH - shocking grasp -AULIE OXIN FIERA - knock -TARCOL MINTI ZHERI - forcewall -STI KALY - blind -*/ - -/datum/disease/wizarditis/stage_act() - ..() - - switch(stage) - if(2) - if(prob(1)&&prob(50)) - affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", "Feel the power of the Dark Side!")) - if(prob(1)&&prob(50)) - to_chat(affected_mob, "You feel [pick("that you don't have enough mana", "that the winds of magic are gone", "an urge to summon familiar")].") - - - if(3) - if(prob(1)&&prob(50)) - affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!")) - if(prob(1)&&prob(50)) - to_chat(affected_mob, "You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].") - - if(4) - - if(prob(1)) - affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!")) - return - if(prob(1)&&prob(50)) - to_chat(affected_mob, "You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")].") - spawn_wizard_clothes(50) - if(prob(1)&&prob(1)) - teleport() - return - - - -/datum/disease/wizarditis/proc/spawn_wizard_clothes(chance = 0) - if(ishuman(affected_mob)) - var/mob/living/carbon/human/H = affected_mob - if(prob(chance)) - if(!istype(H.head, /obj/item/clothing/head/wizard)) - if(!H.dropItemToGround(H.head)) - qdel(H.head) - H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), slot_head) - return - if(prob(chance)) - if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe)) - if(!H.dropItemToGround(H.wear_suit)) - qdel(H.wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), slot_wear_suit) - return - if(prob(chance)) - if(!istype(H.shoes, /obj/item/clothing/shoes/sandal/magic)) - if(!H.dropItemToGround(H.shoes)) - qdel(H.shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(H), slot_shoes) - return - else - var/mob/living/carbon/H = affected_mob - if(prob(chance)) - var/obj/item/staff/S = new(H) - if(!H.put_in_hands(S)) - qdel(S) - - -/datum/disease/wizarditis/proc/teleport() - var/list/theareas = get_areas_in_range(80, affected_mob) - for(var/area/space/S in theareas) - theareas -= S - - if(!theareas||!theareas.len) - return - - var/area/thearea = pick(theareas) - - var/list/L = list() - for(var/turf/T in get_area_turfs(thearea.type)) - if(T.z != affected_mob.z) continue - if(T.name == "space") continue - if(!T.density) - var/clear = 1 - for(var/obj/O in T) - if(O.density) - clear = 0 - break - if(clear) - L+=T - - if(!L) - return - - affected_mob.say("SCYAR NILA [uppertext(thearea.name)]!") - affected_mob.loc = pick(L) - - return +/datum/disease/wizarditis + name = "Wizarditis" + max_stages = 4 + spread_text = "Airborne" + cure_text = "The Manly Dorf" + cures = list("manlydorf") + cure_chance = 100 + agent = "Rincewindus Vulgaris" + viable_mobtypes = list(/mob/living/carbon/human) + disease_flags = CAN_CARRY|CAN_RESIST|CURABLE + permeability_mod = 0.75 + desc = "Some speculate that this virus is the cause of the Space Wizard Federation's existence. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." + severity = HARMFUL + required_organs = list(/obj/item/bodypart/head) + +/* +BIRUZ BENNAR +SCYAR NILA - teleport +NEC CANTIO - dis techno +EI NATH - shocking grasp +AULIE OXIN FIERA - knock +TARCOL MINTI ZHERI - forcewall +STI KALY - blind +*/ + +/datum/disease/wizarditis/stage_act() + ..() + + switch(stage) + if(2) + if(prob(1)&&prob(50)) + affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", "Feel the power of the Dark Side!")) + if(prob(1)&&prob(50)) + to_chat(affected_mob, "You feel [pick("that you don't have enough mana", "that the winds of magic are gone", "an urge to summon familiar")].") + + + if(3) + if(prob(1)&&prob(50)) + affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!")) + if(prob(1)&&prob(50)) + to_chat(affected_mob, "You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].") + + if(4) + + if(prob(1)) + affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!")) + return + if(prob(1)&&prob(50)) + to_chat(affected_mob, "You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")].") + spawn_wizard_clothes(50) + if(prob(1)&&prob(1)) + teleport() + return + + + +/datum/disease/wizarditis/proc/spawn_wizard_clothes(chance = 0) + if(ishuman(affected_mob)) + var/mob/living/carbon/human/H = affected_mob + if(prob(chance)) + if(!istype(H.head, /obj/item/clothing/head/wizard)) + if(!H.dropItemToGround(H.head)) + qdel(H.head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), slot_head) + return + if(prob(chance)) + if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe)) + if(!H.dropItemToGround(H.wear_suit)) + qdel(H.wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), slot_wear_suit) + return + if(prob(chance)) + if(!istype(H.shoes, /obj/item/clothing/shoes/sandal/magic)) + if(!H.dropItemToGround(H.shoes)) + qdel(H.shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(H), slot_shoes) + return + else + var/mob/living/carbon/H = affected_mob + if(prob(chance)) + var/obj/item/staff/S = new(H) + if(!H.put_in_hands(S)) + qdel(S) + + +/datum/disease/wizarditis/proc/teleport() + var/list/theareas = get_areas_in_range(80, affected_mob) + for(var/area/space/S in theareas) + theareas -= S + + if(!theareas||!theareas.len) + return + + var/area/thearea = pick(theareas) + + var/list/L = list() + for(var/turf/T in get_area_turfs(thearea.type)) + if(T.z != affected_mob.z) continue + if(T.name == "space") continue + if(!T.density) + var/clear = 1 + for(var/obj/O in T) + if(O.density) + clear = 0 + break + if(clear) + L+=T + + if(!L) + return + + affected_mob.say("SCYAR NILA [uppertext(thearea.name)]!") + affected_mob.forceMove(pick(L)) + + return diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 4bacf2d9e8..12555ee038 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -1,399 +1,398 @@ - -/////////////////////////// DNA DATUM -/datum/dna - var/unique_enzymes - var/struc_enzymes - var/uni_identity - var/blood_type - var/datum/species/species = new /datum/species/human() //The type of mutant race the player is if applicable (i.e. potato-man) - var/list/features = list("FFF") //first value is mutant color - var/real_name //Stores the real name of the person who originally got this dna datum. Used primarely for changelings, - var/list/mutations = list() //All mutations are from now on here - var/list/temporary_mutations = list() //Timers for temporary mutations - var/list/previous = list() //For temporary name/ui/ue/blood_type modifications - var/mob/living/holder - -/datum/dna/New(mob/living/new_holder) - if(new_holder) - holder = new_holder - -/datum/dna/proc/transfer_identity(mob/living/carbon/destination, transfer_SE = 0) - if(!istype(destination)) - return - destination.dna.unique_enzymes = unique_enzymes - destination.dna.uni_identity = uni_identity - destination.dna.blood_type = blood_type - destination.set_species(species.type, icon_update=0) - destination.dna.features = features.Copy() - destination.dna.real_name = real_name - destination.dna.temporary_mutations = temporary_mutations.Copy() - if(transfer_SE) - destination.dna.struc_enzymes = struc_enzymes - if(ishuman(destination)) - var/mob/living/carbon/human/H = destination - H.give_genitals(TRUE)//This gives the body the genitals of this DNA. Used for any transformations based on DNA - destination.flavor_text = destination.dna.features["flavor_text"] //Update the flavor_text to use new dna text - -/datum/dna/proc/copy_dna(datum/dna/new_dna) - new_dna.unique_enzymes = unique_enzymes - new_dna.struc_enzymes = struc_enzymes - new_dna.uni_identity = uni_identity - new_dna.blood_type = blood_type - new_dna.features = features.Copy() - new_dna.species = new species.type - new_dna.real_name = real_name - new_dna.mutations = mutations.Copy() - -/datum/dna/proc/add_mutation(mutation_name) - var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name] - HM.on_acquiring(holder) - -/datum/dna/proc/remove_mutation(mutation_name) - var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name] - HM.on_losing(holder) - -/datum/dna/proc/check_mutation(mutation_name) - var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name] - return mutations.Find(HM) - -/datum/dna/proc/remove_all_mutations() - remove_mutation_group(mutations) - -/datum/dna/proc/remove_mutation_group(list/group) - if(!group) - return - for(var/datum/mutation/human/HM in group) - HM.force_lose(holder) - -/datum/dna/proc/generate_uni_identity() - . = "" - var/list/L = new /list(DNA_UNI_IDENTITY_BLOCKS) - - L[DNA_GENDER_BLOCK] = construct_block((holder.gender!=MALE)+1, 2) - if(ishuman(holder)) - var/mob/living/carbon/human/H = holder - if(!GLOB.hair_styles_list.len) - init_sprite_accessory_subtypes(/datum/sprite_accessory/hair,GLOB.hair_styles_list, GLOB.hair_styles_male_list, GLOB.hair_styles_female_list) - L[DNA_HAIR_STYLE_BLOCK] = construct_block(GLOB.hair_styles_list.Find(H.hair_style), GLOB.hair_styles_list.len) - L[DNA_HAIR_COLOR_BLOCK] = sanitize_hexcolor(H.hair_color) - if(!GLOB.facial_hair_styles_list.len) - init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, GLOB.facial_hair_styles_list, GLOB.facial_hair_styles_male_list, GLOB.facial_hair_styles_female_list) - L[DNA_FACIAL_HAIR_STYLE_BLOCK] = construct_block(GLOB.facial_hair_styles_list.Find(H.facial_hair_style), GLOB.facial_hair_styles_list.len) - L[DNA_FACIAL_HAIR_COLOR_BLOCK] = sanitize_hexcolor(H.facial_hair_color) - L[DNA_SKIN_TONE_BLOCK] = construct_block(GLOB.skin_tones.Find(H.skin_tone), GLOB.skin_tones.len) - L[DNA_EYE_COLOR_BLOCK] = sanitize_hexcolor(H.eye_color) - - for(var/i=1, i<=DNA_UNI_IDENTITY_BLOCKS, i++) - if(L[i]) - . += L[i] - else - . += random_string(DNA_BLOCK_SIZE,GLOB.hex_characters) - return . - -/datum/dna/proc/generate_struc_enzymes() - var/list/sorting = new /list(DNA_STRUC_ENZYMES_BLOCKS) - var/result = "" - for(var/datum/mutation/human/A in GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations) - if(A.name == RACEMUT && ismonkey(holder)) - sorting[A.dna_block] = num2hex(A.lowest_value + rand(0, 256 * 6), DNA_BLOCK_SIZE) - mutations |= A - else - sorting[A.dna_block] = random_string(DNA_BLOCK_SIZE, list("0","1","2","3","4","5","6")) - - for(var/B in sorting) - result += B - return result - -/datum/dna/proc/generate_unique_enzymes() - . = "" - if(istype(holder)) - real_name = holder.real_name - . += md5(holder.real_name) - else - . += random_string(DNA_UNIQUE_ENZYMES_LEN, GLOB.hex_characters) - return . - -/datum/dna/proc/update_ui_block(blocknumber) - if(!blocknumber || !ishuman(holder)) - return - var/mob/living/carbon/human/H = holder - switch(blocknumber) - if(DNA_HAIR_COLOR_BLOCK) - setblock(uni_identity, blocknumber, sanitize_hexcolor(H.hair_color)) - if(DNA_FACIAL_HAIR_COLOR_BLOCK) - setblock(uni_identity, blocknumber, sanitize_hexcolor(H.facial_hair_color)) - if(DNA_SKIN_TONE_BLOCK) - setblock(uni_identity, blocknumber, construct_block(GLOB.skin_tones.Find(H.skin_tone), GLOB.skin_tones.len)) - if(DNA_EYE_COLOR_BLOCK) - setblock(uni_identity, blocknumber, sanitize_hexcolor(H.eye_color)) - if(DNA_GENDER_BLOCK) - setblock(uni_identity, blocknumber, construct_block((H.gender!=MALE)+1, 2)) - if(DNA_FACIAL_HAIR_STYLE_BLOCK) - setblock(uni_identity, blocknumber, construct_block(GLOB.facial_hair_styles_list.Find(H.facial_hair_style), GLOB.facial_hair_styles_list.len)) - if(DNA_HAIR_STYLE_BLOCK) - setblock(uni_identity, blocknumber, construct_block(GLOB.hair_styles_list.Find(H.hair_style), GLOB.hair_styles_list.len)) - -/datum/dna/proc/mutations_say_mods(message) - if(message) - for(var/datum/mutation/human/M in mutations) - message = M.say_mod(message) - return message - -/datum/dna/proc/mutations_get_spans() - var/list/spans = list() - for(var/datum/mutation/human/M in mutations) - spans |= M.get_spans() - return spans - -/datum/dna/proc/species_get_spans() - var/list/spans = list() - if(species) - spans |= species.get_spans() - return spans - - -/datum/dna/proc/is_same_as(datum/dna/D) - if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name) - if(species.type == D.species.type && features == D.features && blood_type == D.blood_type) - return 1 - return 0 - -//used to update dna UI, UE, and dna.real_name. -/datum/dna/proc/update_dna_identity() - uni_identity = generate_uni_identity() - unique_enzymes = generate_unique_enzymes() - -/datum/dna/proc/initialize_dna(newblood_type) - if(newblood_type) - blood_type = newblood_type - unique_enzymes = generate_unique_enzymes() - uni_identity = generate_uni_identity() - struc_enzymes = generate_struc_enzymes() - features = random_features() - - -/datum/dna/stored //subtype used by brain mob's stored_dna - -/datum/dna/stored/add_mutation(mutation_name) //no mutation changes on stored dna. - return - -/datum/dna/stored/remove_mutation(mutation_name) - return - -/datum/dna/stored/check_mutation(mutation_name) - return - -/datum/dna/stored/remove_all_mutations() - return - -/datum/dna/stored/remove_mutation_group(list/group) - return - -/////////////////////////// DNA MOB-PROCS ////////////////////// - -/mob/proc/set_species(datum/species/mrace, icon_update = 1) - return - -/mob/living/brain/set_species(datum/species/mrace, icon_update = 1) - if(mrace) - if(ispath(mrace)) - stored_dna.species = new mrace() - else - stored_dna.species = mrace //not calling any species update procs since we're a brain, not a monkey/human - - -/mob/living/carbon/set_species(datum/species/mrace, icon_update = 1) - if(mrace && has_dna()) - dna.species.on_species_loss(src) - var/old_species = dna.species - if(ispath(mrace)) - dna.species = new mrace() - else - dna.species = mrace - dna.species.on_species_gain(src, old_species) - -/mob/living/carbon/human/set_species(datum/species/mrace, icon_update = 1) - ..() - if(icon_update) - update_body() - update_hair() - update_body_parts() - update_mutations_overlay()// no lizard with human hulk overlay please. - - -/mob/proc/has_dna() - return - -/mob/living/carbon/has_dna() - return dna - - -/mob/living/carbon/human/proc/hardset_dna(ui, se, newreal_name, newblood_type, datum/species/mrace, newfeatures) - - if(newfeatures) - dna.features = newfeatures - flavor_text = dna.features["flavor_text"] //Update the flavor_text to use new dna text - - if(mrace) - set_species(mrace, icon_update=0) - - if(newreal_name) - real_name = newreal_name - dna.generate_unique_enzymes() - - if(newblood_type) - dna.blood_type = newblood_type - - if(ui) - dna.uni_identity = ui - updateappearance(icon_update=0) - - if(se) - dna.struc_enzymes = se - domutcheck() - - give_genitals(TRUE)//Give all genitalia that DNA says you should have, remove any pre-existing ones as this is a hardset! - - if(mrace || newfeatures || ui) - update_body() - update_hair() - update_body_parts() - update_mutations_overlay() - - -/mob/living/carbon/proc/create_dna() - dna = new /datum/dna(src) - if(!dna.species) - var/rando_race = pick(config.roundstart_races) - dna.species = new rando_race() - -//proc used to update the mob's appearance after its dna UI has been changed -/mob/living/carbon/proc/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0) - if(!has_dna()) - return - gender = (deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 2)-1) ? FEMALE : MALE - -/mob/living/carbon/human/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0) - ..() - var/structure = dna.uni_identity - hair_color = sanitize_hexcolor(getblock(structure, DNA_HAIR_COLOR_BLOCK)) - facial_hair_color = sanitize_hexcolor(getblock(structure, DNA_FACIAL_HAIR_COLOR_BLOCK)) - skin_tone = GLOB.skin_tones[deconstruct_block(getblock(structure, DNA_SKIN_TONE_BLOCK), GLOB.skin_tones.len)] - eye_color = sanitize_hexcolor(getblock(structure, DNA_EYE_COLOR_BLOCK)) - facial_hair_style = GLOB.facial_hair_styles_list[deconstruct_block(getblock(structure, DNA_FACIAL_HAIR_STYLE_BLOCK), GLOB.facial_hair_styles_list.len)] - hair_style = GLOB.hair_styles_list[deconstruct_block(getblock(structure, DNA_HAIR_STYLE_BLOCK), GLOB.hair_styles_list.len)] - if(icon_update) - update_body() - update_hair() - if(mutcolor_update) - update_body_parts() - if(mutations_overlay_update) - update_mutations_overlay() - - -/mob/proc/domutcheck() - return - -/mob/living/carbon/domutcheck(force_powers=0) //Set force_powers to 1 to bypass the power chance - if(!has_dna()) - return - - for(var/datum/mutation/human/A in GLOB.good_mutations | GLOB.bad_mutations | GLOB.not_good_mutations) - if(ismob(A.check_block(src, force_powers))) - return //we got monkeyized/humanized, this mob will be deleted, no need to continue. - - update_mutations_overlay() - - - -/////////////////////////// DNA HELPER-PROCS ////////////////////////////// -/proc/getleftblocks(input,blocknumber,blocksize) - if(blocknumber > 1) - return copytext(input,1,((blocksize*blocknumber)-(blocksize-1))) - -/proc/getrightblocks(input,blocknumber,blocksize) - if(blocknumber < (length(input)/blocksize)) - return copytext(input,blocksize*blocknumber+1,length(input)+1) - -/proc/getblock(input, blocknumber, blocksize=DNA_BLOCK_SIZE) - return copytext(input, blocksize*(blocknumber-1)+1, (blocksize*blocknumber)+1) - -/proc/setblock(istring, blocknumber, replacement, blocksize=DNA_BLOCK_SIZE) - if(!istring || !blocknumber || !replacement || !blocksize) - return 0 - return getleftblocks(istring, blocknumber, blocksize) + replacement + getrightblocks(istring, blocknumber, blocksize) - -/mob/living/carbon/proc/randmut(list/candidates, difficulty = 2) - if(!has_dna()) - return - var/datum/mutation/human/num = pick(candidates) - . = num.force_give(src) - -/mob/living/carbon/proc/randmutb() - if(!has_dna()) - return - var/datum/mutation/human/HM = pick((GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT]) - . = HM.force_give(src) - -/mob/living/carbon/proc/randmutg() - if(!has_dna()) - return - var/datum/mutation/human/HM = pick(GLOB.good_mutations) - . = HM.force_give(src) - -/mob/living/carbon/proc/randmutvg() - if(!has_dna()) - return - var/datum/mutation/human/HM = pick((GLOB.good_mutations) - GLOB.mutations_list[HULK] - GLOB.mutations_list[DWARFISM]) - . = HM.force_give(src) - -/mob/living/carbon/proc/randmuti() - if(!has_dna()) - return - var/num = rand(1, DNA_UNI_IDENTITY_BLOCKS) - var/newdna = setblock(dna.uni_identity, num, random_string(DNA_BLOCK_SIZE, GLOB.hex_characters)) - dna.uni_identity = newdna - updateappearance(mutations_overlay_update=1) - -/mob/living/carbon/proc/clean_dna() - if(!has_dna()) - return - dna.remove_all_mutations() - -/mob/living/carbon/proc/clean_randmut(list/candidates, difficulty = 2) - clean_dna() - randmut(candidates, difficulty) - -/proc/scramble_dna(mob/living/carbon/M, ui=FALSE, se=FALSE, probability) - if(!M.has_dna()) - return 0 - if(se) - for(var/i=1, i<=DNA_STRUC_ENZYMES_BLOCKS, i++) - if(prob(probability)) - M.dna.struc_enzymes = setblock(M.dna.struc_enzymes, i, random_string(DNA_BLOCK_SIZE, GLOB.hex_characters)) - M.domutcheck() - if(ui) - for(var/i=1, i<=DNA_UNI_IDENTITY_BLOCKS, i++) - if(prob(probability)) - M.dna.uni_identity = setblock(M.dna.uni_identity, i, random_string(DNA_BLOCK_SIZE, GLOB.hex_characters)) - M.updateappearance(mutations_overlay_update=1) - return 1 - -//value in range 1 to values. values must be greater than 0 -//all arguments assumed to be positive integers -/proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE) - var/width = round((16**blocksize)/values) - if(value < 1) - value = 1 - value = (value * width) - rand(1,width) - return num2hex(value, blocksize) - -//value is hex -/proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE) - var/width = round((16**blocksize)/values) - value = round(hex2num(value) / width) + 1 - if(value > values) - value = values - return value - -/////////////////////////// DNA HELPER-PROCS +/////////////////////////// DNA DATUM +/datum/dna + var/unique_enzymes + var/struc_enzymes + var/uni_identity + var/blood_type + var/datum/species/species = new /datum/species/human() //The type of mutant race the player is if applicable (i.e. potato-man) + var/list/features = list("FFF") //first value is mutant color + var/real_name //Stores the real name of the person who originally got this dna datum. Used primarely for changelings, + var/list/mutations = list() //All mutations are from now on here + var/list/temporary_mutations = list() //Timers for temporary mutations + var/list/previous = list() //For temporary name/ui/ue/blood_type modifications + var/mob/living/holder + +/datum/dna/New(mob/living/new_holder) + if(new_holder) + holder = new_holder + +/datum/dna/proc/transfer_identity(mob/living/carbon/destination, transfer_SE = 0) + if(!istype(destination)) + return + destination.dna.unique_enzymes = unique_enzymes + destination.dna.uni_identity = uni_identity + destination.dna.blood_type = blood_type + destination.set_species(species.type, icon_update=0) + destination.dna.features = features.Copy() + destination.dna.real_name = real_name + destination.dna.temporary_mutations = temporary_mutations.Copy() + if(transfer_SE) + destination.dna.struc_enzymes = struc_enzymes + if(ishuman(destination)) + var/mob/living/carbon/human/H = destination + H.give_genitals(TRUE)//This gives the body the genitals of this DNA. Used for any transformations based on DNA + destination.flavor_text = destination.dna.features["flavor_text"] //Update the flavor_text to use new dna text + +/datum/dna/proc/copy_dna(datum/dna/new_dna) + new_dna.unique_enzymes = unique_enzymes + new_dna.struc_enzymes = struc_enzymes + new_dna.uni_identity = uni_identity + new_dna.blood_type = blood_type + new_dna.features = features.Copy() + new_dna.species = new species.type + new_dna.real_name = real_name + new_dna.mutations = mutations.Copy() + +/datum/dna/proc/add_mutation(mutation_name) + var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name] + HM.on_acquiring(holder) + +/datum/dna/proc/remove_mutation(mutation_name) + var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name] + HM.on_losing(holder) + +/datum/dna/proc/check_mutation(mutation_name) + var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name] + return mutations.Find(HM) + +/datum/dna/proc/remove_all_mutations() + remove_mutation_group(mutations) + +/datum/dna/proc/remove_mutation_group(list/group) + if(!group) + return + for(var/datum/mutation/human/HM in group) + HM.force_lose(holder) + +/datum/dna/proc/generate_uni_identity() + . = "" + var/list/L = new /list(DNA_UNI_IDENTITY_BLOCKS) + + L[DNA_GENDER_BLOCK] = construct_block((holder.gender!=MALE)+1, 2) + if(ishuman(holder)) + var/mob/living/carbon/human/H = holder + if(!GLOB.hair_styles_list.len) + init_sprite_accessory_subtypes(/datum/sprite_accessory/hair,GLOB.hair_styles_list, GLOB.hair_styles_male_list, GLOB.hair_styles_female_list) + L[DNA_HAIR_STYLE_BLOCK] = construct_block(GLOB.hair_styles_list.Find(H.hair_style), GLOB.hair_styles_list.len) + L[DNA_HAIR_COLOR_BLOCK] = sanitize_hexcolor(H.hair_color) + if(!GLOB.facial_hair_styles_list.len) + init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, GLOB.facial_hair_styles_list, GLOB.facial_hair_styles_male_list, GLOB.facial_hair_styles_female_list) + L[DNA_FACIAL_HAIR_STYLE_BLOCK] = construct_block(GLOB.facial_hair_styles_list.Find(H.facial_hair_style), GLOB.facial_hair_styles_list.len) + L[DNA_FACIAL_HAIR_COLOR_BLOCK] = sanitize_hexcolor(H.facial_hair_color) + L[DNA_SKIN_TONE_BLOCK] = construct_block(GLOB.skin_tones.Find(H.skin_tone), GLOB.skin_tones.len) + L[DNA_EYE_COLOR_BLOCK] = sanitize_hexcolor(H.eye_color) + + for(var/i=1, i<=DNA_UNI_IDENTITY_BLOCKS, i++) + if(L[i]) + . += L[i] + else + . += random_string(DNA_BLOCK_SIZE,GLOB.hex_characters) + return . + +/datum/dna/proc/generate_struc_enzymes() + var/list/sorting = new /list(DNA_STRUC_ENZYMES_BLOCKS) + var/result = "" + for(var/datum/mutation/human/A in GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations) + if(A.name == RACEMUT && ismonkey(holder)) + sorting[A.dna_block] = num2hex(A.lowest_value + rand(0, 256 * 6), DNA_BLOCK_SIZE) + mutations |= A + else + sorting[A.dna_block] = random_string(DNA_BLOCK_SIZE, list("0","1","2","3","4","5","6")) + + for(var/B in sorting) + result += B + return result + +/datum/dna/proc/generate_unique_enzymes() + . = "" + if(istype(holder)) + real_name = holder.real_name + . += md5(holder.real_name) + else + . += random_string(DNA_UNIQUE_ENZYMES_LEN, GLOB.hex_characters) + return . + +/datum/dna/proc/update_ui_block(blocknumber) + if(!blocknumber || !ishuman(holder)) + return + var/mob/living/carbon/human/H = holder + switch(blocknumber) + if(DNA_HAIR_COLOR_BLOCK) + setblock(uni_identity, blocknumber, sanitize_hexcolor(H.hair_color)) + if(DNA_FACIAL_HAIR_COLOR_BLOCK) + setblock(uni_identity, blocknumber, sanitize_hexcolor(H.facial_hair_color)) + if(DNA_SKIN_TONE_BLOCK) + setblock(uni_identity, blocknumber, construct_block(GLOB.skin_tones.Find(H.skin_tone), GLOB.skin_tones.len)) + if(DNA_EYE_COLOR_BLOCK) + setblock(uni_identity, blocknumber, sanitize_hexcolor(H.eye_color)) + if(DNA_GENDER_BLOCK) + setblock(uni_identity, blocknumber, construct_block((H.gender!=MALE)+1, 2)) + if(DNA_FACIAL_HAIR_STYLE_BLOCK) + setblock(uni_identity, blocknumber, construct_block(GLOB.facial_hair_styles_list.Find(H.facial_hair_style), GLOB.facial_hair_styles_list.len)) + if(DNA_HAIR_STYLE_BLOCK) + setblock(uni_identity, blocknumber, construct_block(GLOB.hair_styles_list.Find(H.hair_style), GLOB.hair_styles_list.len)) + +/datum/dna/proc/mutations_say_mods(message) + if(message) + for(var/datum/mutation/human/M in mutations) + message = M.say_mod(message) + return message + +/datum/dna/proc/mutations_get_spans() + var/list/spans = list() + for(var/datum/mutation/human/M in mutations) + spans |= M.get_spans() + return spans + +/datum/dna/proc/species_get_spans() + var/list/spans = list() + if(species) + spans |= species.get_spans() + return spans + + +/datum/dna/proc/is_same_as(datum/dna/D) + if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name) + if(species.type == D.species.type && features == D.features && blood_type == D.blood_type) + return 1 + return 0 + +//used to update dna UI, UE, and dna.real_name. +/datum/dna/proc/update_dna_identity() + uni_identity = generate_uni_identity() + unique_enzymes = generate_unique_enzymes() + +/datum/dna/proc/initialize_dna(newblood_type) + if(newblood_type) + blood_type = newblood_type + unique_enzymes = generate_unique_enzymes() + uni_identity = generate_uni_identity() + struc_enzymes = generate_struc_enzymes() + features = random_features() + + +/datum/dna/stored //subtype used by brain mob's stored_dna + +/datum/dna/stored/add_mutation(mutation_name) //no mutation changes on stored dna. + return + +/datum/dna/stored/remove_mutation(mutation_name) + return + +/datum/dna/stored/check_mutation(mutation_name) + return + +/datum/dna/stored/remove_all_mutations() + return + +/datum/dna/stored/remove_mutation_group(list/group) + return + +/////////////////////////// DNA MOB-PROCS ////////////////////// + +/mob/proc/set_species(datum/species/mrace, icon_update = 1) + return + +/mob/living/brain/set_species(datum/species/mrace, icon_update = 1) + if(mrace) + if(ispath(mrace)) + stored_dna.species = new mrace() + else + stored_dna.species = mrace //not calling any species update procs since we're a brain, not a monkey/human + + +/mob/living/carbon/set_species(datum/species/mrace, icon_update = 1) + if(mrace && has_dna()) + dna.species.on_species_loss(src) + var/old_species = dna.species + if(ispath(mrace)) + dna.species = new mrace() + else + dna.species = mrace + dna.species.on_species_gain(src, old_species) + +/mob/living/carbon/human/set_species(datum/species/mrace, icon_update = 1) + ..() + if(icon_update) + update_body() + update_hair() + update_body_parts() + update_mutations_overlay()// no lizard with human hulk overlay please. + + +/mob/proc/has_dna() + return + +/mob/living/carbon/has_dna() + return dna + + +/mob/living/carbon/human/proc/hardset_dna(ui, se, newreal_name, newblood_type, datum/species/mrace, newfeatures) + + if(newfeatures) + dna.features = newfeatures + flavor_text = dna.features["flavor_text"] //Update the flavor_text to use new dna text + + if(mrace) + 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 + dna.generate_unique_enzymes() + + if(newblood_type) + dna.blood_type = newblood_type + + if(ui) + dna.uni_identity = ui + updateappearance(icon_update=0) + + if(se) + dna.struc_enzymes = se + domutcheck() + + if(mrace || newfeatures || ui) + update_body() + update_hair() + update_body_parts() + update_mutations_overlay() + + +/mob/living/carbon/proc/create_dna() + dna = new /datum/dna(src) + if(!dna.species) + 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 +/mob/living/carbon/proc/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0) + if(!has_dna()) + return + gender = (deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 2)-1) ? FEMALE : MALE + +/mob/living/carbon/human/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0) + ..() + var/structure = dna.uni_identity + hair_color = sanitize_hexcolor(getblock(structure, DNA_HAIR_COLOR_BLOCK)) + facial_hair_color = sanitize_hexcolor(getblock(structure, DNA_FACIAL_HAIR_COLOR_BLOCK)) + skin_tone = GLOB.skin_tones[deconstruct_block(getblock(structure, DNA_SKIN_TONE_BLOCK), GLOB.skin_tones.len)] + eye_color = sanitize_hexcolor(getblock(structure, DNA_EYE_COLOR_BLOCK)) + facial_hair_style = GLOB.facial_hair_styles_list[deconstruct_block(getblock(structure, DNA_FACIAL_HAIR_STYLE_BLOCK), GLOB.facial_hair_styles_list.len)] + hair_style = GLOB.hair_styles_list[deconstruct_block(getblock(structure, DNA_HAIR_STYLE_BLOCK), GLOB.hair_styles_list.len)] + if(icon_update) + update_body() + update_hair() + if(mutcolor_update) + update_body_parts() + if(mutations_overlay_update) + update_mutations_overlay() + + +/mob/proc/domutcheck() + return + +/mob/living/carbon/domutcheck(force_powers=0) //Set force_powers to 1 to bypass the power chance + if(!has_dna()) + return + + for(var/datum/mutation/human/A in GLOB.good_mutations | GLOB.bad_mutations | GLOB.not_good_mutations) + if(ismob(A.check_block(src, force_powers))) + return //we got monkeyized/humanized, this mob will be deleted, no need to continue. + + update_mutations_overlay() + + + +/////////////////////////// DNA HELPER-PROCS ////////////////////////////// +/proc/getleftblocks(input,blocknumber,blocksize) + if(blocknumber > 1) + return copytext(input,1,((blocksize*blocknumber)-(blocksize-1))) + +/proc/getrightblocks(input,blocknumber,blocksize) + if(blocknumber < (length(input)/blocksize)) + return copytext(input,blocksize*blocknumber+1,length(input)+1) + +/proc/getblock(input, blocknumber, blocksize=DNA_BLOCK_SIZE) + return copytext(input, blocksize*(blocknumber-1)+1, (blocksize*blocknumber)+1) + +/proc/setblock(istring, blocknumber, replacement, blocksize=DNA_BLOCK_SIZE) + if(!istring || !blocknumber || !replacement || !blocksize) + return 0 + return getleftblocks(istring, blocknumber, blocksize) + replacement + getrightblocks(istring, blocknumber, blocksize) + +/mob/living/carbon/proc/randmut(list/candidates, difficulty = 2) + if(!has_dna()) + return + var/datum/mutation/human/num = pick(candidates) + . = num.force_give(src) + +/mob/living/carbon/proc/randmutb() + if(!has_dna()) + return + var/datum/mutation/human/HM = pick((GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT]) + . = HM.force_give(src) + +/mob/living/carbon/proc/randmutg() + if(!has_dna()) + return + var/datum/mutation/human/HM = pick(GLOB.good_mutations) + . = HM.force_give(src) + +/mob/living/carbon/proc/randmutvg() + if(!has_dna()) + return + var/datum/mutation/human/HM = pick((GLOB.good_mutations) - GLOB.mutations_list[HULK] - GLOB.mutations_list[DWARFISM]) + . = HM.force_give(src) + +/mob/living/carbon/proc/randmuti() + if(!has_dna()) + return + var/num = rand(1, DNA_UNI_IDENTITY_BLOCKS) + var/newdna = setblock(dna.uni_identity, num, random_string(DNA_BLOCK_SIZE, GLOB.hex_characters)) + dna.uni_identity = newdna + updateappearance(mutations_overlay_update=1) + +/mob/living/carbon/proc/clean_dna() + if(!has_dna()) + return + dna.remove_all_mutations() + +/mob/living/carbon/proc/clean_randmut(list/candidates, difficulty = 2) + clean_dna() + randmut(candidates, difficulty) + +/proc/scramble_dna(mob/living/carbon/M, ui=FALSE, se=FALSE, probability) + if(!M.has_dna()) + return 0 + if(se) + for(var/i=1, i<=DNA_STRUC_ENZYMES_BLOCKS, i++) + if(prob(probability)) + M.dna.struc_enzymes = setblock(M.dna.struc_enzymes, i, random_string(DNA_BLOCK_SIZE, GLOB.hex_characters)) + M.domutcheck() + if(ui) + for(var/i=1, i<=DNA_UNI_IDENTITY_BLOCKS, i++) + if(prob(probability)) + M.dna.uni_identity = setblock(M.dna.uni_identity, i, random_string(DNA_BLOCK_SIZE, GLOB.hex_characters)) + M.updateappearance(mutations_overlay_update=1) + return 1 + +//value in range 1 to values. values must be greater than 0 +//all arguments assumed to be positive integers +/proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE) + var/width = round((16**blocksize)/values) + if(value < 1) + value = 1 + value = (value * width) - rand(1,width) + return num2hex(value, blocksize) + +//value is hex +/proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE) + var/width = round((16**blocksize)/values) + value = round(hex2num(value) / width) + 1 + if(value > values) + value = values + return value + +/////////////////////////// DNA HELPER-PROCS diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm index 5e381c0322..9869b43d8f 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 620973487a..e07e4c62ed 100644 --- a/code/datums/forced_movement.dm +++ b/code/datums/forced_movement.dm @@ -1,90 +1,90 @@ -//Just new and forget -/datum/forced_movement - var/atom/movable/victim - var/atom/target - var/last_processed - var/steps_per_tick - var/allow_climbing - var/datum/callback/on_step - var/moved_at_all = FALSE - //as fast as ssfastprocess -/datum/forced_movement/New(atom/movable/_victim, atom/_target, _steps_per_tick = 0.5, _allow_climbing = FALSE, datum/callback/_on_step = null) - victim = _victim - target = _target - steps_per_tick = _steps_per_tick - allow_climbing = _allow_climbing - on_step = _on_step - - . = ..() - - if(_victim && _target && _steps_per_tick && !_victim.force_moving) - last_processed = world.time - _victim.force_moving = src - START_PROCESSING(SSfastprocess, src) - else - qdel(src) //if you want to overwrite the current forced movement, call qdel(victim.force_moving) before creating this - -/datum/forced_movement/Destroy() - if(victim.force_moving == src) - victim.force_moving = null - if(moved_at_all) - victim.forceMove(victim.loc) //get the side effects of moving here that require us to currently not be force_moving aka reslipping on ice - STOP_PROCESSING(SSfastprocess, src) - victim = null - target = null - return ..() - -/datum/forced_movement/process() - if(QDELETED(victim) || !victim.loc || QDELETED(target) || !target.loc) - qdel(src) - return - var/steps_to_take = round(steps_per_tick * (world.time - last_processed)) - if(steps_to_take) - for(var/i in 1 to steps_to_take) - if(TryMove()) - moved_at_all = TRUE - if(on_step) - on_step.InvokeAsync() - else - qdel(src) - return - last_processed = world.time - -/datum/forced_movement/proc/TryMove(recursive = FALSE) - var/atom/movable/vic = victim //sanic - var/atom/tar = target - - if(!recursive) - . = step_towards(vic, tar) - - //shit way for getting around corners - if(!.) - if(tar.x > vic.x) - if(step(vic, EAST)) - . = TRUE - else if(tar.x < vic.x) - if(step(vic, WEST)) - . = TRUE - - if(!.) - if(tar.y > vic.y) - if(step(vic, NORTH)) - . = TRUE - else if(tar.y < vic.y) - if(step(vic, SOUTH)) - . = TRUE - - if(!.) - if(recursive) - return FALSE - else - . = TryMove(TRUE) - - . = . && (vic.loc != tar.loc) - +//Just new and forget +/datum/forced_movement + var/atom/movable/victim + var/atom/target + var/last_processed + var/steps_per_tick + var/allow_climbing + var/datum/callback/on_step + var/moved_at_all = FALSE + //as fast as ssfastprocess +/datum/forced_movement/New(atom/movable/_victim, atom/_target, _steps_per_tick = 0.5, _allow_climbing = FALSE, datum/callback/_on_step = null) + victim = _victim + target = _target + steps_per_tick = _steps_per_tick + allow_climbing = _allow_climbing + on_step = _on_step + + . = ..() + + if(_victim && _target && _steps_per_tick && !_victim.force_moving) + last_processed = world.time + _victim.force_moving = src + START_PROCESSING(SSfastprocess, src) + else + qdel(src) //if you want to overwrite the current forced movement, call qdel(victim.force_moving) before creating this + +/datum/forced_movement/Destroy() + if(victim.force_moving == src) + victim.force_moving = null + if(moved_at_all) + victim.forceMove(victim.loc) //get the side effects of moving here that require us to currently not be force_moving aka reslipping on ice + STOP_PROCESSING(SSfastprocess, src) + victim = null + target = null + return ..() + +/datum/forced_movement/process() + if(QDELETED(victim) || !victim.loc || QDELETED(target) || !target.loc) + qdel(src) + return + var/steps_to_take = round(steps_per_tick * (world.time - last_processed)) + if(steps_to_take) + for(var/i in 1 to steps_to_take) + if(TryMove()) + moved_at_all = TRUE + if(on_step) + on_step.InvokeAsync() + else + qdel(src) + return + last_processed = world.time + +/datum/forced_movement/proc/TryMove(recursive = FALSE) + var/atom/movable/vic = victim //sanic + var/atom/tar = target + + if(!recursive) + . = step_towards(vic, tar) + + //shit way for getting around corners + if(!.) + if(tar.x > vic.x) + if(step(vic, EAST)) + . = TRUE + else if(tar.x < vic.x) + if(step(vic, WEST)) + . = TRUE + + if(!.) + if(tar.y > vic.y) + if(step(vic, NORTH)) + . = TRUE + else if(tar.y < vic.y) + if(step(vic, SOUTH)) + . = TRUE + + if(!.) + if(recursive) + return FALSE + else + . = TryMove(TRUE) + + . = . && (vic.loc != tar.loc) + /mob/Collide(atom/A) - . = ..() - if(force_moving && force_moving.allow_climbing && istype(A, /obj/structure)) - var/obj/structure/S = A - if(S.climbable) - S.do_climb(src) + . = ..() + 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 e4017e9ece..7768a929da 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -1,103 +1,111 @@ -#define FORWARD -1 -#define BACKWARD 1 - -/datum/construction - var/list/steps - var/atom/holder - var/result - var/list/steps_desc - -/datum/construction/New(atom) - ..() - holder = atom - if(!holder) //don't want this without a holder - qdel(src) - set_desc(steps.len) - return - -/datum/construction/proc/next_step() - steps.len-- - if(!steps.len) - spawn_result() - else - set_desc(steps.len) - return - -/datum/construction/proc/action(atom/used_atom,mob/user) - return - -/datum/construction/proc/check_step(atom/used_atom,mob/user) //check last step only - var/valid_step = is_right_key(used_atom) - if(valid_step) - if(custom_action(valid_step, used_atom, user)) - next_step() - return 1 - return 0 - -/datum/construction/proc/is_right_key(atom/used_atom) // returns current step num if used_atom is of the right type. - var/list/L = steps[steps.len] - if(istype(used_atom, L["key"])) - return steps.len - return 0 - -/datum/construction/proc/custom_action(step, used_atom, user) - return 1 - -/datum/construction/proc/check_all_steps(atom/used_atom,mob/user) //check all steps, remove matching one. - for(var/i=1;i<=steps.len;i++) - var/list/L = steps[i]; - if(istype(used_atom, L["key"])) - if(custom_action(i, used_atom, user)) - steps[i]=null;//stupid byond list from list removal... - listclearnulls(steps); - if(!steps.len) - spawn_result() - return 1 - return 0 - - -/datum/construction/proc/spawn_result() - if(result) - new result(get_turf(holder)) - qdel(holder) - return - -/datum/construction/proc/set_desc(index as num) - var/list/step = steps[index] - holder.desc = step["desc"] - return - -/datum/construction/reversible - var/index - -/datum/construction/reversible/New(atom) - ..() - index = steps.len - return - -/datum/construction/reversible/proc/update_index(diff as num) - index+=diff - if(index==0) - spawn_result() - else - set_desc(index) - return - -/datum/construction/reversible/is_right_key(atom/used_atom) // returns index step - var/list/L = steps[index] - if(istype(used_atom, L["key"])) - return FORWARD //to the first step -> forward - else if(L["backkey"] && istype(used_atom, L["backkey"])) - return BACKWARD //to the last step -> backwards - return 0 - -/datum/construction/reversible/check_step(atom/used_atom,mob/user) - var/diff = is_right_key(used_atom) - if(diff) - if(custom_action(index, diff, used_atom, user)) - update_index(diff) - return 1 - return 0 - -/datum/construction/reversible/custom_action(index, diff, used_atom, user) - return 1 +#define FORWARD -1 +#define BACKWARD 1 + +/datum/construction + var/list/steps + var/atom/holder + var/result + var/list/steps_desc + +/datum/construction/New(atom) + ..() + holder = atom + if(!holder) //don't want this without a holder + qdel(src) + set_desc(steps.len) + return + +/datum/construction/proc/next_step() + steps.len-- + if(!steps.len) + spawn_result() + else + set_desc(steps.len) + return + +/datum/construction/proc/action(atom/used_atom,mob/user) + return + +/datum/construction/proc/check_step(atom/used_atom,mob/user) //check last step only + var/valid_step = is_right_key(used_atom) + if(valid_step) + if(custom_action(valid_step, used_atom, user)) + next_step() + return 1 + return 0 + +/datum/construction/proc/is_right_key(atom/used_atom) // returns current step num if used_atom is of the right type. + var/list/L = steps[steps.len] + if(istype(used_atom, L["key"])) + return steps.len + return 0 + +/datum/construction/proc/custom_action(step, used_atom, user) + return 1 + +/datum/construction/proc/check_all_steps(atom/used_atom,mob/user) //check all steps, remove matching one. + for(var/i=1;i<=steps.len;i++) + var/list/L = steps[i]; + if(istype(used_atom, L["key"])) + if(custom_action(i, used_atom, user)) + steps[i]=null;//stupid byond list from list removal... + listclearnulls(steps); + if(!steps.len) + spawn_result() + return 1 + return 0 + + +/datum/construction/proc/spawn_result() + if(result) + new result(get_turf(holder)) + 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"] + return + +/datum/construction/reversible + var/index + +/datum/construction/reversible/New(atom) + ..() + index = steps.len + return + +/datum/construction/reversible/proc/update_index(diff as num) + index+=diff + if(index==0) + spawn_result() + else + set_desc(index) + return + +/datum/construction/reversible/is_right_key(atom/used_atom) // returns index step + var/list/L = steps[index] + if(istype(used_atom, L["key"])) + return FORWARD //to the first step -> forward + else if(L["backkey"] && istype(used_atom, L["backkey"])) + return BACKWARD //to the last step -> backwards + return 0 + +/datum/construction/reversible/check_step(atom/used_atom,mob/user) + var/diff = is_right_key(used_atom) + if(diff) + if(custom_action(index, diff, used_atom, user)) + update_index(diff) + return 1 + return 0 + +/datum/construction/reversible/custom_action(index, diff, used_atom, user) + return 1 diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 806f48a24f..7b60070fc7 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -2,19 +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() && fexists(SERVICE_PR_TEST_JSON)) - testmerge = json_decode(file2text(SERVICE_PR_TEST_JSON)) -#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) @@ -30,58 +21,24 @@ 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" @@ -95,44 +52,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/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index fc943a8049..0eb76388ae 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -1,230 +1,230 @@ -//wrapper -/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) - var/datum/teleport/instant/science/D = new - if(D.start(arglist(args))) - return 1 - return 0 - -/datum/teleport - var/atom/movable/teleatom //atom to teleport - var/atom/destination //destination to teleport to - var/precision = 0 //teleport precision - var/datum/effect_system/effectin //effect to show right before teleportation - var/datum/effect_system/effectout //effect to show right after teleportation - var/soundin //soundfile to play before teleportation - var/soundout //soundfile to play after teleportation - var/force_teleport = 1 //if false, teleport will use Move() proc (dense objects will prevent teleportation) - -/datum/teleport/proc/start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) - if(!initTeleport(arglist(args))) - return 0 - return 1 - -/datum/teleport/proc/initTeleport(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout) - if(!setTeleatom(ateleatom)) - return 0 - if(!setDestination(adestination)) - return 0 - if(!setPrecision(aprecision)) - return 0 - setEffects(aeffectin,aeffectout) - setForceTeleport(afteleport) - setSounds(asoundin,asoundout) - return 1 - -//must succeed -/datum/teleport/proc/setPrecision(aprecision) - if(isnum(aprecision)) - precision = aprecision - return 1 - return 0 - -//must succeed -/datum/teleport/proc/setDestination(atom/adestination) - if(istype(adestination)) - destination = adestination - return 1 - return 0 - -//must succeed in most cases -/datum/teleport/proc/setTeleatom(atom/movable/ateleatom) - if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon)) - qdel(ateleatom) - return 0 - if(istype(ateleatom)) - teleatom = ateleatom - return 1 - return 0 - -//custom effects must be properly set up first for instant-type teleports -//optional -/datum/teleport/proc/setEffects(datum/effect_system/aeffectin=null,datum/effect_system/aeffectout=null) - effectin = istype(aeffectin) ? aeffectin : null - effectout = istype(aeffectout) ? aeffectout : null - return 1 - -//optional -/datum/teleport/proc/setForceTeleport(afteleport) - force_teleport = afteleport - return 1 - -//optional -/datum/teleport/proc/setSounds(asoundin=null,asoundout=null) - soundin = isfile(asoundin) ? asoundin : null - soundout = isfile(asoundout) ? asoundout : null - return 1 - -//placeholder -/datum/teleport/proc/teleportChecks() - return 1 - -/datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound) - if(location) - if(effect) - INVOKE_ASYNC(src, .proc/do_effect, location, effect) - if(sound) - INVOKE_ASYNC(src, .proc/do_sound, location, sound) - -/datum/teleport/proc/do_effect(atom/location, datum/effect_system/effect) - src = null - effect.attach(location) - effect.start() - -/datum/teleport/proc/do_sound(atom/location, sound) - src = null - playsound(location, sound, 60, 1) - -//do the monkey dance -/datum/teleport/proc/doTeleport() - - var/turf/destturf - var/turf/curturf = get_turf(teleatom) - destturf = get_teleport_turf(get_turf(destination), precision) - - if(!destturf || !curturf || destturf.is_transition_turf()) - return 0 - - var/area/A = get_area(curturf) - if(A.noteleport) - return 0 - - playSpecials(curturf,effectin,soundin) - if(force_teleport) - teleatom.forceMove(destturf) - if(ismegafauna(teleatom)) - message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_COORDJMP(curturf)] to [ADMIN_COORDJMP(destturf)].") - playSpecials(destturf,effectout,soundout) - else - if(teleatom.Move(destturf)) - playSpecials(destturf,effectout,soundout) - if(ismegafauna(teleatom)) - message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_COORDJMP(curturf)] to [ADMIN_COORDJMP(destturf)].") - return 1 - -/datum/teleport/proc/teleport() - if(teleportChecks()) - return doTeleport() - return 0 - -/datum/teleport/instant //teleports when datum is created - - start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) - if(..()) - if(teleport()) - return 1 - return 0 - - -/datum/teleport/instant/science - -/datum/teleport/instant/science/setEffects(datum/effect_system/aeffectin,datum/effect_system/aeffectout) - if(aeffectin==null || aeffectout==null) - var/datum/effect_system/spark_spread/aeffect = new - aeffect.set_up(5, 1, teleatom) - effectin = effectin || aeffect - effectout = effectout || aeffect - return 1 - else - return ..() - -/datum/teleport/instant/science/setPrecision(aprecision) - ..() - if(istype(teleatom, /obj/item/storage/backpack/holding)) - precision = rand(1,100) - - var/list/bagholding = teleatom.search_contents_for(/obj/item/storage/backpack/holding) - if(bagholding.len) - precision = max(rand(1,100)*bagholding.len,100) - if(isliving(teleatom)) - var/mob/living/MM = teleatom - to_chat(MM, "The bluespace interface on your bag of holding interferes with the teleport!") - return 1 - -// Safe location finder - -/proc/find_safe_turf(zlevel = ZLEVEL_STATION, list/zlevels, extended_safety_checks = FALSE) - if(!zlevels) - zlevels = list(zlevel) - var/cycles = 1000 - for(var/cycle in 1 to cycles) - // DRUNK DIALLING WOOOOOOOOO - var/x = rand(1, world.maxx) - var/y = rand(1, world.maxy) - var/z = pick(zlevels) - var/random_location = locate(x,y,z) - - if(!isfloorturf(random_location)) - continue - var/turf/open/floor/F = random_location - if(!F.air) - continue - - var/datum/gas_mixture/A = F.air - var/list/A_gases = A.gases - var/trace_gases - for(var/id in A_gases) - if(id in GLOB.hardcoded_gases) - continue - trace_gases = TRUE - break - - // Can most things breathe? - if(trace_gases) - continue - if(!(A_gases["o2"] && A_gases["o2"][MOLES] >= 16)) - continue - if(A_gases["plasma"]) - continue - if(A_gases["co2"] && A_gases["co2"][MOLES] >= 10) - continue - - // Aim for goldilocks temperatures and pressure - if((A.temperature <= 270) || (A.temperature >= 360)) - continue - var/pressure = A.return_pressure() - if((pressure <= 20) || (pressure >= 550)) - continue - - if(extended_safety_checks) +//wrapper +/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) + var/datum/teleport/instant/science/D = new + if(D.start(arglist(args))) + return 1 + return 0 + +/datum/teleport + var/atom/movable/teleatom //atom to teleport + var/atom/destination //destination to teleport to + var/precision = 0 //teleport precision + var/datum/effect_system/effectin //effect to show right before teleportation + var/datum/effect_system/effectout //effect to show right after teleportation + var/soundin //soundfile to play before teleportation + var/soundout //soundfile to play after teleportation + var/force_teleport = 1 //if false, teleport will use Move() proc (dense objects will prevent teleportation) + +/datum/teleport/proc/start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) + if(!initTeleport(arglist(args))) + return 0 + return 1 + +/datum/teleport/proc/initTeleport(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout) + if(!setTeleatom(ateleatom)) + return 0 + if(!setDestination(adestination)) + return 0 + if(!setPrecision(aprecision)) + return 0 + setEffects(aeffectin,aeffectout) + setForceTeleport(afteleport) + setSounds(asoundin,asoundout) + return 1 + +//must succeed +/datum/teleport/proc/setPrecision(aprecision) + if(isnum(aprecision)) + precision = aprecision + return 1 + return 0 + +//must succeed +/datum/teleport/proc/setDestination(atom/adestination) + if(istype(adestination)) + destination = adestination + return 1 + return 0 + +//must succeed in most cases +/datum/teleport/proc/setTeleatom(atom/movable/ateleatom) + if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon)) + qdel(ateleatom) + return 0 + if(istype(ateleatom)) + teleatom = ateleatom + return 1 + return 0 + +//custom effects must be properly set up first for instant-type teleports +//optional +/datum/teleport/proc/setEffects(datum/effect_system/aeffectin=null,datum/effect_system/aeffectout=null) + effectin = istype(aeffectin) ? aeffectin : null + effectout = istype(aeffectout) ? aeffectout : null + return 1 + +//optional +/datum/teleport/proc/setForceTeleport(afteleport) + force_teleport = afteleport + return 1 + +//optional +/datum/teleport/proc/setSounds(asoundin=null,asoundout=null) + soundin = isfile(asoundin) ? asoundin : null + soundout = isfile(asoundout) ? asoundout : null + return 1 + +//placeholder +/datum/teleport/proc/teleportChecks() + return 1 + +/datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound) + if(location) + if(effect) + INVOKE_ASYNC(src, .proc/do_effect, location, effect) + if(sound) + INVOKE_ASYNC(src, .proc/do_sound, location, sound) + +/datum/teleport/proc/do_effect(atom/location, datum/effect_system/effect) + src = null + effect.attach(location) + effect.start() + +/datum/teleport/proc/do_sound(atom/location, sound) + src = null + playsound(location, sound, 60, 1) + +//do the monkey dance +/datum/teleport/proc/doTeleport() + + var/turf/destturf + var/turf/curturf = get_turf(teleatom) + destturf = get_teleport_turf(get_turf(destination), precision) + + if(!destturf || !curturf || destturf.is_transition_turf()) + return 0 + + var/area/A = get_area(curturf) + if(A.noteleport) + return 0 + + playSpecials(curturf,effectin,soundin) + if(force_teleport) + teleatom.forceMove(destturf) + if(ismegafauna(teleatom)) + message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_COORDJMP(curturf)] to [ADMIN_COORDJMP(destturf)].") + playSpecials(destturf,effectout,soundout) + else + if(teleatom.Move(destturf)) + playSpecials(destturf,effectout,soundout) + if(ismegafauna(teleatom)) + message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_COORDJMP(curturf)] to [ADMIN_COORDJMP(destturf)].") + return 1 + +/datum/teleport/proc/teleport() + if(teleportChecks()) + return doTeleport() + return 0 + +/datum/teleport/instant //teleports when datum is created + + start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) + if(..()) + if(teleport()) + return 1 + return 0 + + +/datum/teleport/instant/science + +/datum/teleport/instant/science/setEffects(datum/effect_system/aeffectin,datum/effect_system/aeffectout) + if(aeffectin==null || aeffectout==null) + var/datum/effect_system/spark_spread/aeffect = new + aeffect.set_up(5, 1, teleatom) + effectin = effectin || aeffect + effectout = effectout || aeffect + return 1 + else + return ..() + +/datum/teleport/instant/science/setPrecision(aprecision) + ..() + if(istype(teleatom, /obj/item/storage/backpack/holding)) + precision = rand(1,100) + + var/list/bagholding = teleatom.search_contents_for(/obj/item/storage/backpack/holding) + if(bagholding.len) + precision = max(rand(1,100)*bagholding.len,100) + if(isliving(teleatom)) + var/mob/living/MM = teleatom + to_chat(MM, "The bluespace interface on your bag of holding interferes with the teleport!") + return 1 + +// Safe location finder + +/proc/find_safe_turf(zlevel = ZLEVEL_STATION_PRIMARY, list/zlevels, extended_safety_checks = FALSE) + if(!zlevels) + zlevels = list(zlevel) + var/cycles = 1000 + for(var/cycle in 1 to cycles) + // DRUNK DIALLING WOOOOOOOOO + var/x = rand(1, world.maxx) + var/y = rand(1, world.maxy) + var/z = pick(zlevels) + var/random_location = locate(x,y,z) + + if(!isfloorturf(random_location)) + continue + var/turf/open/floor/F = random_location + if(!F.air) + continue + + var/datum/gas_mixture/A = F.air + var/list/A_gases = A.gases + var/trace_gases + for(var/id in A_gases) + if(id in GLOB.hardcoded_gases) + continue + trace_gases = TRUE + break + + // Can most things breathe? + if(trace_gases) + continue + if(!(A_gases["o2"] && A_gases["o2"][MOLES] >= 16)) + continue + if(A_gases["plasma"]) + continue + if(A_gases["co2"] && A_gases["co2"][MOLES] >= 10) + continue + + // Aim for goldilocks temperatures and pressure + if((A.temperature <= 270) || (A.temperature >= 360)) + continue + var/pressure = A.return_pressure() + if((pressure <= 20) || (pressure >= 550)) + continue + + if(extended_safety_checks) if(istype(F, /turf/open/lava)) //chasms aren't /floor, and so are pre-filtered var/turf/open/lava/L = F - if(!L.is_safe()) - continue - - // DING! You have passed the gauntlet, and are "probably" safe. - return F - -/proc/get_teleport_turfs(turf/center, precision = 0) - if(!precision) - return list(center) - var/list/posturfs = list() - for(var/turf/T in range(precision,center)) - if(T.is_transition_turf()) - continue // Avoid picking these. - var/area/A = T.loc - if(!A.noteleport) - posturfs.Add(T) - return posturfs - -/proc/get_teleport_turf(turf/center, precision = 0) - return safepick(get_teleport_turfs(center, precision)) + if(!L.is_safe()) + continue + + // DING! You have passed the gauntlet, and are "probably" safe. + return F + +/proc/get_teleport_turfs(turf/center, precision = 0) + if(!precision) + return list(center) + var/list/posturfs = list() + for(var/turf/T in range(precision,center)) + if(T.is_transition_turf()) + continue // Avoid picking these. + var/area/A = T.loc + if(!A.noteleport) + posturfs.Add(T) + return posturfs + +/proc/get_teleport_turf(turf/center, precision = 0) + return safepick(get_teleport_turfs(center, precision)) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index dc78eea396..60a53967ae 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -21,6 +21,7 @@ GLOBAL_LIST_INIT(huds, list( ANTAG_HUD_SOULLESS = new/datum/atom_hud/antag/hidden(), ANTAG_HUD_CLOCKWORK = new/datum/atom_hud/antag(), ANTAG_HUD_BORER = new/datum/atom_hud/antag(), + ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(), )) /datum/atom_hud @@ -75,12 +76,7 @@ GLOBAL_LIST_INIT(huds, list( //MOB PROCS /mob/proc/reload_huds() - var/gang_huds = list() - if(SSticker.mode) - for(var/datum/gang/G in SSticker.mode.gangs) - gang_huds += G.ganghud - - for(var/datum/atom_hud/hud in (GLOB.huds|gang_huds|GLOB.active_alternate_appearances)) + for(var/datum/atom_hud/hud in (GLOB.huds|GLOB.active_alternate_appearances)) if(hud && hud.hudusers[src]) hud.add_hud_to(src) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 4c0a5fb11e..2fb74abfb9 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -4,142 +4,148 @@ // -Cyberboss /datum/map_config - var/config_filename = "_maps/boxstation.json" - var/map_name = "Box Station" - var/map_path = "map_files/BoxStation" - var/map_file = "BoxStation.dmm" + var/config_filename = "_maps/boxstation.json" + var/map_name = "Box Station" + var/map_path = "map_files/BoxStation" + var/map_file = "BoxStation.dmm" - var/minetype = "lavaland" + var/minetype = "lavaland" - var/list/transition_config = list(CENTCOM = SELFLOOPING, + //Order matters here. + var/list/transition_config = list(CENTCOM = SELFLOOPING, + CITY_OF_COGS = SELFLOOPING, MAIN_STATION = CROSSLINKED, - EMPTY_AREA_1 = CROSSLINKED, - EMPTY_AREA_2 = CROSSLINKED, - MINING = SELFLOOPING, - EMPTY_AREA_3 = CROSSLINKED, - EMPTY_AREA_4 = CROSSLINKED, - EMPTY_AREA_5 = CROSSLINKED, - EMPTY_AREA_6 = CROSSLINKED, - EMPTY_AREA_7 = CROSSLINKED, - EMPTY_AREA_8 = CROSSLINKED) - var/defaulted = TRUE //if New failed + 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, + EMPTY_AREA_6 = CROSSLINKED, + EMPTY_AREA_7 = CROSSLINKED, + EMPTY_AREA_8 = CROSSLINKED) + var/defaulted = TRUE //if New failed + + var/config_max_users = 0 + var/config_min_users = 0 + var/voteweight = 1 + var/allow_custom_shuttles = "yes" - var/config_max_users = 0 - 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 - LoadConfig(filename) - if(delete_after) - fdel(filename) + if(default_to_box) + return + LoadConfig(filename) + if(delete_after) + fdel(filename) /datum/map_config/proc/LoadConfig(filename) - if(!fexists(filename)) - log_world("map_config not found: [filename]") - return + if(!fexists(filename)) + log_world("map_config not found: [filename]") + return - var/json = file(filename) - if(!json) - log_world("Could not open map_config: [filename]") - return + var/json = file(filename) + if(!json) + log_world("Could not open map_config: [filename]") + return - json = file2text(json) - if(!json) - log_world("map_config is not text: [filename]") - return + json = file2text(json) + if(!json) + log_world("map_config is not text: [filename]") + return - json = json_decode(json) - if(!json) - log_world("map_config is not json: [filename]") - return + json = json_decode(json) + if(!json) + log_world("map_config is not json: [filename]") + return - if(!ValidateJSON(json)) - log_world("map_config failed to validate for above reason: [filename]") - return + if(!ValidateJSON(json)) + log_world("map_config failed to validate for above reason: [filename]") + return - config_filename = filename + config_filename = filename - map_name = json["map_name"] - map_path = json["map_path"] - map_file = json["map_file"] + map_name = json["map_name"] + map_path = json["map_path"] + map_file = json["map_file"] - minetype = json["minetype"] - allow_custom_shuttles = json["allow_custom_shuttles"] + minetype = json["minetype"] + allow_custom_shuttles = json["allow_custom_shuttles"] - var/list/jtcl = json["transition_config"] + var/list/jtcl = json["transition_config"] - if(jtcl != "default") - transition_config.Cut() + if(jtcl != "default") + transition_config.Cut() - for(var/I in jtcl) - transition_config[TransitionStringToEnum(I)] = TransitionStringToEnum(jtcl[I]) + for(var/I in jtcl) + transition_config[TransitionStringToEnum(I)] = TransitionStringToEnum(jtcl[I]) - defaulted = FALSE + defaulted = FALSE #define CHECK_EXISTS(X) if(!istext(json[X])) { log_world(X + "missing from json!"); return; } /datum/map_config/proc/ValidateJSON(list/json) - CHECK_EXISTS("map_name") - CHECK_EXISTS("map_path") - CHECK_EXISTS("map_file") - CHECK_EXISTS("minetype") - CHECK_EXISTS("transition_config") - CHECK_EXISTS("allow_custom_shuttles") + CHECK_EXISTS("map_name") + CHECK_EXISTS("map_path") + CHECK_EXISTS("map_file") + CHECK_EXISTS("minetype") + CHECK_EXISTS("transition_config") + CHECK_EXISTS("allow_custom_shuttles") - var/path = GetFullMapPath(json["map_path"], json["map_file"]) - if(!fexists(path)) - log_world("Map file ([path]) does not exist!") - return + var/path = GetFullMapPath(json["map_path"], json["map_file"]) + if(!fexists(path)) + log_world("Map file ([path]) does not exist!") + return - if(json["transition_config"] != "default") - if(!islist(json["transition_config"])) - log_world("transition_config is not a list!") - return + if(json["transition_config"] != "default") + if(!islist(json["transition_config"])) + log_world("transition_config is not a list!") + return - var/list/jtcl = json["transition_config"] - for(var/I in jtcl) - if(isnull(TransitionStringToEnum(I))) - log_world("Invalid transition_config option: [I]!") - if(isnull(TransitionStringToEnum(jtcl[I]))) - log_world("Invalid transition_config option: [I]!") + var/list/jtcl = json["transition_config"] + for(var/I in jtcl) + if(isnull(TransitionStringToEnum(I))) + log_world("Invalid transition_config option: [I]!") + if(isnull(TransitionStringToEnum(jtcl[I]))) + log_world("Invalid transition_config option: [I]!") - return TRUE + return TRUE #undef CHECK_EXISTS /datum/map_config/proc/TransitionStringToEnum(string) - switch(string) - if("CROSSLINKED") - return CROSSLINKED - if("SELFLOOPING") - return SELFLOOPING - if("UNAFFECTED") - return UNAFFECTED - if("MAIN_STATION") - return MAIN_STATION - if("CENTCOM") - return CENTCOM - if("MINING") - return MINING - if("EMPTY_AREA_1") - return EMPTY_AREA_1 - if("EMPTY_AREA_2") - return EMPTY_AREA_2 - if("EMPTY_AREA_3") - return EMPTY_AREA_3 - if("EMPTY_AREA_4") - return EMPTY_AREA_4 - if("EMPTY_AREA_5") - return EMPTY_AREA_5 - if("EMPTY_AREA_6") - return EMPTY_AREA_6 - if("EMPTY_AREA_7") - return EMPTY_AREA_7 - if("EMPTY_AREA_8") - return EMPTY_AREA_8 + switch(string) + if("CROSSLINKED") + return CROSSLINKED + if("SELFLOOPING") + return SELFLOOPING + if("UNAFFECTED") + return UNAFFECTED + if("MAIN_STATION") + return MAIN_STATION + if("CENTCOM") + return CENTCOM + if("CITY_OF_COGS") + return CITY_OF_COGS + if("MINING") + return MINING + if("EMPTY_AREA_1") + return EMPTY_AREA_1 + if("EMPTY_AREA_2") + return EMPTY_AREA_2 + if("EMPTY_AREA_3") + return EMPTY_AREA_3 + if("EMPTY_AREA_4") + return EMPTY_AREA_4 + if("EMPTY_AREA_5") + return EMPTY_AREA_5 + if("EMPTY_AREA_6") + return EMPTY_AREA_6 + if("EMPTY_AREA_7") + return EMPTY_AREA_7 + if("EMPTY_AREA_8") + return EMPTY_AREA_8 /datum/map_config/proc/GetFullMapPath(mp = map_path, mf = map_file) - return "_maps/[mp]/[mf]" + return "_maps/[mp]/[mf]" /datum/map_config/proc/MakeNextMap() - return config_filename == "data/next_map.json" || fcopy(config_filename, "data/next_map.json") + return config_filename == "data/next_map.json" || fcopy(config_filename, "data/next_map.json") diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 6ce082bd2a..84f0f00e45 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 78a402a2dc..093e828452 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -56,7 +56,6 @@ var/list/antag_datums var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD - var/datum/gang/gang_datum //Which gang this mind belongs to, if any var/damnation_type = 0 var/datum/mind/soulOwner //who owns the soul. Under normal circumstances, this will point to src var/hasSoul = TRUE // If false, renders the character unable to sell their soul. @@ -64,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 @@ -122,8 +122,9 @@ new_character.key = key //now transfer the key to link the client to our new body if(isliving(new_character)) //New humans and such are by default enabled arousal. Let's always use the new mind's prefs. var/mob/living/L = new_character - L.canbearoused = L.client.prefs.arousable //Technically this should make taking over a character mean the body gain the new minds setting... - L.update_arousal_hud() //Removes the old icon + if(L.client && L.client.prefs) + L.canbearoused = L.client.prefs.arousable //Technically this should make taking over a character mean the body gain the new minds setting... + L.update_arousal_hud() //Removes the old icon /datum/mind/proc/store_memory(new_text) memory += "[new_text]
" @@ -132,10 +133,10 @@ memory = null // Datum antag mind procs -/datum/mind/proc/add_antag_datum(datum_type) +/datum/mind/proc/add_antag_datum(datum_type, team) if(!datum_type) return - var/datum/antagonist/A = new datum_type(src) + var/datum/antagonist/A = new datum_type(src, team) if(!A.can_be_owned(src)) qdel(A) return @@ -195,6 +196,11 @@ src.remove_antag_datum(ANTAG_DATUM_TRAITOR) SSticker.mode.update_traitor_icons_removed(src) +/datum/mind/proc/remove_brother() + if(src in SSticker.mode.brothers) + src.remove_antag_datum(ANTAG_DATUM_BROTHER) + SSticker.mode.update_brother_icons_removed(src) + /datum/mind/proc/remove_nukeop() if(src in SSticker.mode.syndicates) SSticker.mode.syndicates -= src @@ -206,7 +212,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() @@ -228,11 +234,6 @@ remove_objectives() remove_antag_equip() - -/datum/mind/proc/remove_gang() - SSticker.mode.remove_gangster(src,0,1,1) - remove_objectives() - /datum/mind/proc/remove_antag_equip() var/list/Mob_Contents = current.get_contents() for(var/obj/item/I in Mob_Contents) @@ -251,14 +252,11 @@ remove_wizard() remove_cultist() remove_rev() - remove_gang() SSticker.mode.update_changeling_icons_removed(src) SSticker.mode.update_traitor_icons_removed(src) SSticker.mode.update_wiz_icons_removed(src) SSticker.mode.update_cult_icons_removed(src) SSticker.mode.update_rev_icons_removed(src) - if(gang_datum) - gang_datum.remove_gang_hud(src) /datum/mind/proc/equip_traitor(var/employer = "The Syndicate", var/silent = FALSE) if(!current) @@ -311,7 +309,7 @@ traitor_mob.mind.store_memory("Radio Frequency: [format_frequency(R.traitor_frequency)] ([R.name]).") else if(uplink_loc == PDA) - PDA.lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" + PDA.lock_code = "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]" if(!silent) to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Passcode: [PDA.lock_code] ([PDA.name]).") @@ -328,9 +326,6 @@ if(iscultist(creator)) SSticker.mode.add_cultist(src) - else if(is_gangster(creator)) - SSticker.mode.add_gangster(src, creator.mind.gang_datum, TRUE) - else if(is_revolutionary_in_general(creator)) SSticker.mode.add_revolutionary(src) @@ -360,6 +355,12 @@ var/obj_count = 1 for(var/datum/objective/objective in objectives) output += "
Objective #[obj_count++]: [objective.explanation_text]" + var/list/datum/mind/other_owners = objective.get_owners() - src + if(other_owners.len) + output += "
- "
+ for(var/datum/mind/M in other_owners)
+ output += "
" - else - text += " | Disabled in Prefs
" - - for(var/datum/gang/G in SSticker.mode.gangs) - text += "[G.name]: " - if(src in (G.gangsters)) - text += "GANGSTER" - else - text += "gangster" - text += " | " - if(src in (G.bosses)) - text += "GANG LEADER" - text += " | Equipment: give" - var/list/L = current.get_contents() - var/obj/item/device/gangtool/gangtool = locate() in L - if (gangtool) - text += " | take" - - else - text += "gang leader" - text += "
" - - if(GLOB.gang_colors_pool.len) - text += "Create New Gang" - - sections["gang"] = text - - /** ABDUCTION **/ - text = "abductor" + /** Abductors **/ + text = "Abductor" if(SSticker.mode.config_tag == "abductor") text = uppertext(text) text = "[text]: " 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" @@ -700,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,73 +1004,6 @@ -//////////////////// GANG MODE - - else if (href_list["gang"]) - switch(href_list["gang"]) - if("clear") - remove_gang() - message_admins("[key_name_admin(usr)] has de-gang'ed [current].") - log_admin("[key_name(usr)] has de-gang'ed [current].") - - if("equip") - switch(SSticker.mode.equip_gang(current,gang_datum)) - if(1) - to_chat(usr, "Unable to equip territory spraycan!") - if(2) - to_chat(usr, "Unable to equip recruitment pen and spraycan!") - if(3) - to_chat(usr, "Unable to equip gangtool, pen, and spraycan!") - - if("takeequip") - var/list/L = current.get_contents() - for(var/obj/item/pen/gang/pen in L) - qdel(pen) - for(var/obj/item/device/gangtool/gangtool in L) - qdel(gangtool) - for(var/obj/item/toy/crayon/spraycan/gang/SC in L) - qdel(SC) - - if("new") - if(GLOB.gang_colors_pool.len) - var/list/names = list("Random") + GLOB.gang_name_pool - var/gangname = input("Pick a gang name.","Select Name") as null|anything in names - if(gangname && GLOB.gang_colors_pool.len) //Check again just in case another admin made max gangs at the same time - if(!(gangname in GLOB.gang_name_pool)) - gangname = null - var/datum/gang/newgang = new(null,gangname) - SSticker.mode.gangs += newgang - message_admins("[key_name_admin(usr)] has created the [newgang.name] Gang.") - log_admin("[key_name(usr)] has created the [newgang.name] Gang.") - - else if (href_list["gangboss"]) - var/datum/gang/G = locate(href_list["gangboss"]) in SSticker.mode.gangs - if(!G || (src in G.bosses)) - return - SSticker.mode.remove_gangster(src,0,2,1) - G.bosses[src] = GANGSTER_BOSS_STARTING_INFLUENCE - gang_datum = G - special_role = "[G.name] Gang Boss" - G.add_gang_hud(src) - to_chat(current, "You are a [G.name] Gang Boss!") - message_admins("[key_name_admin(usr)] has added [current] to the [G.name] Gang leadership.") - log_admin("[key_name(usr)] has added [current] to the [G.name] Gang leadership.") - SSticker.mode.forge_gang_objectives(src) - SSticker.mode.greet_gang(src,0) - - else if (href_list["gangster"]) - var/datum/gang/G = locate(href_list["gangster"]) in SSticker.mode.gangs - if(!G || (src in G.gangsters)) - return - SSticker.mode.remove_gangster(src,0,2,1) - SSticker.mode.add_gangster(src,G,0) - message_admins("[key_name_admin(usr)] has added [current] to the [G.name] Gang (A).") - log_admin("[key_name(usr)] has added [current] to the [G.name] Gang (A).") - -///////////////////////////////// - - - else if (href_list["cult"]) switch(href_list["cult"]) if("clear") @@ -1130,9 +1036,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"]) @@ -1151,7 +1057,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") @@ -1213,7 +1119,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(get_turf(locate("landmark*Syndicate-Spawn"))) if("dressup") var/mob/living/carbon/human/H = current qdel(H.belt) @@ -1337,13 +1243,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!") @@ -1372,7 +1271,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 @@ -1404,6 +1302,13 @@ if(H) src = H.mind + else if (href_list["brother"]) + switch(href_list["brother"]) + if("clear") + remove_brother() + log_admin("[key_name(usr)] has de-brother'ed [current].") + SSticker.mode.update_brother_icons_removed(src) + else if (href_list["silicon"]) switch(href_list["silicon"]) if("unemag") @@ -1488,7 +1393,7 @@ current.faction |= "syndicate" if(spawnloc) - current.loc = spawnloc + current.forceMove(spawnloc) if(ishuman(current)) var/mob/living/carbon/human/H = current @@ -1538,7 +1443,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) @@ -1583,62 +1488,7 @@ take_uplink() var/fail = 0 fail |= !SSticker.mode.equip_revolutionary(current) - - -/datum/mind/proc/make_Gang(datum/gang/G) - special_role = "[G.name] Gang Boss" - G.bosses += src - gang_datum = G - G.add_gang_hud(src) - SSticker.mode.forge_gang_objectives(src) - SSticker.mode.greet_gang(src) - SSticker.mode.equip_gang(current,G) - -/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) @@ -1656,6 +1506,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/mutations.dm b/code/datums/mutations.dm index df124260fe..4e8ae4e73a 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -120,7 +120,7 @@ GLOBAL_LIST_EMPTY(mutations_list) get_chance = 15 lowest_value = 256 * 12 text_gain_indication = "Your muscles hurt!" - species_allowed = list("human") //no skeleton/lizard hulk + species_allowed = list("fly") //no skeleton/lizard hulk health_req = 25 /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 8d4413171d..3c3ab905ea 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 e3e8d0e366..f9883cfe50 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/ruins/space.dm b/code/datums/ruins/space.dm index 88beec629f..33498e046f 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -18,6 +18,7 @@ name = "Asteroid 1" description = "I-spy with my little eye, something beginning with R." + /datum/map_template/ruin/space/asteroid2 id = "asteroid2" suffix = "asteroid2.dmm" @@ -147,7 +148,7 @@ id = "spacehotel" suffix = "spacehotel.dmm" name = "The Twin-Nexus Hotel" - description = "A interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." + description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." /datum/map_template/ruin/space/turreted_outpost id = "turreted-outpost" @@ -247,4 +248,10 @@ id = "miracle" suffix = "miracle.dmm" name = "Ordinary Space Tile" - description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!" \ No newline at end of file + description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!" + +/datum/map_template/ruin/space/gondoland + id = "gondolaasteroid" + suffix = "gondolaasteroid.dmm" + name = "Gondoland" + description = "Just an ordinary rock- wait, what's that thing?" diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 69749475cd..25b04b4312 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) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 9ca564cd2d..a2d799752c 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/status_effects/gas.dm b/code/datums/status_effects/gas.dm index ff92b67978..688c921a73 100644 --- a/code/datums/status_effects/gas.dm +++ b/code/datums/status_effects/gas.dm @@ -4,6 +4,7 @@ status_type = STATUS_EFFECT_UNIQUE alert_type = /obj/screen/alert/status_effect/freon var/icon/cube + var/can_melt = TRUE /obj/screen/alert/status_effect/freon name = "Frozen Solid" @@ -20,7 +21,7 @@ /datum/status_effect/freon/tick() owner.update_canmove() - if(owner && owner.bodytemperature >= 310.055) + if(can_melt && owner.bodytemperature >= 310.055) qdel(src) /datum/status_effect/freon/on_remove() @@ -29,3 +30,7 @@ owner.cut_overlay(cube) owner.bodytemperature += 100 owner.update_canmove() + +/datum/status_effect/freon/watcher + duration = 8 + can_melt = FALSE diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index f4f2fc089c..e3e7e83dcf 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -30,7 +30,7 @@ var/area_type = /area/space //Types of area to affect var/list/impacted_areas = list() //Areas to be affected by the weather, calculated when the weather begins var/list/protected_areas = list()//Areas that are protected and excluded from the affected areas. - var/target_z = ZLEVEL_STATION //The z-level to affect + var/target_z = ZLEVEL_STATION_PRIMARY //The z-level to affect var/overlay_layer = AREA_LAYER //Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that. var/aesthetic = FALSE //If the weather has no purpose other than looks @@ -42,7 +42,7 @@ /datum/weather/New() ..() - SSweather.existing_weather |= src + SSweather.existing_weather += src /datum/weather/Destroy() SSweather.existing_weather -= src @@ -108,7 +108,7 @@ stage = END_STAGE update_areas() -/datum/weather/proc/can_impact(mob/living/L) //Can this weather impact a mob? +/datum/weather/proc/can_weather_act(mob/living/L) //Can this weather impact a mob? var/turf/mob_turf = get_turf(L) if(mob_turf && (mob_turf.z != target_z)) return @@ -118,7 +118,7 @@ return return 1 -/datum/weather/proc/impact(mob/living/L) //What effect does this weather have on the hapless mob? +/datum/weather/proc/weather_act(mob/living/L) //What effect does this weather have on the hapless mob? return /datum/weather/proc/update_areas() diff --git a/code/datums/weather/weather_types.dm b/code/datums/weather/weather_types.dm deleted file mode 100644 index d23bf3c8a6..0000000000 --- a/code/datums/weather/weather_types.dm +++ /dev/null @@ -1,225 +0,0 @@ -//Different types of weather. - -/datum/weather/floor_is_lava //The Floor is Lava: Makes all turfs damage anyone on them unless they're standing on a solid object. - name = "the floor is lava" - desc = "The ground turns into surprisingly cool lava, lightly damaging anything on the floor." - - telegraph_message = "Waves of heat emanate from the ground..." - telegraph_duration = 150 - - weather_message = "The floor is lava! Get on top of something!" - weather_duration_lower = 300 - weather_duration_upper = 600 - weather_overlay = "lava" - - end_message = "The ground cools and returns to its usual form." - end_duration = 0 - - area_type = /area - protected_areas = list(/area/space) - target_z = ZLEVEL_STATION - - overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only - immunity_type = "lava" - -/datum/weather/floor_is_lava/impact(mob/living/L) - for(var/obj/structure/O in L.loc) - if(O.density) - return - if(L.loc.density) - return - if(!L.client) //Only sentient people are going along with it! - return - L.adjustFireLoss(3) - - -/datum/weather/advanced_darkness //Advanced Darkness: Restricts the vision of all affected mobs to a single tile in the cardinal directions. - name = "advanced darkness" - desc = "Everything in the area is effectively blinded, unable to see more than a foot or so around itself." - - telegraph_message = "The lights begin to dim... is the power going out?" - telegraph_duration = 150 - - weather_message = "This isn't your average everday darkness... this is advanced darkness!" - weather_duration_lower = 300 - weather_duration_upper = 300 - - end_message = "At last, the darkness recedes." - end_duration = 0 - - area_type = /area - target_z = ZLEVEL_STATION - -/datum/weather/advanced_darkness/update_areas() - for(var/V in impacted_areas) - var/area/A = V - if(stage == MAIN_STAGE) - A.invisibility = 0 - A.set_opacity(TRUE) - A.layer = overlay_layer - A.icon = 'icons/effects/weather_effects.dmi' - A.icon_state = "darkness" - else - A.invisibility = INVISIBILITY_MAXIMUM - A.set_opacity(FALSE) - - -/datum/weather/ash_storm //Ash Storms: Common happenings on lavaland. Heavily obscures vision and deals heavy fire damage to anyone caught outside. - name = "ash storm" - desc = "An intense atmospheric storm lifts ash off of the planet's surface and billows it down across the area, dealing intense fire damage to the unprotected." - - telegraph_message = "An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter." - telegraph_duration = 300 - telegraph_sound = 'sound/lavaland/ash_storm_windup.ogg' - telegraph_overlay = "light_ash" - - weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!" - weather_duration_lower = 600 - weather_duration_upper = 1500 - weather_sound = 'sound/lavaland/ash_storm_start.ogg' - weather_overlay = "ash_storm" - - end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now." - end_duration = 300 - end_sound = 'sound/lavaland/ash_storm_end.ogg' - end_overlay = "light_ash" - - area_type = /area/lavaland/surface/outdoors - target_z = ZLEVEL_LAVALAND - - immunity_type = "ash" - - probability = 90 - -/datum/weather/ash_storm/proc/is_ash_immune(mob/living/L) - if(istype(L.loc, /obj/mecha)) //Mechs are immune - return TRUE - if(ishuman(L)) //Are you immune? - var/mob/living/carbon/human/H = L - var/thermal_protection = H.get_thermal_protection() - if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) - return TRUE - if(istype(L.loc, /mob/living) && L.loc != L) //Matryoshka check - return is_ash_immune(L.loc) - return FALSE //RIP you - -/datum/weather/ash_storm/impact(mob/living/L) - if(is_ash_immune(L)) - return - L.adjustFireLoss(4) - -/datum/weather/ash_storm/emberfall //Emberfall: An ash storm passes by, resulting in harmless embers falling like snow. 10% to happen in place of an ash storm. - name = "emberfall" - desc = "A passing ash storm blankets the area in harmless embers." - - weather_message = "Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by..." - weather_sound = 'sound/lavaland/ash_storm_windup.ogg' - weather_overlay = "light_ash" - - end_message = "The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet." - - aesthetic = TRUE - - probability = 10 - -/datum/weather/rad_storm - name = "radiation storm" - desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected." - - telegraph_duration = 400 - telegraph_message = "The air begins to grow warm." - - weather_message = "You feel waves of heat wash over you! Find shelter!" - weather_overlay = "ash_storm" - weather_duration_lower = 100 - weather_duration_upper = 600 - weather_color = "green" - weather_sound = 'sound/misc/bloblarm.ogg' - - end_duration = 100 - end_message = "The air seems to be cooling off again." - - area_type = /area - protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer, - /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle) - target_z = ZLEVEL_STATION - - immunity_type = "rad" - -/datum/weather/rad_storm/telegraph() - ..() - status_alarm("alert") - - -/datum/weather/rad_storm/impact(mob/living/L) - var/resist = L.getarmor(null, "rad") - if(prob(40)) - if(ishuman(L)) - var/mob/living/carbon/human/H = L - if(H.dna && H.dna.species) - if(!(RADIMMUNE in H.dna.species.species_traits)) - if(prob(max(0,100-resist))) - H.randmuti() - if(prob(50)) - if(prob(90)) - H.randmutb() - else - H.randmutg() - H.domutcheck() - L.rad_act(20,1) -/datum/weather/rad_storm/end() - if(..()) - return - priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") - status_alarm() - sleep(300) - revoke_maint_all_access() // Need to make this a timer at some point. - - -/datum/weather/rad_storm/proc/status_alarm(command) //Makes the status displays show the radiation warning for those who missed the announcement. - var/datum/radio_frequency/frequency = SSradio.return_frequency(1435) - - if(!frequency) - return - - var/datum/signal/status_signal = new - var/atom/movable/virtualspeaker/virt = new /atom/movable/virtualspeaker(null) - status_signal.source = virt - status_signal.transmission_method = 1 - status_signal.data["command"] = "shuttle" - - if(command == "alert") - status_signal.data["command"] = "alert" - status_signal.data["picture_state"] = "radiation" - - frequency.post_signal(src, status_signal) - - -/datum/weather/acid_rain - name = "acid rain" - desc = "Some stay dry and others feel the pain" - - telegraph_duration = 400 - telegraph_message = "Stinging droplets start to fall upon you.." - telegraph_sound = 'sound/ambience/acidrain_start.ogg' - - weather_message = "Your skin melts underneath the rain!" - weather_overlay = "acid_rain" - weather_duration_lower = 600 - weather_duration_upper = 1500 - weather_sound = 'sound/ambience/acidrain_mid.ogg' - - end_duration = 100 - end_message = "The rain starts to dissipate." - end_sound = 'sound/ambience/acidrain_end.ogg' - - area_type = /area/lavaland/surface/outdoors - target_z = ZLEVEL_LAVALAND - - immunity_type = "acid" // temp - - -/datum/weather/acid_rain/impact(mob/living/L) - var/resist = L.getarmor(null, "acid") - if(prob(max(0,100-resist))) - L.acid_act(20,20) diff --git a/code/datums/weather/weather_types/acid_rain.dm b/code/datums/weather/weather_types/acid_rain.dm new file mode 100644 index 0000000000..cb4ced8595 --- /dev/null +++ b/code/datums/weather/weather_types/acid_rain.dm @@ -0,0 +1,29 @@ +//Acid rain is part of the natural weather cycle in the humid forests of Planetstation, and cause acid damage to anyone unprotected. +/datum/weather/acid_rain + name = "acid rain" + desc = "The planet's thunderstorms are by nature acidic, and will incinerate anyone standing beneath them without protection." + + telegraph_duration = 400 + telegraph_message = "Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter." + telegraph_sound = 'sound/ambience/acidrain_start.ogg' + + weather_message = "Acidic rain pours down around you! Get inside!" + weather_overlay = "acid_rain" + weather_duration_lower = 600 + weather_duration_upper = 1500 + weather_sound = 'sound/ambience/acidrain_mid.ogg' + + end_duration = 100 + end_message = "The downpour gradually slows to a light shower. It should be safe outside now." + end_sound = 'sound/ambience/acidrain_end.ogg' + + area_type = /area/lavaland/surface/outdoors + target_z = ZLEVEL_LAVALAND + + immunity_type = "acid" // temp + + +/datum/weather/acid_rain/weather_act(mob/living/L) + var/resist = L.getarmor(null, "acid") + if(prob(max(0,100-resist))) + L.acid_act(20,20) diff --git a/code/datums/weather/weather_types/advanced_darkness.dm b/code/datums/weather/weather_types/advanced_darkness.dm new file mode 100644 index 0000000000..75cc2b1a5f --- /dev/null +++ b/code/datums/weather/weather_types/advanced_darkness.dm @@ -0,0 +1,30 @@ +//Restricts the vision of affected mobs to a single tile in the cardinal directions. +/datum/weather/advanced_darkness + name = "advanced darkness" + desc = "Everything in the area is effectively blinded, unable to see more than a foot or so around itself." + + telegraph_message = "Your eyes hurt... a vignette settles in your vision and closes in." + telegraph_duration = 150 + + weather_message = "This isn't your average everday darkness... this is advanced darkness!" + weather_duration_lower = 300 + weather_duration_upper = 300 + + end_message = "At last, the darkness recedes." + end_duration = 0 + + area_type = /area + target_z = ZLEVEL_STATION_PRIMARY + +/datum/weather/advanced_darkness/update_areas() + for(var/V in impacted_areas) + var/area/A = V + if(stage == MAIN_STAGE) + A.invisibility = 0 + A.set_opacity(TRUE) + A.layer = overlay_layer + A.icon = 'icons/effects/weather_effects.dmi' + A.icon_state = "darkness" + else + A.invisibility = INVISIBILITY_MAXIMUM + A.set_opacity(FALSE) diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm new file mode 100644 index 0000000000..a1dc9ece69 --- /dev/null +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -0,0 +1,61 @@ +//Ash storms happen frequently on lavaland. They heavily obscure vision, and cause high fire damage to anyone caught outside. +/datum/weather/ash_storm + name = "ash storm" + desc = "An intense atmospheric storm lifts ash off of the planet's surface and billows it down across the area, dealing intense fire damage to the unprotected." + + telegraph_message = "An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter." + telegraph_duration = 300 + telegraph_sound = 'sound/lavaland/ash_storm_windup.ogg' + telegraph_overlay = "light_ash" + + weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!" + weather_duration_lower = 600 + weather_duration_upper = 1200 + weather_sound = 'sound/lavaland/ash_storm_start.ogg' + weather_overlay = "ash_storm" + + end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now." + end_duration = 300 + end_sound = 'sound/lavaland/ash_storm_end.ogg' + end_overlay = "light_ash" + + area_type = /area/lavaland/surface/outdoors + target_z = ZLEVEL_LAVALAND + + immunity_type = "ash" + + probability = 90 + +/datum/weather/ash_storm/proc/is_ash_immune(mob/living/L) + if(ismecha(L.loc)) //Mechs are immune + return TRUE + if(ishuman(L)) //Are you immune? + var/mob/living/carbon/human/H = L + var/thermal_protection = H.get_thermal_protection() + if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) + return TRUE + if(istype(L.loc, /mob/living) && L.loc != L) //Matryoshka check + return is_ash_immune(L.loc) + return FALSE //RIP you + +/datum/weather/ash_storm/weather_act(mob/living/L) + if(is_ash_immune(L)) + return + L.adjustFireLoss(4) + + +//Emberfalls are the result of an ash storm passing by close to the playable area of lavaland. They have a 10% chance to trigger in place of an ash storm. +/datum/weather/ash_storm/emberfall + name = "emberfall" + desc = "A passing ash storm blankets the area in harmless embers." + + weather_message = "Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by..." + weather_sound = 'sound/lavaland/ash_storm_windup.ogg' + weather_overlay = "light_ash" + + end_message = "The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet." + end_sound = null + + aesthetic = TRUE + + probability = 10 diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm new file mode 100644 index 0000000000..52f82abec9 --- /dev/null +++ b/code/datums/weather/weather_types/floor_is_lava.dm @@ -0,0 +1,32 @@ +//Causes fire damage to anyone not standing on a dense object. +/datum/weather/floor_is_lava + name = "the floor is lava" + desc = "The ground turns into surprisingly cool lava, lightly damaging anything on the floor." + + telegraph_message = "You feel the ground beneath you getting hot. Waves of heat distort the air." + telegraph_duration = 150 + + weather_message = "The floor is lava! Get on top of something!" + weather_duration_lower = 300 + weather_duration_upper = 600 + weather_overlay = "lava" + + end_message = "The ground cools and returns to its usual form." + end_duration = 0 + + area_type = /area + protected_areas = list(/area/space) + target_z = ZLEVEL_STATION_PRIMARY + + overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only + immunity_type = "lava" + +/datum/weather/floor_is_lava/weather_act(mob/living/L) + for(var/obj/structure/O in L.loc) + if(O.density) + return + if(L.loc.density) + return + if(!L.client) //Only sentient people are going along with it! + return + L.adjustFireLoss(3) diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm new file mode 100644 index 0000000000..3c11750dda --- /dev/null +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -0,0 +1,72 @@ +//Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.) +/datum/weather/rad_storm + name = "radiation storm" + desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected." + + telegraph_duration = 400 + telegraph_message = "The air begins to grow warm." + + weather_message = "You feel waves of heat wash over you! Find shelter!" + weather_overlay = "ash_storm" + weather_duration_lower = 600 + weather_duration_upper = 1500 + weather_color = "green" + weather_sound = 'sound/misc/bloblarm.ogg' + + end_duration = 100 + end_message = "The air seems to be cooling off again." + + area_type = /area + protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer, + /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle) + target_z = ZLEVEL_STATION_PRIMARY + + immunity_type = "rad" + +/datum/weather/rad_storm/telegraph() + ..() + status_alarm("alert") + + +/datum/weather/rad_storm/weather_act(mob/living/L) + var/resist = L.getarmor(null, "rad") + if(prob(40)) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(H.dna && H.dna.species) + if(!(RADIMMUNE in H.dna.species.species_traits)) + if(prob(max(0,100-resist))) + H.randmuti() + if(prob(50)) + if(prob(90)) + H.randmutb() + else + H.randmutg() + H.domutcheck() + L.rad_act(20,1) + +/datum/weather/rad_storm/end() + if(..()) + return + priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") + status_alarm() + sleep(300) + revoke_maint_all_access() // Need to make this a timer at some point. + +/datum/weather/rad_storm/proc/status_alarm(command) //Makes the status displays show the radiation warning for those who missed the announcement. + var/datum/radio_frequency/frequency = SSradio.return_frequency(1435) + + if(!frequency) + return + + var/datum/signal/status_signal = new + var/atom/movable/virtualspeaker/virt = new /atom/movable/virtualspeaker(null) + status_signal.source = virt + status_signal.transmission_method = 1 + status_signal.data["command"] = "shuttle" + + if(command == "alert") + status_signal.data["command"] = "alert" + status_signal.data["picture_state"] = "radiation" + + frequency.post_signal(src, status_signal) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 95267cf927..ae938f18ce 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -1,260 +1,260 @@ -#define MAXIMUM_EMP_WIRES 3 - -/proc/is_wire_tool(obj/item/I) - if(istype(I, /obj/item/device/multitool)) - return TRUE - if(istype(I, /obj/item/wirecutters)) - return TRUE - if(istype(I, /obj/item/device/assembly)) - var/obj/item/device/assembly/A = I - if(A.attachable) - return TRUE - return - -/atom - var/datum/wires/wires = null - -/datum/wires - var/atom/holder = null // The holder (atom that contains these wires). - var/holder_type = null // The holder's typepath (used to make wire colors common to all holders). - var/proper_name = "Unknown" // The display name for the wire set shown in station blueprints. Not used if randomize is true or it's an item NT wouldn't know about (Explosives/Nuke) - - var/list/wires = list() // List of wires. - var/list/cut_wires = list() // List of wires that have been cut. - var/list/colors = list() // Dictionary of colors to wire. - var/list/assemblies = list() // List of attached assemblies. - var/randomize = 0 // If every instance of these wires should be random. - // Prevents wires from showing up in station blueprints - -/datum/wires/New(atom/holder) - ..() - if(!istype(holder, holder_type)) - CRASH("Wire holder is not of the expected type!") - return - - src.holder = holder - if(randomize) - randomize() - else - if(!GLOB.wire_color_directory[holder_type]) - randomize() - GLOB.wire_color_directory[holder_type] = colors - GLOB.wire_name_directory[holder_type] = proper_name - else - colors = GLOB.wire_color_directory[holder_type] - -/datum/wires/Destroy() - holder = null - assemblies = list() - return ..() - -/datum/wires/proc/add_duds(duds) - while(duds) - var/dud = WIRE_DUD_PREFIX + "[--duds]" - if(dud in wires) - continue - wires += dud - -/datum/wires/proc/randomize() - var/static/list/possible_colors = list( - "blue", - "brown", - "crimson", - "cyan", - "gold", - "grey", - "green", - "magenta", - "orange", - "pink", - "purple", - "red", - "silver", - "violet", - "white", - "yellow" - ) - - var/list/my_possible_colors = possible_colors.Copy() - - for(var/wire in shuffle(wires)) - colors[pick_n_take(my_possible_colors)] = wire - -/datum/wires/proc/shuffle_wires() - colors.Cut() - randomize() - -/datum/wires/proc/repair() - cut_wires.Cut() - -/datum/wires/proc/get_wire(color) - return colors[color] - -/datum/wires/proc/get_attached(color) - if(assemblies[color]) - return assemblies[color] - return null - -/datum/wires/proc/is_attached(color) - if(assemblies[color]) - return TRUE - -/datum/wires/proc/is_cut(wire) - return (wire in cut_wires) - -/datum/wires/proc/is_color_cut(color) - return is_cut(get_wire(color)) - -/datum/wires/proc/is_all_cut() - if(cut_wires.len == wires.len) - return TRUE - -/datum/wires/proc/cut(wire) - if(is_cut(wire)) - cut_wires -= wire - on_cut(wire, mend = TRUE) - else - cut_wires += wire - on_cut(wire, mend = FALSE) - -/datum/wires/proc/cut_color(color) - cut(get_wire(color)) - -/datum/wires/proc/cut_random() - cut(wires[rand(1, wires.len)]) - -/datum/wires/proc/cut_all() - for(var/wire in wires) - cut(wire) - +#define MAXIMUM_EMP_WIRES 3 + +/proc/is_wire_tool(obj/item/I) + if(istype(I, /obj/item/device/multitool)) + return TRUE + if(istype(I, /obj/item/wirecutters)) + return TRUE + if(istype(I, /obj/item/device/assembly)) + var/obj/item/device/assembly/A = I + if(A.attachable) + return TRUE + return + +/atom + var/datum/wires/wires = null + +/datum/wires + var/atom/holder = null // The holder (atom that contains these wires). + var/holder_type = null // The holder's typepath (used to make wire colors common to all holders). + var/proper_name = "Unknown" // The display name for the wire set shown in station blueprints. Not used if randomize is true or it's an item NT wouldn't know about (Explosives/Nuke) + + var/list/wires = list() // List of wires. + var/list/cut_wires = list() // List of wires that have been cut. + var/list/colors = list() // Dictionary of colors to wire. + var/list/assemblies = list() // List of attached assemblies. + var/randomize = 0 // If every instance of these wires should be random. + // Prevents wires from showing up in station blueprints + +/datum/wires/New(atom/holder) + ..() + if(!istype(holder, holder_type)) + CRASH("Wire holder is not of the expected type!") + return + + src.holder = holder + if(randomize) + randomize() + else + if(!GLOB.wire_color_directory[holder_type]) + randomize() + GLOB.wire_color_directory[holder_type] = colors + GLOB.wire_name_directory[holder_type] = proper_name + else + colors = GLOB.wire_color_directory[holder_type] + +/datum/wires/Destroy() + holder = null + assemblies = list() + return ..() + +/datum/wires/proc/add_duds(duds) + while(duds) + var/dud = WIRE_DUD_PREFIX + "[--duds]" + if(dud in wires) + continue + wires += dud + +/datum/wires/proc/randomize() + var/static/list/possible_colors = list( + "blue", + "brown", + "crimson", + "cyan", + "gold", + "grey", + "green", + "magenta", + "orange", + "pink", + "purple", + "red", + "silver", + "violet", + "white", + "yellow" + ) + + var/list/my_possible_colors = possible_colors.Copy() + + for(var/wire in shuffle(wires)) + colors[pick_n_take(my_possible_colors)] = wire + +/datum/wires/proc/shuffle_wires() + colors.Cut() + randomize() + +/datum/wires/proc/repair() + cut_wires.Cut() + +/datum/wires/proc/get_wire(color) + return colors[color] + +/datum/wires/proc/get_attached(color) + if(assemblies[color]) + return assemblies[color] + return null + +/datum/wires/proc/is_attached(color) + if(assemblies[color]) + return TRUE + +/datum/wires/proc/is_cut(wire) + return (wire in cut_wires) + +/datum/wires/proc/is_color_cut(color) + return is_cut(get_wire(color)) + +/datum/wires/proc/is_all_cut() + if(cut_wires.len == wires.len) + return TRUE + +/datum/wires/proc/cut(wire) + if(is_cut(wire)) + cut_wires -= wire + on_cut(wire, mend = TRUE) + else + cut_wires += wire + on_cut(wire, mend = FALSE) + +/datum/wires/proc/cut_color(color) + cut(get_wire(color)) + +/datum/wires/proc/cut_random() + cut(wires[rand(1, wires.len)]) + +/datum/wires/proc/cut_all() + for(var/wire in wires) + cut(wire) + /datum/wires/proc/pulse(wire, user) - if(is_cut(wire)) - return + if(is_cut(wire)) + return on_pulse(wire, user) - + /datum/wires/proc/pulse_color(color, mob/living/user) pulse(get_wire(color), user) - -/datum/wires/proc/pulse_assembly(obj/item/device/assembly/S) - for(var/color in assemblies) - if(S == assemblies[color]) - pulse_color(color) - return TRUE - -/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.connected = src - return S - -/datum/wires/proc/detach_assembly(color) - var/obj/item/device/assembly/S = get_attached(color) - if(S && istype(S)) - assemblies -= color - S.connected = null - S.loc = holder.loc - return S - -/datum/wires/proc/emp_pulse() - var/list/possible_wires = shuffle(wires) - var/remaining_pulses = MAXIMUM_EMP_WIRES - - for(var/wire in possible_wires) - if(prob(33)) - pulse(wire) - remaining_pulses-- - if(remaining_pulses >= 0) - break - -// Overridable Procs -/datum/wires/proc/interactable(mob/user) - return TRUE - -/datum/wires/proc/get_status() - return list() - -/datum/wires/proc/on_cut(wire, mend = FALSE) - return - + +/datum/wires/proc/pulse_assembly(obj/item/device/assembly/S) + for(var/color in assemblies) + if(S == assemblies[color]) + pulse_color(color) + return TRUE + +/datum/wires/proc/attach_assembly(color, obj/item/device/assembly/S) + if(S && istype(S) && S.attachable && !is_attached(color)) + assemblies[color] = S + S.forceMove(holder) + S.connected = src + return S + +/datum/wires/proc/detach_assembly(color) + var/obj/item/device/assembly/S = get_attached(color) + if(S && istype(S)) + assemblies -= color + S.connected = null + S.forceMove(holder.drop_location()) + return S + +/datum/wires/proc/emp_pulse() + var/list/possible_wires = shuffle(wires) + var/remaining_pulses = MAXIMUM_EMP_WIRES + + for(var/wire in possible_wires) + if(prob(33)) + pulse(wire) + remaining_pulses-- + if(remaining_pulses >= 0) + break + +// Overridable Procs +/datum/wires/proc/interactable(mob/user) + return TRUE + +/datum/wires/proc/get_status() + return list() + +/datum/wires/proc/on_cut(wire, mend = FALSE) + return + /datum/wires/proc/on_pulse(wire, user) - return -// End Overridable Procs - -/datum/wires/proc/interact(mob/user) - if(!interactable(user)) - return - ui_interact(user) - for(var/A in assemblies) - var/obj/item/I = assemblies[A] - if(istype(I) && I.on_found(user)) - return - -/datum/wires/ui_host() - return holder - -/datum/wires/ui_status(mob/user) - if(interactable(user)) - return ..() - return UI_CLOSE - + return +// End Overridable Procs + +/datum/wires/proc/interact(mob/user) + if(!interactable(user)) + return + ui_interact(user) + for(var/A in assemblies) + var/obj/item/I = assemblies[A] + if(istype(I) && I.on_found(user)) + return + +/datum/wires/ui_host() + return holder + +/datum/wires/ui_status(mob/user) + if(interactable(user)) + return ..() + return UI_CLOSE + /datum/wires/ui_interact(mob/user, ui_key = "wires", datum/tgui/ui = null, force_open = FALSE, \ - datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) - if (!ui) - ui = new(user, src, ui_key, "wires", "[holder.name] wires", 350, 150 + wires.len * 30, master_ui, state) - ui.open() - -/datum/wires/ui_data(mob/user) - var/list/data = list() - var/list/payload = list() - for(var/color in colors) - payload.Add(list(list( - "color" = color, - "wire" = (IsAdminGhost(user) || (user.is_holding_item_of_type(/obj/item/device/multitool/abductor)) ? get_wire(color) : null), - "cut" = is_color_cut(color), - "attached" = is_attached(color) - ))) - data["wires"] = payload - data["status"] = get_status() - return data - -/datum/wires/ui_act(action, params) - if(..() || !interactable(usr)) - return - var/target_wire = params["wire"] - var/mob/living/L = usr - var/obj/item/I = L.get_active_held_item() - switch(action) - if("cut") - if(istype(I, /obj/item/wirecutters) || IsAdminGhost(usr)) - playsound(holder, I.usesound, 20, 1) - cut_color(target_wire) - . = TRUE - else - to_chat(L, "You need wirecutters!") - if("pulse") - if(istype(I, /obj/item/device/multitool) || IsAdminGhost(usr)) - playsound(holder, 'sound/weapons/empty.ogg', 20, 1) + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if (!ui) + ui = new(user, src, ui_key, "wires", "[holder.name] wires", 350, 150 + wires.len * 30, master_ui, state) + ui.open() + +/datum/wires/ui_data(mob/user) + var/list/data = list() + var/list/payload = list() + for(var/color in colors) + payload.Add(list(list( + "color" = color, + "wire" = (IsAdminGhost(user) || (user.is_holding_item_of_type(/obj/item/device/multitool/abductor)) ? get_wire(color) : null), + "cut" = is_color_cut(color), + "attached" = is_attached(color) + ))) + data["wires"] = payload + data["status"] = get_status() + return data + +/datum/wires/ui_act(action, params) + if(..() || !interactable(usr)) + return + var/target_wire = params["wire"] + var/mob/living/L = usr + var/obj/item/I = L.get_active_held_item() + switch(action) + if("cut") + if(istype(I, /obj/item/wirecutters) || IsAdminGhost(usr)) + playsound(holder, I.usesound, 20, 1) + cut_color(target_wire) + . = TRUE + else + to_chat(L, "You need wirecutters!") + if("pulse") + if(istype(I, /obj/item/device/multitool) || IsAdminGhost(usr)) + playsound(holder, 'sound/weapons/empty.ogg', 20, 1) pulse_color(target_wire, L) - . = TRUE - else - to_chat(L, "You need a multitool!") - if("attach") - if(is_attached(target_wire)) - var/obj/item/O = detach_assembly(target_wire) - if(O) - L.put_in_hands(O) - . = TRUE - else - if(istype(I, /obj/item/device/assembly)) - var/obj/item/device/assembly/A = I - if(A.attachable) - if(!L.drop_item()) - return - attach_assembly(target_wire, A) - . = TRUE - else - to_chat(L, "You need an attachable assembly!") - -#undef MAXIMUM_EMP_WIRES + . = TRUE + else + to_chat(L, "You need a multitool!") + if("attach") + if(is_attached(target_wire)) + var/obj/item/O = detach_assembly(target_wire) + if(O) + L.put_in_hands(O) + . = TRUE + else + if(istype(I, /obj/item/device/assembly)) + var/obj/item/device/assembly/A = I + if(A.attachable) + if(!L.drop_item()) + return + attach_assembly(target_wire, A) + . = TRUE + else + to_chat(L, "You need an attachable assembly!") + +#undef MAXIMUM_EMP_WIRES diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 4846cc2bc2..c4b5c5caae 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/ai_monitored.dm b/code/game/area/ai_monitored.dm index f5700625c8..75548ff81e 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -1,30 +1,30 @@ -/area/ai_monitored - name = "AI Monitored Area" - var/list/obj/machinery/camera/motioncameras = list() - var/list/motionTargets = list() - -/area/ai_monitored/Initialize(mapload) - ..() - if(mapload) - for (var/obj/machinery/camera/M in src) - if(M.isMotion()) - motioncameras.Add(M) - M.area_motion = src - -//Only need to use one camera - -/area/ai_monitored/Entered(atom/movable/O) - ..() - if (ismob(O) && motioncameras.len) - for(var/X in motioncameras) - var/obj/machinery/camera/cam = X - cam.newTarget(O) - return - -/area/ai_monitored/Exited(atom/movable/O) - ..() - if (ismob(O) && motioncameras.len) - for(var/X in motioncameras) - var/obj/machinery/camera/cam = X - cam.lostTarget(O) - return \ No newline at end of file +/area/ai_monitored + name = "AI Monitored Area" + var/list/obj/machinery/camera/motioncameras = list() + var/list/motionTargets = list() + +/area/ai_monitored/Initialize(mapload) + . = ..() + if(mapload) + for (var/obj/machinery/camera/M in src) + if(M.isMotion()) + motioncameras.Add(M) + M.area_motion = src + +//Only need to use one camera + +/area/ai_monitored/Entered(atom/movable/O) + ..() + if (ismob(O) && motioncameras.len) + for(var/X in motioncameras) + var/obj/machinery/camera/cam = X + cam.newTarget(O) + return + +/area/ai_monitored/Exited(atom/movable/O) + ..() + if (ismob(O) && motioncameras.len) + for(var/X in motioncameras) + var/obj/machinery/camera/cam = X + cam.lostTarget(O) + return diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 0baef4ace8..b062b8f054 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if(GLOB.teleportlocs[AR.name]) continue var/turf/picked = safepick(get_area_turfs(AR.type)) - if (picked && (picked.z == ZLEVEL_STATION)) + if (picked && (picked.z in GLOB.station_z_levels)) GLOB.teleportlocs[AR.name] = AR sortTim(GLOB.teleportlocs, /proc/cmp_text_dsc) @@ -118,9 +118,9 @@ 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 - ..() + . = ..() power_change() // all machines set to current power level, also updates icon diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index e3f4a5d984..b2587e48c3 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/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index cadc2e43d6..51399ca7e1 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -84,8 +84,8 @@ /area/holodeck/rec_center/firingrange name = "Holodeck - Firing Range" -/area/holodeck/rec_center/rollercoaster - name = "Holodeck - Roller Coaster" +/area/holodeck/rec_center/school + name = "Holodeck - Anime School" /area/holodeck/rec_center/chapelcourt name = "Holodeck - Chapel Courtroom" @@ -123,4 +123,4 @@ /area/holodeck/rec_center/thunderdome1218 name = "Holodeck - 1218 AD" - restricted = 1 + restricted = 1 \ No newline at end of file diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 272ec34d94..0774253d47 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -29,6 +29,7 @@ var/list/priority_overlays //overlays that should remain on top and not normally removed when using cut_overlay functions, like c4. var/datum/proximity_monitor/proximity_monitor + var/buckle_message_cooldown = 0 /atom/New(loc, ...) //atom creation method that preloads variables at creation @@ -149,6 +150,7 @@ return 0 /atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) + SendSignal(COMSIG_ATOM_HULK_ATTACK, user) if(does_attack_animation) user.changeNext_move(CLICK_CD_MELEE) add_logs(user, src, "punched", "hulk powers") @@ -187,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 @@ -221,10 +224,12 @@ return /atom/proc/emp_act(severity) + SendSignal(COMSIG_ATOM_EMP_ACT, severity) if(istype(wires) && !(flags_2 & NO_EMP_WIRES_2)) wires.emp_pulse() /atom/proc/bullet_act(obj/item/projectile/P, def_zone) + SendSignal(COMSIG_ATOM_BULLET_ACT, P, def_zone) . = P.on_hit(src, 0, def_zone) /atom/proc/in_contents_of(container)//can take class or object instance as argument @@ -290,8 +295,12 @@ to_chat(user, "[total_volume] units of various reagents") else to_chat(user, "Nothing.") + SendSignal(COMSIG_PARENT_EXAMINE, user) -/atom/proc/relaymove() +/atom/proc/relaymove(mob/user) + if(buckle_message_cooldown <= world.time) + buckle_message_cooldown = world.time + 50 + to_chat(user, "You can't move while buckled to [src]!") return /atom/proc/contents_explosion(severity, target) @@ -300,11 +309,14 @@ /atom/proc/ex_act(severity, target) set waitfor = FALSE contents_explosion(severity, target) + SendSignal(COMSIG_ATOM_EX_ACT, severity, target) /atom/proc/blob_act(obj/structure/blob/B) + SendSignal(COMSIG_ATOM_BLOB_ACT, B) return /atom/proc/fire_act(exposed_temperature, exposed_volume) + SendSignal(COMSIG_ATOM_FIRE_ACT, exposed_temperature, exposed_volume) return /atom/proc/hitby(atom/movable/AM, skipcatch, hitpush, blocked) @@ -443,7 +455,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 @@ -464,25 +475,30 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/singularity_act() return -/atom/proc/singularity_pull() - return +/atom/proc/singularity_pull(obj/singularity/S, current_size) + SendSignal(COMSIG_ATOM_SING_PULL, S, current_size) /atom/proc/acid_act(acidpwr, acid_volume) + SendSignal(COMSIG_ATOM_ACID_ACT, acidpwr, acid_volume) return /atom/proc/emag_act() + SendSignal(COMSIG_ATOM_EMAG_ACT) return /atom/proc/narsie_act() + SendSignal(COMSIG_ATOM_NARSIE_ACT) return /atom/proc/ratvar_act() + SendSignal(COMSIG_ATOM_RATVAR_ACT) return /atom/proc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) return FALSE /atom/proc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) + SendSignal(COMSIG_ATOM_RCD_ACT, user, the_rcd, passed_mode) return FALSE /atom/proc/storage_contents_dump_act(obj/item/storage/src_object, mob/user) @@ -609,10 +625,10 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) . += "---" var/turf/curturf = get_turf(src) if (curturf) - .["Jump to"] = "?_src_=holder;adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" - .["Add reagent"] = "?_src_=vars;addreagent=\ref[src]" - .["Trigger EM pulse"] = "?_src_=vars;emp=\ref[src]" - .["Trigger explosion"] = "?_src_=vars;explode=\ref[src]" + .["Jump to"] = "?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" + .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=\ref[src]" + .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=\ref[src]" + .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=\ref[src]" /atom/proc/drop_location() var/atom/L = loc @@ -622,3 +638,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 f4cbcda098..a880a44fa6 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1,4 +1,3 @@ - /atom/movable layer = OBJ_LAYER var/last_move = null @@ -117,6 +116,7 @@ //Called after a successful Move(). By this point, we've already moved /atom/movable/proc/Moved(atom/OldLoc, Dir) + SendSignal(COMSIG_MOVABLE_MOVED, OldLoc, Dir) if (!inertia_moving) inertia_next_move = world.time + inertia_move_delay newtonian_move(Dir) @@ -215,7 +215,8 @@ //to differentiate it, naturally everyone forgot about this immediately and so some things //would bump twice, so now it's called Collide /atom/movable/proc/Collide(atom/A) - if((A)) + SendSignal(COMSIG_MOVABLE_COLLIDE, A) + if(A) if(throwing) throwing.hit_atom(A) . = 1 @@ -224,6 +225,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() @@ -250,8 +262,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() @@ -260,9 +281,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) @@ -308,6 +330,7 @@ /atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum) set waitfor = 0 + SendSignal(COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) return hit_atom.hitby(src) /atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked) @@ -315,7 +338,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 @@ -344,7 +368,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 @@ -497,7 +523,7 @@ /atom/movable/vv_get_dropdown() . = ..() . -= "Jump to" - .["Follow"] = "?_src_=holder;adminplayerobservefollow=\ref[src]" + .["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[src]" /atom/movable/proc/ex_check(ex_id) if(!ex_id) @@ -560,7 +586,7 @@ flags_2 |= STATIONLOVING_2 /atom/movable/proc/relocate() - var/targetturf = find_safe_turf(ZLEVEL_STATION) + var/targetturf = find_safe_turf(ZLEVEL_STATION_PRIMARY) if(!targetturf) if(GLOB.blobstart.len > 0) targetturf = get_turf(pick(GLOB.blobstart)) @@ -592,7 +618,7 @@ /atom/movable/proc/in_bounds() . = FALSE var/turf/currentturf = get_turf(src) - if(currentturf && (currentturf.z == ZLEVEL_CENTCOM || currentturf.z == ZLEVEL_STATION || currentturf.z == ZLEVEL_TRANSIT)) + if(currentturf && (currentturf.z == ZLEVEL_CENTCOM || (currentturf.z in GLOB.station_z_levels) || currentturf.z == ZLEVEL_TRANSIT)) . = TRUE @@ -692,4 +718,4 @@ return FALSE if(anchored || throwing) return FALSE - return TRUE + return TRUE \ No newline at end of file diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index 26279ece7e..4fba08101c 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -48,41 +48,4 @@ newhud.join_hud(current) /datum/mind/proc/leave_all_antag_huds() - for(var/datum/atom_hud/antag/hud in GLOB.huds) - if(hud.hudusers[current]) - hud.leave_hud(current) - -/datum/atom_hud/antag/gang - var/color = null - -/datum/atom_hud/antag/gang/add_to_hud(atom/A) - if(!A) - return - var/image/holder = A.hud_list[ANTAG_HUD] - if(holder) - holder.color = color - ..() - -/datum/atom_hud/antag/gang/remove_from_hud(atom/A) - if(!A) - return - var/image/holder = A.hud_list[ANTAG_HUD] - if(holder) - holder.color = null - ..() - -/datum/atom_hud/antag/gang/join_hud(mob/M) - if(!istype(M)) - CRASH("join_hud(): [M] ([M.type]) is not a mob!") - var/image/holder = M.hud_list[ANTAG_HUD] - if(holder) - holder.color = color - ..() - -/datum/atom_hud/antag/gang/leave_hud(mob/M) - if(!istype(M)) - CRASH("leave_hud(): [M] ([M.type]) is not a mob!") - var/image/holder = M.hud_list[ANTAG_HUD] - if(holder) - holder.color = null - ..() + for(var/datum/atom_hud/antag/hud in GLOB.huds) \ No newline at end of file diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index ab9c041efe..3b5b862559 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)) @@ -219,6 +219,7 @@ R.mmi.brain.name = "[brainopsname]'s brain" R.mmi.brainmob.real_name = brainopsname R.mmi.brainmob.name = brainopsname + R.real_name = R.name R.key = C.key R.mind.make_Nuke(null, nuke_code = null,leader=0, telecrystals = TRUE) @@ -238,7 +239,7 @@ /obj/item/antag_spawner/slaughter_demon/attack_self(mob/user) - if(user.z != ZLEVEL_STATION) + if(!(user.z in GLOB.station_z_levels)) to_chat(user, "You should probably wait until you reach the station.") return if(used) @@ -260,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/antag_spawner.dm.rej b/code/game/gamemodes/antag_spawner.dm.rej deleted file mode 100644 index ea9a00132a..0000000000 --- a/code/game/gamemodes/antag_spawner.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm (rejected hunks) -@@ -108,6 +108,7 @@ - new_objective.explanation_text = "Protect [usr.real_name], the wizard." - M.mind.objectives += new_objective - SSticker.mode.apprentices += M.mind -+ M.mind.assigned_role = "Apprentice" - M.mind.special_role = "apprentice" - SSticker.mode.update_wiz_icons_added(M.mind) - M << sound('sound/effects/magic.ogg') diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index ec923c635b..ddb87e20f6 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -1,104 +1,109 @@ - - -//Few global vars to track the blob -GLOBAL_LIST_EMPTY(blobs) //complete list of all blobs made. -GLOBAL_LIST_EMPTY(blob_cores) -GLOBAL_LIST_EMPTY(overminds) -GLOBAL_LIST_EMPTY(blob_nodes) -GLOBAL_LIST_EMPTY(blobs_legit) //used for win-score calculations, contains only blobs counted for win condition - -#define BLOB_NO_PLACE_TIME 1800 //time, in deciseconds, blobs are prevented from bursting in the gamemode - -/datum/game_mode/blob - name = "blob" - config_tag = "blob" - antag_flag = ROLE_BLOB - - required_players = 25 - required_enemies = 1 - recommended_enemies = 1 - - round_ends_with_antag_death = 1 - - announce_span = "green" - announce_text = "Dangerous gelatinous organisms are spreading throughout the station!\n\ - Blobs: Consume the station and spread as far as you can.\n\ - Crew: Fight back the blobs and minimize station damage." - - var/message_sent = FALSE - - var/cores_to_spawn = 1 - var/players_per_core = 25 - var/blob_point_rate = 3 - var/blob_base_starting_points = 80 - - var/blobwincount = 250 - - var/messagedelay_low = 2400 //in deciseconds - var/messagedelay_high = 3600 //blob report will be sent after a random value between these (minimum 4 minutes, maximum 6 minutes) - - var/list/blob_overminds = list() - -/datum/game_mode/blob/pre_setup() - cores_to_spawn = max(round(num_players()/players_per_core, 1), 1) - - var/win_multiplier = 1 + (0.1 * cores_to_spawn) - blobwincount = initial(blobwincount) * cores_to_spawn * win_multiplier - - for(var/j = 0, j < cores_to_spawn, j++) - if (!antag_candidates.len) - break - var/datum/mind/blob = pick(antag_candidates) - blob_overminds += blob - blob.assigned_role = "Blob" - blob.special_role = "Blob" - log_game("[blob.key] (ckey) has been selected as a Blob") - antag_candidates -= blob - - if(!blob_overminds.len) - return 0 - - return 1 - -/datum/game_mode/blob/proc/get_blob_candidates() - var/list/candidates = list() - for(var/mob/living/carbon/human/player in GLOB.player_list) - if(!player.stat && player.mind && !player.mind.special_role && !jobban_isbanned(player, "Syndicate") && (ROLE_BLOB in player.client.prefs.be_special)) - if(age_check(player.client)) - candidates += player - return candidates - -/datum/game_mode/blob/proc/show_message(message) - for(var/datum/mind/blob in blob_overminds) - to_chat(blob.current, message) - -/datum/game_mode/blob/post_setup() - set waitfor = FALSE - - for(var/datum/mind/blob in blob_overminds) - 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.base_point_rate = blob_point_rate - - SSshuttle.registerHostileEnvironment(src) - - // Disable the blob event for this round. - var/datum/round_event_control/blob/B = locate() in SSevents.control - if(B) - B.max_occurrences = 0 // disable the event - - . = ..() - - var/message_delay = rand(messagedelay_low, messagedelay_high) //between 4 and 6 minutes with 2400 low and 3600 high. - - sleep(message_delay) - - send_intercept(1) - message_sent = TRUE +//Few global vars to track the blob +GLOBAL_LIST_EMPTY(blobs) //complete list of all blobs made. +GLOBAL_LIST_EMPTY(blob_cores) +GLOBAL_LIST_EMPTY(overminds) +GLOBAL_LIST_EMPTY(blob_nodes) +GLOBAL_LIST_EMPTY(blobs_legit) //used for win-score calculations, contains only blobs counted for win condition + +#define BLOB_NO_PLACE_TIME 1800 //time, in deciseconds, blobs are prevented from bursting in the gamemode + +/datum/game_mode/blob + name = "blob" + config_tag = "blob" + antag_flag = ROLE_BLOB + false_report_weight = 5 + + required_players = 25 + required_enemies = 1 + recommended_enemies = 1 + + round_ends_with_antag_death = 1 + + announce_span = "green" + announce_text = "Dangerous gelatinous organisms are spreading throughout the station!\n\ + Blobs: Consume the station and spread as far as you can.\n\ + Crew: Fight back the blobs and minimize station damage." + + var/message_sent = FALSE + + var/cores_to_spawn = 1 + var/players_per_core = 25 + var/blob_point_rate = 3 + var/blob_base_starting_points = 80 + + var/blobwincount = 250 + + var/messagedelay_low = 2400 //in deciseconds + var/messagedelay_high = 3600 //blob report will be sent after a random value between these (minimum 4 minutes, maximum 6 minutes) + + var/list/blob_overminds = list() + +/datum/game_mode/blob/pre_setup() + cores_to_spawn = max(round(num_players()/players_per_core, 1), 1) + + var/win_multiplier = 1 + (0.1 * cores_to_spawn) + blobwincount = initial(blobwincount) * cores_to_spawn * win_multiplier + + for(var/j = 0, j < cores_to_spawn, j++) + if (!antag_candidates.len) + break + var/datum/mind/blob = pick(antag_candidates) + blob_overminds += blob + blob.assigned_role = "Blob" + blob.special_role = "Blob" + log_game("[blob.key] (ckey) has been selected as a Blob") + antag_candidates -= blob + + if(!blob_overminds.len) + return 0 + + return 1 + +/datum/game_mode/blob/proc/get_blob_candidates() + var/list/candidates = list() + for(var/mob/living/carbon/human/player in GLOB.player_list) + if(!player.stat && player.mind && !player.mind.special_role && !jobban_isbanned(player, "Syndicate") && (ROLE_BLOB in player.client.prefs.be_special)) + if(age_check(player.client)) + candidates += player + return candidates + +/datum/game_mode/blob/proc/show_message(message) + for(var/datum/mind/blob in blob_overminds) + to_chat(blob.current, message) + +/datum/game_mode/blob/post_setup() + set waitfor = FALSE + + for(var/datum/mind/blob in blob_overminds) + 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.forceMove(T) + B.base_point_rate = blob_point_rate + + SSshuttle.registerHostileEnvironment(src) + + // Disable the blob event for this round. + var/datum/round_event_control/blob/B = locate() in SSevents.control + if(B) + B.max_occurrences = 0 // disable the event + + . = ..() + + var/message_delay = rand(messagedelay_low, messagedelay_high) //between 4 and 6 minutes with 2400 low and 3600 high. + + sleep(message_delay) + + send_intercept(1) + message_sent = TRUE addtimer(CALLBACK(src, .proc/SendSecondIntercept), 24000) - + /datum/game_mode/blob/proc/SendSecondIntercept() - if(!replacementmode) + if(!replacementmode) send_intercept(2) //if the blob has been alive this long, it's time to bomb it + +/datum/game_mode/blob/generate_report() + return "A CMP scientist by the name of [pick("Griff", "Pasteur", "Chamberland", "Buist", "Rivers", "Stanley")] boasted about his corporation's \"finest creation\" - a macrobiological \ + virus capable of self-reproduction and hellbent on consuming whatever it touches. He went on to query Cybersun for permission to utilize the virus in biochemical warfare, to which \ + CMP subsequently gained. Be vigilant for any large organisms rapidly spreading across the station, as they are classified as a level 5 biohazard and critically dangerous. Note that \ + this organism seems to be weak to extreme heat; concentrated fire (such as welding tools and lasers) will be effective against it." diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index b1cea567a1..6d97fb52f9 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 ea6bd07c58..e90626485a 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -19,7 +19,7 @@ var/nukecode = random_nukecode() for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) if(bomb && bomb.r_code) - if(bomb.z == ZLEVEL_STATION) + if(bomb.z in GLOB.station_z_levels) bomb.r_code = nukecode intercepttext += "NanoTrasen Update: Biohazard Alert.
" @@ -91,7 +91,7 @@ if(count_territories) var/list/valid_territories = list() for(var/area/A in world) //First, collect all area types on the station zlevel - if(A.z == ZLEVEL_STATION) + if(A.z in GLOB.station_z_levels) if(!(A.type in valid_territories) && A.valid_territory) valid_territories |= A.type if(valid_territories.len) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index d9e803f3a0..61dee30c8e 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -106,7 +106,7 @@ if(istype(linked_node)) factory = linked_node factory.spores += src - ..() + . = ..() /mob/living/simple_animal/hostile/blob/blobspore/Life() if(!is_zombie && isturf(src.loc)) @@ -223,19 +223,35 @@ var/independent = FALSE /mob/living/simple_animal/hostile/blob/blobbernaut/Initialize() - ..() + . = ..() if(!independent) //no pulling people deep into the blob verbs -= /mob/living/verb/pulled /mob/living/simple_animal/hostile/blob/blobbernaut/Life() if(..()) + var/list/blobs_in_area = range(2, src) if(independent) return // strong independent blobbernaut that don't need no blob var/damagesources = 0 - if(!(locate(/obj/structure/blob) in range(2, src))) + if(!(locate(/obj/structure/blob) in blobs_in_area)) damagesources++ if(!factory) damagesources++ + else + if(locate(/obj/structure/blob/core) in blobs_in_area) + adjustHealth(-maxHealth*0.1) + var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed + if(overmind) + H.color = overmind.blob_reagent_datum.complementary_color + else + H.color = "#000000" + if(locate(/obj/structure/blob/node) in blobs_in_area) + adjustHealth(-maxHealth*0.05) + var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) + if(overmind) + H.color = overmind.blob_reagent_datum.complementary_color + else + H.color = "#000000" if(damagesources) for(var/i in 1 to damagesources) adjustHealth(maxHealth*0.025) //take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 247b660dbc..9f8a44bed2 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -50,14 +50,14 @@ if(blob_core) blob_core.update_icon() - ..() + .= ..() /mob/camera/blob/Life() if(!blob_core) 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 389888ac28..865a58fd81 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" @@ -363,7 +363,7 @@ to_chat(src, "Node Blobs are blobs which grow, like the core. Like the core it can activate resource and factory blobs.") to_chat(src, "In addition to the buttons on your HUD, there are a few click shortcuts to speed up expansion and defense.") 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 GLOB.overminds, allowing you to coordinate with them.") + 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 c2511f2302..183ec88b23 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -90,8 +90,10 @@ /obj/structure/blob/proc/Life() return -/obj/structure/blob/proc/Pulse_Area(pulsing_overmind = overmind, claim_range = 10, pulse_range = 3, expand_range = 2) - src.Be_Pulsed() +/obj/structure/blob/proc/Pulse_Area(mob/camera/blob/pulsing_overmind, claim_range = 10, pulse_range = 3, expand_range = 2) + if(QDELETED(pulsing_overmind)) + pulsing_overmind = overmind + Be_Pulsed() var/expanded = FALSE if(prob(70) && expand()) expanded = TRUE @@ -188,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 new file mode 100644 index 0000000000..0dd3d6be0f --- /dev/null +++ b/code/game/gamemodes/brother/traitor_bro.dm @@ -0,0 +1,141 @@ +/datum/objective_team/brother_team + name = "brotherhood" + member_name = "blood brother" + var/list/objectives = list() + var/meeting_area + +/datum/objective_team/brother_team/is_solo() + return FALSE + +/datum/objective_team/brother_team/proc/add_objective(datum/objective/O, needs_target = FALSE) + O.team = src + if(needs_target) + O.find_target() + O.update_explanation_text() + objectives += O + +/datum/objective_team/brother_team/proc/forge_brother_objectives() + objectives = list() + var/is_hijacker = prob(10) + 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) + add_objective(new/datum/objective/hijack) + else if(!locate(/datum/objective/escape) in objectives) + add_objective(new/datum/objective/escape) + +/datum/objective_team/brother_team/proc/forge_single_objective() + if(prob(50)) + if(LAZYLEN(active_ais()) && prob(100/GLOB.joined_player_list.len)) + add_objective(new/datum/objective/destroy, TRUE) + else if(prob(30)) + add_objective(new/datum/objective/maroon, TRUE) + else + add_objective(new/datum/objective/assassinate, TRUE) + else + add_objective(new/datum/objective/steal, TRUE) + +/datum/game_mode + var/list/datum/mind/brothers = list() + var/list/datum/objective_team/brother_team/brother_teams = list() + +/datum/game_mode/traitor/bros + name = "traitor+brothers" + config_tag = "traitorbro" + restricted_jobs = list("AI", "Cyborg") + + announce_span = "danger" + announce_text = "There are Syndicate agents and Blood Brothers on the station!\n\ + Traitors: Accomplish your objectives.\n\ + Blood Brothers: Accomplish your objectives.\n\ + Crew: Do not let the traitors or brothers succeed!" + + var/list/datum/objective_team/brother_team/pre_brother_teams = list() + var/const/team_amount = 2 //hard limit on brother teams if scaling is turned off + var/const/min_team_size = 2 + + 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_GET(flag/protect_roles_from_antagonist)) + restricted_jobs += protected_jobs + 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 + 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) + break + var/datum/objective_team/brother_team/team = new + var/team_size = prob(10) ? min(3, possible_brothers.len) : 2 + for(var/k = 1 to team_size) + var/datum/mind/bro = pick(possible_brothers) + possible_brothers -= bro + antag_candidates -= bro + team.members += bro + bro.restricted_roles = restricted_jobs + log_game("[bro.key] (ckey) has been selected as a Brother") + pre_brother_teams += team + return ..() + +/datum/game_mode/traitor/bros/post_setup() + for(var/datum/objective_team/brother_team/team in pre_brother_teams) + team.meeting_area = pick(meeting_areas) + meeting_areas -= team.meeting_area + team.forge_brother_objectives() + for(var/datum/mind/M in team.members) + M.add_antag_datum(ANTAG_DATUM_BROTHER, team) + modePlayer += M + 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 + var/text = "
The blood brothers were:" + var/teamnumber = 1 + for(var/datum/objective_team/brother_team/team in brother_teams) + if(!team.members.len) + continue + text += "
Team #[teamnumber++]" + for(var/datum/mind/M in team.members) + text += printplayer(M) + var/win = TRUE + var/objective_count = 1 + for(var/datum/objective/objective in team.objectives) + if(objective.check_completion()) + text += "
Objective #[objective_count]: [objective.explanation_text] Success!" + SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS") + else + text += "
Objective #[objective_count]: [objective.explanation_text] Fail." + SSblackbox.add_details("traitor_objective","[objective.type]|FAIL") + win = FALSE + objective_count++ + if(win) + text += "
The blood brothers were successful!" + SSblackbox.add_details("brother_success","SUCCESS") + else + text += "
The blood brothers have failed!" + SSblackbox.add_details("brother_success","FAIL") + text += "
" + to_chat(world, text) + +/datum/game_mode/proc/update_brother_icons_added(datum/mind/brother_mind) + var/datum/atom_hud/antag/brotherhud = GLOB.huds[ANTAG_HUD_BROTHER] + brotherhud.join_hud(brother_mind.current) + set_antag_hud(brother_mind.current, "brother") + +/datum/game_mode/proc/update_brother_icons_removed(datum/mind/brother_mind) + var/datum/atom_hud/antag/brotherhud = GLOB.huds[ANTAG_HUD_BROTHER] + brotherhud.leave_hud(brother_mind.current) + set_antag_hud(brother_mind.current, null) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 4d9f1c7f23..ae09e8ee12 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -1,526 +1,523 @@ -#define LING_FAKEDEATH_TIME 400 //40 seconds -#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead. -#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob - -GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")) -GLOBAL_LIST_INIT(slots, list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store")) -GLOBAL_LIST_INIT(slot2slot, list("head" = slot_head, "wear_mask" = slot_wear_mask, "neck" = slot_neck, "back" = slot_back, "wear_suit" = slot_wear_suit, "w_uniform" = slot_w_uniform, "shoes" = slot_shoes, "belt" = slot_belt, "gloves" = slot_gloves, "glasses" = slot_glasses, "ears" = slot_ears, "wear_id" = slot_wear_id, "s_store" = slot_s_store)) -GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, "back" = /obj/item/changeling, "wear_suit" = /obj/item/clothing/suit/changeling, "w_uniform" = /obj/item/clothing/under/changeling, "shoes" = /obj/item/clothing/shoes/changeling, "belt" = /obj/item/changeling, "gloves" = /obj/item/clothing/gloves/changeling, "glasses" = /obj/item/clothing/glasses/changeling, "ears" = /obj/item/changeling, "wear_id" = /obj/item/changeling, "s_store" = /obj/item/changeling)) - - -/datum/game_mode - var/list/datum/mind/changelings = list() - - -/datum/game_mode/changeling - name = "changeling" - config_tag = "changeling" - antag_flag = ROLE_CHANGELING - restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") - required_players = 15 - required_enemies = 1 - recommended_enemies = 4 - reroll_friendly = 1 - - announce_span = "green" - announce_text = "Alien changelings have infiltrated the crew!\n\ - Changelings: Accomplish the objectives assigned to you.\n\ - Crew: Root out and eliminate the changeling menace." - - var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time - var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target - var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target - - var/const/prob_int_item = 50 // intercept names the theft target half the time - var/const/prob_right_item_l = 25 // lower bound on probability of naming right theft target - var/const/prob_right_item_h = 50 // upper bound on probability of naming the right theft target - - var/const/prob_int_sab_target = 50 // intercept names the sabotage target half the time - var/const/prob_right_sab_target_l = 25 // lower bound on probability of naming right sabotage target - var/const/prob_right_sab_target_h = 50 // upper bound on probability of naming right sabotage target - - var/const/prob_right_killer_l = 25 //lower bound on probability of naming the right operative - var/const/prob_right_killer_h = 50 //upper bound on probability of naming the right operative - var/const/prob_right_objective_l = 25 //lower bound on probability of determining the objective correctly - var/const/prob_right_objective_h = 50 //upper bound on probability of determining the objective correctly - - var/const/changeling_amount = 4 //hard limit on changelings if scaling is turned off - - var/changeling_team_objective_type = null //If this is not null, we hand our this objective to all lings - -/datum/game_mode/changeling/pre_setup() - - if(config.protect_roles_from_antagonist) - restricted_jobs += protected_jobs - - if(config.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) )) - else - num_changelings = max(1, min(num_players(), changeling_amount)) - - if(antag_candidates.len>0) - for(var/i = 0, i < num_changelings, i++) - if(!antag_candidates.len) break - var/datum/mind/changeling = pick(antag_candidates) - antag_candidates -= changeling - changelings += changeling - changeling.special_role = "Changeling" - changeling.restricted_roles = restricted_jobs - return 1 - else - return 0 - -/datum/game_mode/changeling/post_setup() - - //Decide if it's ok for the lings to have a team objective - //And then set it up to be handed out in forge_changeling_objectives - var/list/team_objectives = subtypesof(/datum/objective/changeling_team_objective) - var/list/possible_team_objectives = list() - for(var/T in team_objectives) - var/datum/objective/changeling_team_objective/CTO = T - - if(changelings.len >= initial(CTO.min_lings)) - possible_team_objectives += T - - if(possible_team_objectives.len && prob(20*changelings.len)) - changeling_team_objective_type = pick(possible_team_objectives) - - for(var/datum/mind/changeling in changelings) - log_game("[changeling.key] (ckey) has been selected as a changeling") - changeling.current.make_changeling() - forge_changeling_objectives(changeling) - greet_changeling(changeling) - SSticker.mode.update_changeling_icons_added(changeling) - modePlayer += changelings - ..() - -/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) ) - 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(ROLE_CHANGELING in character.client.prefs.be_special) - if(!jobban_isbanned(character, ROLE_CHANGELING) && !jobban_isbanned(character, "Syndicate")) - if(age_check(character.client)) - if(!(character.job in restricted_jobs)) - character.mind.make_Changling() - -/datum/game_mode/proc/forge_changeling_objectives(datum/mind/changeling, var/team_mode = 0) - //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft". - //No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting - //If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone - - var/escape_objective_possible = TRUE - - //if there's a team objective, check if it's compatible with escape objectives - for(var/datum/objective/changeling_team_objective/CTO in changeling.objectives) - if(!CTO.escape_objective_compatible) - escape_objective_possible = FALSE - break - - var/datum/objective/absorb/absorb_objective = new - absorb_objective.owner = changeling - absorb_objective.gen_amount_goal(6, 8) - 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 - - var/list/active_ais = active_ais() - if(active_ais.len && prob(100/GLOB.joined_player_list.len)) - var/datum/objective/destroy/destroy_objective = new - destroy_objective.owner = changeling - destroy_objective.find_target() - changeling.objectives += destroy_objective - else - if(prob(70)) - var/datum/objective/assassinate/kill_objective = new - kill_objective.owner = changeling - if(team_mode) //No backstabbing while in a team - kill_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) - else - kill_objective.find_target() - changeling.objectives += kill_objective - else - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = changeling - if(team_mode) - maroon_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) - else - maroon_objective.find_target() - changeling.objectives += maroon_objective - - if (!(locate(/datum/objective/escape) in changeling.objectives) && escape_objective_possible) - var/datum/objective/escape/escape_with_identity/identity_theft = new - identity_theft.owner = changeling - identity_theft.target = maroon_objective.target - identity_theft.update_explanation_text() - changeling.objectives += identity_theft - escape_objective_possible = FALSE - - if (!(locate(/datum/objective/escape) in changeling.objectives) && escape_objective_possible) - if(prob(50)) - var/datum/objective/escape/escape_objective = new - escape_objective.owner = changeling - changeling.objectives += escape_objective - else - var/datum/objective/escape/escape_with_identity/identity_theft = new - identity_theft.owner = changeling - if(team_mode) - identity_theft.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) - else - identity_theft.find_target() - changeling.objectives += identity_theft - escape_objective_possible = FALSE - - - -/datum/game_mode/changeling/forge_changeling_objectives(datum/mind/changeling) - if(changeling_team_objective_type) - var/datum/objective/changeling_team_objective/team_objective = new changeling_team_objective_type - team_objective.owner = changeling - changeling.objectives += team_objective - - ..(changeling,1) - else - ..(changeling,0) - - -/datum/game_mode/proc/greet_changeling(datum/mind/changeling, you_are=1) - if (you_are) - to_chat(changeling.current, "You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human.") - to_chat(changeling.current, "Use say \":g message\" to communicate with your fellow changelings.") - to_chat(changeling.current, "You must complete the following tasks:") - changeling.current.playsound_local(get_turf(changeling.current), 'sound/ambience/antag/ling_aler.ogg', 100, FALSE, pressure_affected = FALSE) - - if (changeling.current.mind) - var/mob/living/carbon/human/H = changeling.current - if(H.mind.assigned_role == "Clown") - to_chat(H, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") - H.dna.remove_mutation(CLOWNMUT) - - var/obj_count = 1 - for(var/datum/objective/objective in changeling.objectives) - to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ - return - -/*/datum/game_mode/changeling/check_finished() - var/changelings_alive = 0 - for(var/datum/mind/changeling in changelings) - if(!iscarbon(changeling.current)) - continue - if(changeling.current.stat==2) - continue - changelings_alive++ - - if (changelings_alive) - changelingdeath = 0 - return ..() - else - if (!changelingdeath) - changelingdeathtime = world.time - changelingdeath = 1 - if(world.time-changelingdeathtime > TIME_TO_GET_REVIVED) - return 1 - else - return ..() - return 0*/ - -/datum/game_mode/proc/auto_declare_completion_changeling() - if(changelings.len) - var/text = "
The changelings were:" - for(var/datum/mind/changeling in changelings) - var/changelingwin = 1 - if(!changeling.current) - changelingwin = 0 - - text += printplayer(changeling) - - //Removed sanity if(changeling) because we -want- a runtime to inform us that the changelings list is incorrect and needs to be fixed. - text += "
Changeling ID: [changeling.changeling.changelingID]." - text += "
Genomes Extracted: [changeling.changeling.absorbedcount]" - - if(changeling.objectives.len) - var/count = 1 - for(var/datum/objective/objective in changeling.objectives) - if(objective.check_completion()) - text += "
Objective #[count]: [objective.explanation_text] Success!" - SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS") - else - text += "
Objective #[count]: [objective.explanation_text] Fail." - SSblackbox.add_details("changeling_objective","[objective.type]|FAIL") - changelingwin = 0 - count++ - - if(changelingwin) - text += "
The changeling was successful!" - SSblackbox.add_details("changeling_success","SUCCESS") - else - text += "
The changeling has failed." - SSblackbox.add_details("changeling_success","FAIL") - text += "
" - - to_chat(world, text) - - - return 1 - -/datum/changeling //stores changeling powers, changeling recharge thingie, changeling absorbed DNA and changeling ID (for changeling hivemind) - var/list/stored_profiles = list() //list of datum/changelingprofile - var/datum/changelingprofile/first_prof = null - //var/list/absorbed_dna = list() - //var/list/protected_dna = list() //dna that is not lost when capacity is otherwise full - var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation. - var/absorbedcount = 0 - var/chem_charges = 20 - var/chem_storage = 75 - var/chem_recharge_rate = 1 - var/chem_recharge_slowdown = 0 - var/sting_range = 2 - var/changelingID = "Changeling" - var/geneticdamage = 0 - var/isabsorbing = 0 - var/islinking = 0 - var/geneticpoints = 10 - var/purchasedpowers = list() - var/mimicing = "" - var/canrespec = 0 - var/changeling_speak = 0 - var/datum/dna/chosen_dna - var/obj/effect/proc_holder/changeling/sting/chosen_sting - var/datum/cellular_emporium/cellular_emporium - var/datum/action/innate/cellular_emporium/emporium_action - -/datum/changeling/New(var/gender=FEMALE) - ..() - var/honorific - if(gender == FEMALE) - honorific = "Ms." - else - honorific = "Mr." - if(GLOB.possible_changeling_IDs.len) - changelingID = pick(GLOB.possible_changeling_IDs) - GLOB.possible_changeling_IDs -= changelingID - changelingID = "[honorific] [changelingID]" - else - changelingID = "[honorific] [rand(1,999)]" - - cellular_emporium = new(src) - emporium_action = new(cellular_emporium) - -/datum/changeling/Destroy() - qdel(cellular_emporium) - cellular_emporium = null - qdel(emporium_action) - emporium_action = null - . = ..() - -/datum/changeling/proc/regenerate(var/mob/living/carbon/the_ling) - if(istype(the_ling)) - emporium_action.Grant(the_ling) - if(the_ling.stat == DEAD) - chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5)) - geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1) - else //not dead? no chem/geneticdamage caps. - chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) - geneticdamage = max(0, geneticdamage-1) - - -/datum/changeling/proc/get_dna(dna_owner) - for(var/datum/changelingprofile/prof in stored_profiles) - if(dna_owner == prof.name) - return prof - -/datum/changeling/proc/has_dna(datum/dna/tDNA) - for(var/datum/changelingprofile/prof in stored_profiles) - if(tDNA.is_same_as(prof.dna)) - return 1 - return 0 - -/datum/changeling/proc/can_absorb_dna(mob/living/carbon/user, mob/living/carbon/human/target, var/verbose=1) - if(stored_profiles.len) - var/datum/changelingprofile/prof = stored_profiles[1] - if(prof.dna == user.dna && stored_profiles.len >= dna_max)//If our current DNA is the stalest, we gotta ditch it. - if(verbose) - to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") - return - if(!target) - return - if((target.disabilities & NOCLONE) || (target.disabilities & HUSK)) - if(verbose) - to_chat(user, "DNA of [target] is ruined beyond usability!") - return - if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! - if(verbose) - to_chat(user, "We could gain no benefit from absorbing a lesser creature.") - return - if(has_dna(target.dna)) - if(verbose) - to_chat(user, "We already have this DNA in storage!") - return - if(!target.has_dna()) - if(verbose) - to_chat(user, "[target] is not compatible with our biology.") - return - return 1 - -/datum/changeling/proc/create_profile(mob/living/carbon/human/H, mob/living/carbon/human/user, protect = 0) - var/datum/changelingprofile/prof = new - - H.dna.real_name = H.real_name //Set this again, just to be sure that it's properly set. - var/datum/dna/new_dna = new H.dna.type - H.dna.copy_dna(new_dna) - prof.dna = new_dna - prof.name = H.real_name - prof.protected = protect - - prof.underwear = H.underwear - prof.undershirt = H.undershirt - prof.socks = H.socks - - var/list/slots = list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") - for(var/slot in slots) - if(slot in H.vars) - var/obj/item/I = H.vars[slot] - if(!I) - continue - prof.name_list[slot] = I.name - prof.appearance_list[slot] = I.appearance - prof.flags_cover_list[slot] = I.flags_cover - prof.item_color_list[slot] = I.item_color - prof.item_state_list[slot] = I.item_state - prof.exists_list[slot] = 1 - else - continue - - return prof - -/datum/changeling/proc/add_profile(datum/changelingprofile/prof) - if(stored_profiles.len > dna_max) - if(!push_out_profile()) - return - - stored_profiles += prof - absorbedcount++ - -/datum/changeling/proc/add_new_profile(mob/living/carbon/human/H, mob/living/carbon/human/user, protect = 0) - var/datum/changelingprofile/prof = create_profile(H, protect) - add_profile(prof) - return prof - -/datum/changeling/proc/remove_profile(mob/living/carbon/human/H, force = 0) - for(var/datum/changelingprofile/prof in stored_profiles) - if(H.real_name == prof.name) - if(prof.protected && !force) - continue - stored_profiles -= prof - qdel(prof) - -/datum/changeling/proc/get_profile_to_remove() - for(var/datum/changelingprofile/prof in stored_profiles) - if(!prof.protected) - return prof - -/datum/changeling/proc/push_out_profile() - var/datum/changelingprofile/removeprofile = get_profile_to_remove() - if(removeprofile) - stored_profiles -= removeprofile - return 1 - return 0 - -/proc/changeling_transform(mob/living/carbon/human/user, datum/changelingprofile/chosen_prof) - var/datum/dna/chosen_dna = chosen_prof.dna - user.real_name = chosen_prof.name - user.underwear = chosen_prof.underwear - user.undershirt = chosen_prof.undershirt - user.socks = chosen_prof.socks - - chosen_dna.transfer_identity(user, 1) - user.updateappearance(mutcolor_update=1) - user.update_body() - user.domutcheck() - - //vars hackery. not pretty, but better than the alternative. - for(var/slot in GLOB.slots) - if(istype(user.vars[slot], GLOB.slot2type[slot]) && !(chosen_prof.exists_list[slot])) //remove unnecessary flesh items - qdel(user.vars[slot]) - continue - - if((user.vars[slot] && !istype(user.vars[slot], GLOB.slot2type[slot])) || !(chosen_prof.exists_list[slot])) - continue - - var/obj/item/C - var/equip = 0 - if(!user.vars[slot]) - var/thetype = GLOB.slot2type[slot] - equip = 1 - C = new thetype(user) - - else if(istype(user.vars[slot], GLOB.slot2type[slot])) - C = user.vars[slot] - - C.appearance = chosen_prof.appearance_list[slot] - C.name = chosen_prof.name_list[slot] - C.flags_cover = chosen_prof.flags_cover_list[slot] - C.item_color = chosen_prof.item_color_list[slot] - C.item_state = chosen_prof.item_state_list[slot] - if(equip) - user.equip_to_slot_or_del(C, GLOB.slot2slot[slot]) - - user.regenerate_icons() - -/datum/changelingprofile - var/name = "a bug" - - var/protected = 0 - - var/datum/dna/dna = null - var/list/name_list = list() //associative list of slotname = itemname - var/list/appearance_list = list() - var/list/flags_cover_list = list() - var/list/exists_list = list() - var/list/item_color_list = list() - var/list/item_state_list = list() - - var/underwear - var/undershirt - var/socks - -/datum/changelingprofile/Destroy() - qdel(dna) - . = ..() - -/datum/changelingprofile/proc/copy_profile(datum/changelingprofile/newprofile) - newprofile.name = name - newprofile.protected = protected - newprofile.dna = new dna.type - dna.copy_dna(newprofile.dna) - newprofile.name_list = name_list.Copy() - newprofile.appearance_list = appearance_list.Copy() - newprofile.flags_cover_list = flags_cover_list.Copy() - newprofile.exists_list = exists_list.Copy() - newprofile.item_color_list = item_color_list.Copy() - newprofile.item_state_list = item_state_list.Copy() - newprofile.underwear = underwear - newprofile.undershirt = undershirt - newprofile.socks = socks - -/datum/game_mode/proc/update_changeling_icons_added(datum/mind/changling_mind) - var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] - hud.join_hud(changling_mind.current) - set_antag_hud(changling_mind.current, "changling") - -/datum/game_mode/proc/update_changeling_icons_removed(datum/mind/changling_mind) - var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] - hud.leave_hud(changling_mind.current) - set_antag_hud(changling_mind.current, null) +#define LING_FAKEDEATH_TIME 400 //40 seconds +#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead. +#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob + +GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")) +GLOBAL_LIST_INIT(slots, list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store")) +GLOBAL_LIST_INIT(slot2slot, list("head" = slot_head, "wear_mask" = slot_wear_mask, "neck" = slot_neck, "back" = slot_back, "wear_suit" = slot_wear_suit, "w_uniform" = slot_w_uniform, "shoes" = slot_shoes, "belt" = slot_belt, "gloves" = slot_gloves, "glasses" = slot_glasses, "ears" = slot_ears, "wear_id" = slot_wear_id, "s_store" = slot_s_store)) +GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, "back" = /obj/item/changeling, "wear_suit" = /obj/item/clothing/suit/changeling, "w_uniform" = /obj/item/clothing/under/changeling, "shoes" = /obj/item/clothing/shoes/changeling, "belt" = /obj/item/changeling, "gloves" = /obj/item/clothing/gloves/changeling, "glasses" = /obj/item/clothing/glasses/changeling, "ears" = /obj/item/changeling, "wear_id" = /obj/item/changeling, "s_store" = /obj/item/changeling)) + + +/datum/game_mode + var/list/datum/mind/changelings = list() + + +/datum/game_mode/changeling + name = "changeling" + config_tag = "changeling" + antag_flag = ROLE_CHANGELING + false_report_weight = 10 + restricted_jobs = list("AI", "Cyborg") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") + required_players = 15 + required_enemies = 1 + recommended_enemies = 4 + reroll_friendly = 1 + + announce_span = "green" + announce_text = "Alien changelings have infiltrated the crew!\n\ + Changelings: Accomplish the objectives assigned to you.\n\ + Crew: Root out and eliminate the changeling menace." + + var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time + var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target + var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target + + var/const/prob_int_item = 50 // intercept names the theft target half the time + var/const/prob_right_item_l = 25 // lower bound on probability of naming right theft target + var/const/prob_right_item_h = 50 // upper bound on probability of naming the right theft target + + var/const/prob_int_sab_target = 50 // intercept names the sabotage target half the time + var/const/prob_right_sab_target_l = 25 // lower bound on probability of naming right sabotage target + var/const/prob_right_sab_target_h = 50 // upper bound on probability of naming right sabotage target + + var/const/prob_right_killer_l = 25 //lower bound on probability of naming the right operative + var/const/prob_right_killer_h = 50 //upper bound on probability of naming the right operative + var/const/prob_right_objective_l = 25 //lower bound on probability of determining the objective correctly + var/const/prob_right_objective_h = 50 //upper bound on probability of determining the objective correctly + + var/const/changeling_amount = 4 //hard limit on changelings if scaling is turned off + + var/changeling_team_objective_type = null //If this is not null, we hand our this objective to all lings + +/datum/game_mode/changeling/pre_setup() + + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + restricted_jobs += protected_jobs + + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) + restricted_jobs += "Assistant" + + var/num_changelings = 1 + + 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)) + + if(antag_candidates.len>0) + for(var/i = 0, i < num_changelings, i++) + if(!antag_candidates.len) break + var/datum/mind/changeling = pick(antag_candidates) + antag_candidates -= changeling + changelings += changeling + changeling.special_role = "Changeling" + changeling.restricted_roles = restricted_jobs + return 1 + else + return 0 + +/datum/game_mode/changeling/post_setup() + + //Decide if it's ok for the lings to have a team objective + //And then set it up to be handed out in forge_changeling_objectives + var/list/team_objectives = subtypesof(/datum/objective/changeling_team_objective) + var/list/possible_team_objectives = list() + for(var/T in team_objectives) + var/datum/objective/changeling_team_objective/CTO = T + + if(changelings.len >= initial(CTO.min_lings)) + possible_team_objectives += T + + if(possible_team_objectives.len && prob(20*changelings.len)) + changeling_team_objective_type = pick(possible_team_objectives) + + for(var/datum/mind/changeling in changelings) + log_game("[changeling.key] (ckey) has been selected as a changeling") + changeling.current.make_changeling() + forge_changeling_objectives(changeling) + greet_changeling(changeling) + SSticker.mode.update_changeling_icons_added(changeling) + modePlayer += changelings + ..() + +/datum/game_mode/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners + 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 - (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)) + if(!(character.job in restricted_jobs)) + character.mind.make_Changling() + +/datum/game_mode/proc/forge_changeling_objectives(datum/mind/changeling, var/team_mode = 0) + //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft". + //No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting + //If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone + + var/escape_objective_possible = TRUE + + //if there's a team objective, check if it's compatible with escape objectives + for(var/datum/objective/changeling_team_objective/CTO in changeling.objectives) + if(!CTO.escape_objective_compatible) + escape_objective_possible = FALSE + break + + var/datum/objective/absorb/absorb_objective = new + absorb_objective.owner = changeling + absorb_objective.gen_amount_goal(6, 8) + changeling.objectives += absorb_objective + + if(prob(60)) + 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)) + var/datum/objective/destroy/destroy_objective = new + destroy_objective.owner = changeling + destroy_objective.find_target() + changeling.objectives += destroy_objective + else + if(prob(70)) + var/datum/objective/assassinate/kill_objective = new + kill_objective.owner = changeling + if(team_mode) //No backstabbing while in a team + kill_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) + else + kill_objective.find_target() + changeling.objectives += kill_objective + else + var/datum/objective/maroon/maroon_objective = new + maroon_objective.owner = changeling + if(team_mode) + maroon_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) + else + maroon_objective.find_target() + changeling.objectives += maroon_objective + + if (!(locate(/datum/objective/escape) in changeling.objectives) && escape_objective_possible) + var/datum/objective/escape/escape_with_identity/identity_theft = new + identity_theft.owner = changeling + identity_theft.target = maroon_objective.target + identity_theft.update_explanation_text() + changeling.objectives += identity_theft + escape_objective_possible = FALSE + + if (!(locate(/datum/objective/escape) in changeling.objectives) && escape_objective_possible) + if(prob(50)) + var/datum/objective/escape/escape_objective = new + escape_objective.owner = changeling + changeling.objectives += escape_objective + else + var/datum/objective/escape/escape_with_identity/identity_theft = new + identity_theft.owner = changeling + if(team_mode) + identity_theft.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) + else + identity_theft.find_target() + changeling.objectives += identity_theft + escape_objective_possible = FALSE + + + +/datum/game_mode/changeling/forge_changeling_objectives(datum/mind/changeling) + if(changeling_team_objective_type) + var/datum/objective/changeling_team_objective/team_objective = new changeling_team_objective_type + team_objective.owner = changeling + changeling.objectives += team_objective + + ..(changeling,1) + else + ..(changeling,0) + +/datum/game_mode/changeling/generate_report() + return "The Gorlex Marauders have announced the successful raid and destruction of Central Command containment ship #S-[rand(1111, 9999)]. This ship housed only a single prisoner - \ + codenamed \"Thing\", and it was highly adaptive and extremely dangerous. We have reason to believe that the Thing has allied with the Syndicate, and you should note that likelihood \ + of the Thing being sent to a station in this sector is highly likely. It may be in the guise of any crew member. Trust nobody - suspect everybody. Do not announce this to the crew, \ + as paranoia may spread and inhibit workplace efficiency." + +/datum/game_mode/proc/greet_changeling(datum/mind/changeling, you_are=1) + if (you_are) + to_chat(changeling.current, "You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human.") + to_chat(changeling.current, "Use say \":g message\" to communicate with your fellow changelings.") + to_chat(changeling.current, "You must complete the following tasks:") + changeling.current.playsound_local(get_turf(changeling.current), 'sound/ambience/antag/ling_aler.ogg', 100, FALSE, pressure_affected = FALSE) + + if (changeling.current.mind) + var/mob/living/carbon/human/H = changeling.current + if(H.mind.assigned_role == "Clown") + to_chat(H, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") + H.dna.remove_mutation(CLOWNMUT) + + var/obj_count = 1 + for(var/datum/objective/objective in changeling.objectives) + to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ + return + +/datum/game_mode/proc/auto_declare_completion_changeling() + if(changelings.len) + var/text = "
The changelings were:" + for(var/datum/mind/changeling in changelings) + var/changelingwin = 1 + if(!changeling.current) + changelingwin = 0 + + text += printplayer(changeling) + + //Removed sanity if(changeling) because we -want- a runtime to inform us that the changelings list is incorrect and needs to be fixed. + text += "
Changeling ID: [changeling.changeling.changelingID]." + text += "
Genomes Extracted: [changeling.changeling.absorbedcount]" + + if(changeling.objectives.len) + var/count = 1 + for(var/datum/objective/objective in changeling.objectives) + if(objective.check_completion()) + text += "
Objective #[count]: [objective.explanation_text] Success!" + SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS") + else + text += "
Objective #[count]: [objective.explanation_text] Fail." + SSblackbox.add_details("changeling_objective","[objective.type]|FAIL") + changelingwin = 0 + count++ + + if(changelingwin) + text += "
The changeling was successful!" + SSblackbox.add_details("changeling_success","SUCCESS") + else + text += "
The changeling has failed." + SSblackbox.add_details("changeling_success","FAIL") + text += "
" + + to_chat(world, text) + + + return 1 + +/datum/changeling //stores changeling powers, changeling recharge thingie, changeling absorbed DNA and changeling ID (for changeling hivemind) + var/list/stored_profiles = list() //list of datum/changelingprofile + var/datum/changelingprofile/first_prof = null + //var/list/absorbed_dna = list() + //var/list/protected_dna = list() //dna that is not lost when capacity is otherwise full + var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation. + var/absorbedcount = 0 + var/chem_charges = 20 + var/chem_storage = 75 + var/chem_recharge_rate = 1 + var/chem_recharge_slowdown = 0 + var/sting_range = 2 + var/changelingID = "Changeling" + var/geneticdamage = 0 + var/isabsorbing = 0 + var/islinking = 0 + var/geneticpoints = 10 + var/purchasedpowers = list() + var/mimicing = "" + var/canrespec = 0 + var/changeling_speak = 0 + var/datum/dna/chosen_dna + var/obj/effect/proc_holder/changeling/sting/chosen_sting + var/datum/cellular_emporium/cellular_emporium + var/datum/action/innate/cellular_emporium/emporium_action + +/datum/changeling/New(var/gender=FEMALE) + ..() + var/honorific + if(gender == FEMALE) + honorific = "Ms." + else + honorific = "Mr." + if(GLOB.possible_changeling_IDs.len) + changelingID = pick(GLOB.possible_changeling_IDs) + GLOB.possible_changeling_IDs -= changelingID + changelingID = "[honorific] [changelingID]" + else + changelingID = "[honorific] [rand(1,999)]" + + cellular_emporium = new(src) + emporium_action = new(cellular_emporium) + +/datum/changeling/Destroy() + qdel(cellular_emporium) + cellular_emporium = null + qdel(emporium_action) + emporium_action = null + . = ..() + +/datum/changeling/proc/regenerate(var/mob/living/carbon/the_ling) + if(istype(the_ling)) + emporium_action.Grant(the_ling) + if(the_ling.stat == DEAD) + chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5)) + geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1) + else //not dead? no chem/geneticdamage caps. + chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) + geneticdamage = max(0, geneticdamage-1) + + +/datum/changeling/proc/get_dna(dna_owner) + for(var/datum/changelingprofile/prof in stored_profiles) + if(dna_owner == prof.name) + return prof + +/datum/changeling/proc/has_dna(datum/dna/tDNA) + for(var/datum/changelingprofile/prof in stored_profiles) + if(tDNA.is_same_as(prof.dna)) + return 1 + return 0 + +/datum/changeling/proc/can_absorb_dna(mob/living/carbon/user, mob/living/carbon/human/target, var/verbose=1) + if(stored_profiles.len) + var/datum/changelingprofile/prof = stored_profiles[1] + if(prof.dna == user.dna && stored_profiles.len >= dna_max)//If our current DNA is the stalest, we gotta ditch it. + if(verbose) + to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") + return + if(!target) + return + if(NO_DNA_COPY in target.dna.species.species_traits) + if(verbose) + to_chat(user, "[target] is not compatible with our biology.") + return + if((target.disabilities & NOCLONE) || (target.disabilities & HUSK)) + if(verbose) + to_chat(user, "DNA of [target] is ruined beyond usability!") + return + if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! + if(verbose) + to_chat(user, "We could gain no benefit from absorbing a lesser creature.") + return + if(has_dna(target.dna)) + if(verbose) + to_chat(user, "We already have this DNA in storage!") + return + if(!target.has_dna()) + if(verbose) + to_chat(user, "[target] is not compatible with our biology.") + return + return 1 + +/datum/changeling/proc/create_profile(mob/living/carbon/human/H, mob/living/carbon/human/user, protect = 0) + var/datum/changelingprofile/prof = new + + H.dna.real_name = H.real_name //Set this again, just to be sure that it's properly set. + var/datum/dna/new_dna = new H.dna.type + H.dna.copy_dna(new_dna) + prof.dna = new_dna + prof.name = H.real_name + prof.protected = protect + + prof.underwear = H.underwear + prof.undershirt = H.undershirt + prof.socks = H.socks + + var/list/slots = list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") + for(var/slot in slots) + if(slot in H.vars) + var/obj/item/I = H.vars[slot] + if(!I) + continue + prof.name_list[slot] = I.name + prof.appearance_list[slot] = I.appearance + prof.flags_cover_list[slot] = I.flags_cover + prof.item_color_list[slot] = I.item_color + prof.item_state_list[slot] = I.item_state + prof.exists_list[slot] = 1 + else + continue + + return prof + +/datum/changeling/proc/add_profile(datum/changelingprofile/prof) + if(stored_profiles.len > dna_max) + if(!push_out_profile()) + return + + stored_profiles += prof + absorbedcount++ + +/datum/changeling/proc/add_new_profile(mob/living/carbon/human/H, mob/living/carbon/human/user, protect = 0) + var/datum/changelingprofile/prof = create_profile(H, protect) + add_profile(prof) + return prof + +/datum/changeling/proc/remove_profile(mob/living/carbon/human/H, force = 0) + for(var/datum/changelingprofile/prof in stored_profiles) + if(H.real_name == prof.name) + if(prof.protected && !force) + continue + stored_profiles -= prof + qdel(prof) + +/datum/changeling/proc/get_profile_to_remove() + for(var/datum/changelingprofile/prof in stored_profiles) + if(!prof.protected) + return prof + +/datum/changeling/proc/push_out_profile() + var/datum/changelingprofile/removeprofile = get_profile_to_remove() + if(removeprofile) + stored_profiles -= removeprofile + return 1 + return 0 + +/proc/changeling_transform(mob/living/carbon/human/user, datum/changelingprofile/chosen_prof) + var/datum/dna/chosen_dna = chosen_prof.dna + user.real_name = chosen_prof.name + user.underwear = chosen_prof.underwear + user.undershirt = chosen_prof.undershirt + user.socks = chosen_prof.socks + + chosen_dna.transfer_identity(user, 1) + user.updateappearance(mutcolor_update=1) + user.update_body() + user.domutcheck() + + //vars hackery. not pretty, but better than the alternative. + for(var/slot in GLOB.slots) + if(istype(user.vars[slot], GLOB.slot2type[slot]) && !(chosen_prof.exists_list[slot])) //remove unnecessary flesh items + qdel(user.vars[slot]) + continue + + if((user.vars[slot] && !istype(user.vars[slot], GLOB.slot2type[slot])) || !(chosen_prof.exists_list[slot])) + continue + + var/obj/item/C + var/equip = 0 + if(!user.vars[slot]) + var/thetype = GLOB.slot2type[slot] + equip = 1 + C = new thetype(user) + + else if(istype(user.vars[slot], GLOB.slot2type[slot])) + C = user.vars[slot] + + C.appearance = chosen_prof.appearance_list[slot] + C.name = chosen_prof.name_list[slot] + C.flags_cover = chosen_prof.flags_cover_list[slot] + C.item_color = chosen_prof.item_color_list[slot] + C.item_state = chosen_prof.item_state_list[slot] + if(equip) + user.equip_to_slot_or_del(C, GLOB.slot2slot[slot]) + + user.regenerate_icons() + +/datum/changelingprofile + var/name = "a bug" + + var/protected = 0 + + var/datum/dna/dna = null + var/list/name_list = list() //associative list of slotname = itemname + var/list/appearance_list = list() + var/list/flags_cover_list = list() + var/list/exists_list = list() + var/list/item_color_list = list() + var/list/item_state_list = list() + + var/underwear + var/undershirt + var/socks + +/datum/changelingprofile/Destroy() + qdel(dna) + . = ..() + +/datum/changelingprofile/proc/copy_profile(datum/changelingprofile/newprofile) + newprofile.name = name + newprofile.protected = protected + newprofile.dna = new dna.type + dna.copy_dna(newprofile.dna) + newprofile.name_list = name_list.Copy() + newprofile.appearance_list = appearance_list.Copy() + newprofile.flags_cover_list = flags_cover_list.Copy() + newprofile.exists_list = exists_list.Copy() + newprofile.item_color_list = item_color_list.Copy() + newprofile.item_state_list = item_state_list.Copy() + newprofile.underwear = underwear + newprofile.undershirt = undershirt + newprofile.socks = socks + +/datum/game_mode/proc/update_changeling_icons_added(datum/mind/changling_mind) + var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] + hud.join_hud(changling_mind.current) + set_antag_hud(changling_mind.current, "changling") + +/datum/game_mode/proc/update_changeling_icons_removed(datum/mind/changling_mind) + var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] + hud.leave_hud(changling_mind.current) + set_antag_hud(changling_mind.current, null) + diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index 6cf5d55d2d..b2ddd022a4 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -1,4 +1,4 @@ -//Augmented Eyesight: Gives you thermal and night vision - bye bye, flashlights. Also, high DNA cost because of how powerful it is. +//Augmented Eyesight: Gives you x-ray vision or protection from flashes. Also, high DNA cost because of how powerful it is. //Possible todo: make a custom message for directing a penlight/flashlight at the eyes - not sure what would display though. /obj/effect/proc_holder/changeling/augmented_eyesight @@ -7,21 +7,31 @@ helptext = "Grants us thermal vision or flash protection. We will become a lot more vulnerable to flash-based devices while thermal vision is active." chemical_cost = 0 dna_cost = 2 //Would be 1 without thermal vision - active = 0 //Whether or not vision is enhanced + active = FALSE + +/obj/effect/proc_holder/changeling/augmented_eyesight/on_purchase(mob/user) //The ability starts inactive, so we should be protected from flashes. + var/obj/item/organ/eyes/E = user.getorganslot("eye_sight") + if (E) + E.flash_protect = 2 //Adjust the user's eyes' flash protection + to_chat(user, "We adjust our eyes to protect them from bright lights.") + else + to_chat(user, "We can't adjust our eyes if we don't have any!") /obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(mob/living/carbon/human/user) if(!istype(user)) return var/obj/item/organ/eyes/E = user.getorganslot("eye_sight") if(E) - if(E.flash_protect) - E.sight_flags |= SEE_MOBS - E.flash_protect = -1 + if(!active) + E.sight_flags |= SEE_MOBS | SEE_OBJS | SEE_TURFS //Add sight flags to the user's eyes + E.flash_protect = -1 //Adjust the user's eyes' flash protection to_chat(user, "We adjust our eyes to sense prey through walls.") + active = TRUE //Defined in code/modules/spells/spell.dm else - E.sight_flags -= SEE_MOBS - E.flash_protect = 2 + E.sight_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS //Remove sight flags from the user's eyes + E.flash_protect = 2 //Adjust the user's eyes' flash protection to_chat(user, "We adjust our eyes to protect them from bright lights.") + active = FALSE user.update_sight() else to_chat(user, "We can't adjust our eyes if we don't have any!") @@ -31,7 +41,11 @@ return 1 -/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user) +/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user) //Get rid of x-ray vision and flash protection when the user refunds this ability var/obj/item/organ/eyes/E = user.getorganslot("eye_sight") if(E) - E.sight_flags -= SEE_MOBS \ No newline at end of file + if (active) + E.sight_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS + else + E.flash_protect = 0 + user.update_sight() \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index 94d83e2520..e7f23bc07b 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/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 443720fefc..addca91629 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -247,7 +247,7 @@ /obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] is not ready yet.") + to_chat(user, "The [name] is not ready yet.") /obj/item/gun/magic/tentacle/suicide_act(mob/user) user.visible_message("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") @@ -343,10 +343,10 @@ on_hit(I) //grab the item as if you had hit it directly with the tentacle return 1 else - to_chat(firer, "You can't seem to pry [I] off [C]'s hands!") + to_chat(firer, "You can't seem to pry [I] off [C]'s hands!") return 0 else - to_chat(firer, "[C] has nothing in hand to disarm!") + to_chat(firer, "[C] has nothing in hand to disarm!") return 0 if(INTENT_GRAB) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 6a680f27d6..1732e98630 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -73,14 +73,14 @@ if(!selected_dna) return if(NOTRANSSTING in selected_dna.dna.species.species_traits) - to_chat(user, "That DNA is not compatible with changeling retrovirus!") + to_chat(user, "That DNA is not compatible with changeling retrovirus!") 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 3392f46578..f951e31c08 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -1,76 +1,84 @@ -/datum/game_mode/traitor/changeling - name = "traitor+changeling" - config_tag = "traitorchan" - traitors_possible = 3 //hard limit on traitors if scaling is turned off - restricted_jobs = list("AI", "Cyborg") - required_players = 25 - required_enemies = 1 // how many of each type are required - recommended_enemies = 3 - reroll_friendly = 1 - - var/list/possible_changelings = list() - var/const/changeling_amount = 1 //hard limit on changelings if scaling is turned off - -/datum/game_mode/traitor/changeling/announce() - to_chat(world, "The current game mode is - Traitor+Changeling!") - to_chat(world, "There are alien creatures on the station along with some syndicate operatives out for their own gain! Do not let the changelings or the traitors succeed!") - -/datum/game_mode/traitor/changeling/can_start() - if(!..()) - return 0 - possible_changelings = get_players_for_role(ROLE_CHANGELING) - if(possible_changelings.len < required_enemies) - return 0 - return 1 - -/datum/game_mode/traitor/changeling/pre_setup() - if(config.protect_roles_from_antagonist) - restricted_jobs += protected_jobs - - if(config.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)) )) - else - num_changelings = max(1, min(num_players(), changeling_amount/2)) - - if(possible_changelings.len>0) - for(var/j = 0, j < num_changelings, j++) - if(!possible_changelings.len) break - var/datum/mind/changeling = pick(possible_changelings) - antag_candidates -= changeling - possible_changelings -= changeling - changeling.special_role = "Changeling" - changelings += changeling - changeling.restricted_roles = restricted_jobs - return ..() - else - return 0 - -/datum/game_mode/traitor/changeling/post_setup() - modePlayer += changelings - for(var/datum/mind/changeling in changelings) - changeling.current.make_changeling() - forge_changeling_objectives(changeling) - greet_changeling(changeling) - SSticker.mode.update_changeling_icons_added(changeling) - ..() - 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)) ) - 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(ROLE_CHANGELING in character.client.prefs.be_special) - if(!jobban_isbanned(character, ROLE_CHANGELING) && !jobban_isbanned(character, "Syndicate")) - if(age_check(character.client)) - if(!(character.job in restricted_jobs)) - character.mind.make_Changling() - ..() +/datum/game_mode/traitor/changeling + name = "traitor+changeling" + config_tag = "traitorchan" + false_report_weight = 10 + traitors_possible = 3 //hard limit on traitors if scaling is turned off + restricted_jobs = list("AI", "Cyborg") + required_players = 25 + required_enemies = 1 // how many of each type are required + recommended_enemies = 3 + reroll_friendly = 1 + + var/list/possible_changelings = list() + var/const/changeling_amount = 1 //hard limit on changelings if scaling is turned off + +/datum/game_mode/traitor/changeling/announce() + to_chat(world, "The current game mode is - Traitor+Changeling!") + to_chat(world, "There are alien creatures on the station along with some syndicate operatives out for their own gain! Do not let the changelings or the traitors succeed!") + +/datum/game_mode/traitor/changeling/can_start() + if(!..()) + return 0 + possible_changelings = get_players_for_role(ROLE_CHANGELING) + if(possible_changelings.len < required_enemies) + return 0 + return 1 + +/datum/game_mode/traitor/changeling/pre_setup() + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + restricted_jobs += protected_jobs + + 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 + + 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)) + + if(possible_changelings.len>0) + for(var/j = 0, j < num_changelings, j++) + if(!possible_changelings.len) break + var/datum/mind/changeling = pick(possible_changelings) + antag_candidates -= changeling + possible_changelings -= changeling + changeling.special_role = "Changeling" + changelings += changeling + changeling.restricted_roles = restricted_jobs + return ..() + else + return 0 + +/datum/game_mode/traitor/changeling/post_setup() + modePlayer += changelings + for(var/datum/mind/changeling in changelings) + changeling.current.make_changeling() + forge_changeling_objectives(changeling) + greet_changeling(changeling) + SSticker.mode.update_changeling_icons_added(changeling) + ..() + return + +/datum/game_mode/traitor/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners + 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 / (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)) + if(!(character.job in restricted_jobs)) + character.mind.make_Changling() + ..() + +/datum/game_mode/traitor/changeling/generate_report() + return "The Syndicate has started some experimental research regarding humanoid shapeshifting. There are rumors that this technology will be field tested on a Nanotrasen station \ + for infiltration purposes. Be advised that support personel may also be deployed to defend these shapeshifters. Trust nobody - suspect everybody. Do not announce this to the crew, \ + as paranoia may spread and inhibit workplace efficiency." diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index ec387a71e5..7d6f9bcdd1 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,12 +87,13 @@ 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" config_tag = "clockwork_cult" antag_flag = ROLE_SERVANT_OF_RATVAR + false_report_weight = 10 required_players = 24 required_enemies = 3 recommended_enemies = 3 @@ -102,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() @@ -133,26 +137,35 @@ 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.set_species(/datum/species/human) + 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)) @@ -164,47 +177,43 @@ 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 \ + signs remain uninterrupted. Those that have managed to send a transmission or have had some of their crew escape tell tales of a machine cult creating sapient automatons and seeking \ + to brainwash the crew to summon their god, Ratvar. If evidence of this cult is dicovered aboard your station, extreme caution and extreme vigilance must be taken going forward, and \ + all resources should be devoted to stopping this cult. Note that holy water seems to weaken and eventually return the minds of cultists that ingest it, and mindshield implants will \ + prevent conversion altogether." /datum/game_mode/proc/auto_declare_completion_clockwork_cult() var/text = "" 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) @@ -225,3 +234,66 @@ 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 + 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 + +/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() + +/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 0000000000..a1946c4c22 --- /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 507c673921..d5b9ce4401 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 ? "INFINITY":"[power_charge]"]W 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 [POWER_FLOOR]W 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 [B.amount * POWER_FLOOR]W 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 0000000000..988c00b2f5 --- /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 a6eb5fb4e7..9b1ef66c9e 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 5f6d1af61b..e319df418f 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 18c8103eef..a5af47ff05 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 [fabricator.get_power()]W/[fabricator.get_max_power()]W 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 81e5783c68..4c1789c50d 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 0000000000..1935eb3e0b
--- /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 d6e56f38d5..c6f3f0f7f3 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 != ZLEVEL_STATION || 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 802cfa5078..3c067e0c17 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 06b3ac7885..b1409aae18 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 0000000000..afe6aca217
--- /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 c1ea55e16d..d3365e9e20 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 d68c87369e..df83ff4890 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 343f2e70e7..a9c241b2c3 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 += "-=-=-=-=-=-" @@ -500,7 +326,7 @@ anything but a last resort. Instead, it is recommended that a Sigil of Transmission is created. This sigil serves as both battery and power generator for nearby clockwork \ structures, and those structures will happily draw power from the sigil before they resort to APCs.
" dat += "Generating power is less easy. The most reliable and efficient way is using brass sheets; attacking a sigil of transmission with brass sheets will convert them \ - to power, at a rate of [POWER_FLOOR]W per sheet. (Brass sheets are created from replica fabricators, which are explained more in detail in the Conversion section.) \ + to power, at a rate of [DisplayPower(POWER_FLOOR)] per sheet. (Brass sheets are created from replica fabricators, which are explained more in detail in the Conversion section.) \ Activating a sigil of transmission will also cause it to drain power from the nearby area, which, while effective, serves as an obvious tell that there is something wrong.
" dat += "Without power, many structures will not function, making a base vulnerable to attack. For this reason, it is critical that you keep an eye on your power reserves and \ ensure that they remain comfortably high.
" @@ -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 0000000000..f2174030a6 --- /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 0000000000..11349cb013 --- /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 0000000000..214345a71f --- /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 fb210625a2..51ffdd9e10 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 3f7e826017..ae001c03e5 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) @@ -126,48 +49,27 @@ to_chat(user, "Can be used to replace walls, floors, tables, windows, windoors, and airlocks with Clockwork variants.") to_chat(user, "Can construct Clockwork Walls on Clockwork Floors and deconstruct Clockwork Walls to Clockwork Floors.") if(uses_power) - to_chat(user, "It can consume floor tiles, rods, metal, and plasteel for power at rates of 2:[POWER_ROD]W, 1:[POWER_ROD]W, 1:[POWER_METAL]W, \ - and 1:[POWER_PLASTEEL]W, respectively.") - to_chat(user, "It can also consume brass sheets for power at a rate of 1:[POWER_FLOOR]W.") - to_chat(user, "It is storing [get_power()]W/[get_max_power()]W of power[charge_rate ? ", and is gaining [charge_rate*0.5]W of power per second":""].") - to_chat(user, "Use it in-hand to produce 5 brass sheets at a cost of [POWER_WALL_TOTAL]W power.") + 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, "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)) - to_chat(user, "[src] requires [POWER_WALL_TOTAL]W of power to produce brass sheets!") + 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 [get_power()]W/[get_max_power()]W 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,11 +90,11 @@ 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) - if(!Y || (Y.z != ZLEVEL_STATION && Y.z != ZLEVEL_CENTCOM && Y.z != ZLEVEL_MINING && Y.z != ZLEVEL_LAVALAND)) + if(!Y || (!(Y.z in GLOB.station_z_levels) && Y.z != ZLEVEL_CENTCOM && Y.z != ZLEVEL_MINING && Y.z != ZLEVEL_LAVALAND)) fabrication_values["operation_time"] *= 2 if(fabrication_values["power_cost"] > 0) fabrication_values["power_cost"] *= 2 @@ -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 [fabrication_values["power_cost"]]W 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]!") + to_chat(user, "You need [DisplayPower(fabrication_values["power_cost"])] power to fabricate \a [initial(A.name)] from [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 [repair_values["power_required"]]W power to start repairin[target == user ? "g yourself" : "g [target]"], and at least \ - [round(repair_values["amount_to_heal"]*MIN_CLOCKCULT_POWER, MIN_CLOCKCULT_POWER)]W 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]!") + 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 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 0ee6d45f7d..ca80d6f082 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 6d17fe4e74..fc734ac426 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 abeb183ab0..37933514f8 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 abbc86089d..a0396fdec2 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 = "
[resulthealth]
\ - 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) to_chat(invoker, "\"It is too late to construct one of these, champion.\"") return FALSE var/turf/T = get_turf(invoker) - if(!T || T.z != ZLEVEL_STATION) + if(!T || !(T.z in GLOB.station_z_levels)) to_chat(invoker, "\"You must be on the station to construct one of these, champion.\"") return FALSE return ..() @@ -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 fa61e3ca31..19dee4e347 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 e7beff846f..0000000000 --- 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 != ZLEVEL_STATION || 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 0e42af3a65..16a6f3ffd7 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 0c29361e59..6c3f3a0c0b 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 ? "INFINITY":"[powered]"]W 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 2174f04dcb..2d66739b4e 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() @@ -101,49 +121,14 @@ glow.linked = src /obj/structure/destructible/clockwork/massive/celestial_gateway/ex_act(severity) - var/damage = max((obj_integrity * 0.70) / severity, 100) //requires multiple bombs to take down + 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 4df615450f..51d42611d2 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm @@ -23,7 +23,7 @@ /obj/structure/destructible/clockwork/powered/clockwork_obelisk/examine(mob/user) ..() if(is_servant_of_ratvar(user) || isobserver(user)) - to_chat(user, "It requires [hierophant_cost]W to broadcast over the Hierophant Network, and [gateway_cost]W to open a Spatial Gateway.") + to_chat(user, "It requires [DisplayPower(hierophant_cost)] to broadcast over the Hierophant Network, and [DisplayPower(gateway_cost)] to open a Spatial Gateway.") /obj/structure/destructible/clockwork/powered/clockwork_obelisk/can_be_unfasten_wrench(mob/user, silent) if(active) @@ -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 029fd552e2..0000000000 --- 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 0000000000..5e43749ac5 --- /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 732897fda4..b95d9cc0db 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm @@ -19,7 +19,7 @@ /obj/structure/destructible/clockwork/powered/mania_motor/examine(mob/user) ..() if(is_servant_of_ratvar(user) || isobserver(user)) - to_chat(user, "It requires [mania_cost]W to run.") + to_chat(user, "It requires [DisplayPower(mania_cost)] to run.") /obj/structure/destructible/clockwork/powered/mania_motor/forced_disable(bad_effects) if(active) @@ -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 7953a7dafd..cdff486eea 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 cf730189e3..0000000000 --- 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 [get_delay_cost()]W of power to attempt to delay the arrival of an emergency shuttle by [2 * efficiency] minutes.") - to_chat(user, "This cost increases by [delay_cost_increase]W 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 != ZLEVEL_STATION) - 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 != ZLEVEL_STATION) - 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) - 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.overlays += 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 c604e106f3..4850b904c8 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 0000000000..bb8051356e --- /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 index 326aa46c06..cd33cf7adc 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm @@ -105,7 +105,7 @@ ..() 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!") + to_chat(user, "It is linked to a Clockwork Wall and will generate a component every [DisplayTimeText(get_production_time())]!") else to_chat(user, "It is unlinked! Construct a Clockwork Wall nearby to generate components!") to_chat(user, "Stored components:") 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 079fd081fe..0000000000 --- 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)]: [get_component_cost(i)]W ([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)] ([get_component_cost(i)]W)"] = 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 06407079ce..01773f1ea6 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)) @@ -31,6 +33,7 @@ name = "cult" config_tag = "cult" antag_flag = ROLE_CULTIST + false_report_weight = 10 restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") protected_jobs = list() required_players = 24 @@ -54,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 @@ -104,7 +107,7 @@ if(!GLOB.summon_spots.len) while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES) var/area/summon = pick(GLOB.sortedAreas - GLOB.summon_spots) - if((summon.z == ZLEVEL_STATION) && summon.valid_territory) + if((summon.z in GLOB.station_z_levels) && summon.valid_territory) GLOB.summon_spots += summon cult_objectives += "eldergod" @@ -144,7 +147,7 @@ to_chat(mob, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") return 0 else - to_chat(mob, "You have a [item_name] in your [where].") + to_chat(mob, "You have a [item_name] in your [where].") if(where == "backpack") var/obj/item/storage/B = mob.back B.orient2hud(mob) @@ -258,6 +261,12 @@ ..() return 1 +/datum/game_mode/cult/generate_report() + return "Some stations in your sector have reported evidence of blood sacrifice and strange magic. Ties to the Wizards' Federation have been proven not to exist, and many employees \ + have disappeared; even Central Command employees light-years away have felt strange presences and at times hysterical compulsions. Interrogations point towards this being the work of \ + the cult of Nar-Sie. If evidence of this cult is discovered aboard your station, extreme caution and extreme vigilance must be taken going forward, and all resources should be \ + devoted to stopping this cult. Note that holy water seems to weaken and eventually return the minds of cultists that ingest it, and mindshield implants will prevent conversion \ + altogether." /datum/game_mode/proc/datum_cult_completion() var/text = "" diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index 647b47e7fa..b8cbed5051 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) @@ -118,7 +118,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has died in the process of attempting to win the cult's support!") + to_chat(B.current,"[Nominee] has died in the process of attempting to win the cult's support!") return FALSE if(!Nominee.mind) GLOB.cult_vote_called = FALSE @@ -126,7 +126,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has gone catatonic in the process of attempting to win the cult's support!") + to_chat(B.current,"[Nominee] has gone catatonic in the process of attempting to win the cult's support!") return FALSE if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5) GLOB.cult_vote_called = FALSE @@ -134,7 +134,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current, "[Nominee] could not win the cult's support and shall continue to serve as an acolyte.") + to_chat(B.current, "[Nominee] could not win the cult's support and shall continue to serve as an acolyte.") return FALSE GLOB.cult_mastered = TRUE SSticker.mode.remove_cultist(Nominee.mind, TRUE) @@ -144,7 +144,7 @@ for(var/datum/action/innate/cult/mastervote/vote in B.current.actions) vote.Remove(B.current) if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!") + to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!") return TRUE /datum/action/innate/cult/master/IsAvailable() @@ -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_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 0cba943287..c1ccf9a368 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,7 +98,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...",,"Shielded Robe","Flagellant's Robe","Nar-Sien Hardsuit") var/pickedtype @@ -212,7 +205,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/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 06f0910c19..4dd5f70731 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -257,8 +257,8 @@ This file contains the arcane tome files. to_chat(user, "There is already a rune here.") return FALSE - if(T.z != ZLEVEL_STATION && T.z != ZLEVEL_MINING) - to_chat(user, "The veil is not weak enough here.") + if(!(T.z in GLOB.station_z_levels) && T.z != ZLEVEL_MINING) + to_chat(user, "The veil is not weak enough here.") return FALSE return TRUE diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 936afe9090..089265d2fb 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -465,7 +465,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/narsie/invoke(var/list/invokers) if(used) return - if(z != ZLEVEL_STATION) + if(!(z in GLOB.station_z_levels)) return if(locate(/obj/singularity/narsie) in GLOB.poi_list) diff --git a/code/game/gamemodes/devil/devil agent/devil_agent.dm b/code/game/gamemodes/devil/devil agent/devil_agent.dm index 5c48406f23..ec09bfc739 100644 --- a/code/game/gamemodes/devil/devil agent/devil_agent.dm +++ b/code/game/gamemodes/devil/devil agent/devil_agent.dm @@ -41,3 +41,7 @@ devil.objectives += outsellobjective return 1 return 0 + +/datum/game_mode/devil/devil_agents/generate_report() + return "Multiple soul merchants have been spotted in the quadrant, and appear to be competing over who can purchase the most souls. Be advised that they are likely to manufacture \ + emergencies to encourage employees to sell their souls. If anyone sells their soul in error, contact an attorney to overrule the sale." diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm index 41016fa770..844b027e93 100644 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ b/code/game/gamemodes/devil/devil_game_mode.dm @@ -2,6 +2,7 @@ name = "devil" config_tag = "devil" antag_flag = ROLE_DEVIL + false_report_weight = 1 protected_jobs = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI") required_players = 0 required_enemies = 1 @@ -19,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)) @@ -54,6 +56,10 @@ ..() return 1 +/datum/game_mode/devil/generate_report() + return "Infernal creatures have been seen nearby offering great boons in exchange for souls. This is considered theft against Nanotrasen, as all employment contracts contain a lien on the \ + employee's soul. If anyone sells their soul in error, contact an attorney to overrule the sale. Be warned that if the devil purchases enough souls, a gateway to hell may open." + /datum/game_mode/devil/proc/post_setup_finalize(datum/mind/devil) add_devil(devil.current, ascendable = TRUE) //Devil gamemode devils are ascendable. add_devil_objectives(devil,2) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index a56a2d6647..b405cc935c 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -1,80 +1,80 @@ -/proc/power_failure() - priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg') - for(var/obj/machinery/power/smes/S in GLOB.machines) - if(istype(get_area(S), /area/ai_monitored/turret_protected) || S.z != ZLEVEL_STATION) - continue - S.charge = 0 - S.output_level = 0 - S.output_attempt = 0 - S.update_icon() - S.power_change() - - var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai) - - for(var/area/A in world) - if( !A.requires_power || A.always_unpowered ) - continue - - var/skip = 0 - for(var/area_type in skipped_areas) - if(istype(A,area_type)) - skip = 1 - break - if(A.contents) - for(var/atom/AT in A.contents) - if(AT.z != ZLEVEL_STATION) //Only check one, it's enough. - skip = 1 - break - if(skip) continue +/proc/power_failure() + priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg') + for(var/obj/machinery/power/smes/S in GLOB.machines) + if(istype(get_area(S), /area/ai_monitored/turret_protected) || !(S.z in GLOB.station_z_levels)) + continue + S.charge = 0 + S.output_level = 0 + S.output_attempt = 0 + S.update_icon() + S.power_change() + + var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai) + + for(var/area/A in world) + if( !A.requires_power || A.always_unpowered ) + continue + + var/skip = 0 + for(var/area_type in skipped_areas) + if(istype(A,area_type)) + skip = 1 + break + if(A.contents) + for(var/atom/AT in A.contents) + if(!(AT.z in GLOB.station_z_levels)) //Only check one, it's enough. + skip = 1 + break + if(skip) continue A.power_light = FALSE A.power_equip = FALSE A.power_environ = FALSE - A.power_change() - - for(var/obj/machinery/power/apc/C in GLOB.apcs_list) - if(C.cell && C.z == ZLEVEL_STATION) + A.power_change() + + for(var/obj/machinery/power/apc/C in GLOB.apcs_list) + if(C.cell && (C.z in GLOB.station_z_levels)) var/area/A = C.area - - var/skip = 0 - for(var/area_type in skipped_areas) - if(istype(A,area_type)) - skip = 1 - break - if(skip) continue - - C.cell.charge = 0 - -/proc/power_restore() - - priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg') - for(var/obj/machinery/power/apc/C in GLOB.machines) - if(C.cell && C.z == ZLEVEL_STATION) - C.cell.charge = C.cell.maxcharge - C.failure_timer = 0 - for(var/obj/machinery/power/smes/S in GLOB.machines) - if(S.z != ZLEVEL_STATION) - continue - S.charge = S.capacity - S.output_level = S.output_level_max - S.output_attempt = 1 - S.update_icon() - S.power_change() - for(var/area/A in world) + + var/skip = 0 + for(var/area_type in skipped_areas) + if(istype(A,area_type)) + skip = 1 + break + if(skip) continue + + C.cell.charge = 0 + +/proc/power_restore() + + priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg') + for(var/obj/machinery/power/apc/C in GLOB.machines) + if(C.cell && (C.z in GLOB.station_z_levels)) + C.cell.charge = C.cell.maxcharge + C.failure_timer = 0 + for(var/obj/machinery/power/smes/S in GLOB.machines) + if(!(S.z in GLOB.station_z_levels)) + continue + S.charge = S.capacity + S.output_level = S.output_level_max + S.output_attempt = 1 + S.update_icon() + S.power_change() + for(var/area/A in world) if(!istype(A, /area/space) && !istype(A, /area/shuttle) && !istype(A, /area/arrival)) A.power_light = TRUE A.power_equip = TRUE A.power_environ = TRUE - A.power_change() - -/proc/power_restore_quick() - - priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg') - for(var/obj/machinery/power/smes/S in GLOB.machines) - if(S.z != ZLEVEL_STATION) - continue - S.charge = S.capacity - S.output_level = S.output_level_max - S.output_attempt = 1 - S.update_icon() - S.power_change() - + A.power_change() + +/proc/power_restore_quick() + + priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg') + for(var/obj/machinery/power/smes/S in GLOB.machines) + if(!(S.z in GLOB.station_z_levels)) + continue + S.charge = S.capacity + S.output_level = S.output_level_max + S.output_attempt = 1 + S.update_icon() + S.power_change() + diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index fdc3aee2ae..72e8b472ed 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -1,6 +1,7 @@ /datum/game_mode/extended name = "secret extended" config_tag = "secret_extended" + false_report_weight = 5 required_players = 0 announce_span = "notice" @@ -12,9 +13,13 @@ /datum/game_mode/extended/post_setup() ..() +/datum/game_mode/extended/generate_report() + return "The transmission mostly failed to mention your sector. It is possible that there is nothing in the Syndicate that could threaten your station during this shift." + /datum/game_mode/extended/announced name = "extended" config_tag = "extended" + false_report_weight = 0 /datum/game_mode/extended/announced/generate_station_goals() for(var/T in subtypesof(/datum/station_goal)) diff --git a/code/game/gamemodes/factions.dm b/code/game/gamemodes/factions.dm deleted file mode 100644 index d8d7d92831..0000000000 --- a/code/game/gamemodes/factions.dm +++ /dev/null @@ -1 +0,0 @@ -//Todo diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 1aee6ee7d3..9f67693613 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -1,593 +1,572 @@ - - -/* - * GAMEMODES (by Rastaf0) - * - * In the new mode system all special roles are fully supported. - * You can have proper wizards/traitors/changelings/cultists during any mode. - * Only two things really depends on gamemode: - * 1. Starting roles, equipment and preparations - * 2. Conditions of finishing the round. - * - */ - - -/datum/game_mode - var/name = "invalid" - var/config_tag = null - var/votable = 1 - var/probability = 0 - 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_1 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 - var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist - var/list/protected_jobs = list() // Jobs that can't be traitors because - var/required_players = 0 - var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations - var/required_enemies = 0 - var/recommended_enemies = 0 - var/antag_flag = null //preferences flag such as BE_WIZARD that need to be turned on for players to be antag - var/mob/living/living_antag_player = null - var/list/datum/game_mode/replacementmode = null - var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted - var/reroll_friendly //During mode conversion only these are in the running - var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die - var/enemy_minimum_age = 7 //How many days must players have been playing before they can play this antagonist - - var/announce_span = "warning" //The gamemode's name will be in this span during announcement. - var/announce_text = "This gamemode forgot to set a descriptive text! Uh oh!" //Used to describe a gamemode when it's announced. - - var/const/waittime_l = 600 - var/const/waittime_h = 1800 // started at 1800 - - var/list/datum/station_goal/station_goals = list() - - var/allow_persistence_save = TRUE - -/datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description. - to_chat(world, "The gamemode is: [name]!") - to_chat(world, "[announce_text]") - - -///Checks to see if the game can be setup and ran with the current number of players or whatnot. -/datum/game_mode/proc/can_start() - var/playerC = 0 - for(var/mob/dead/new_player/player in GLOB.player_list) - if((player.client)&&(player.ready == PLAYER_READY_TO_PLAY)) - playerC++ - if(!GLOB.Debug2) - if(playerC < required_players || (maximum_players >= 0 && playerC > maximum_players)) - return 0 - antag_candidates = get_players_for_role(antag_flag) - if(!GLOB.Debug2) - if(antag_candidates.len < required_enemies) - return 0 - return 1 - else - message_admins("DEBUG: GAME STARTING WITHOUT PLAYER NUMBER CHECKS, THIS WILL PROBABLY BREAK SHIT.") - return 1 - - -///Attempts to select players for special roles the mode might have. -/datum/game_mode/proc/pre_setup() - return 1 - - -///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 - addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) - - if(SSdbcore.Connect()) - var/sql - if(SSticker.mode) - sql += "game_mode = '[SSticker.mode]'" - if(GLOB.revdata.originmastercommit) - if(sql) - sql += ", " - sql += "commit_hash = '[GLOB.revdata.originmastercommit]'" - if(sql) - var/datum/DBQuery/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET [sql] WHERE id = [GLOB.round_id]") - query_round_game_mode.Execute() - if(report) - addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h)) - generate_station_goals() - return 1 - - -///Handles late-join antag assignments -/datum/game_mode/proc/make_antag_chance(mob/living/carbon/human/character) - if(replacementmode && round_converted == 2) - replacementmode.make_antag_chance(character) - return - - -///Allows rounds to basically be "rerolled" should the initial premise fall through. Also known as mulligan antags. -/datum/game_mode/proc/convert_roundtype() - set waitfor = FALSE - var/list/living_crew = list() - - 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") - 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) - usable_modes += G - else - qdel(G) - - if(!usable_modes) - message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.") - return null - - replacementmode = pickweight(usable_modes) - - switch(SSshuttle.emergency.mode) //Rounds on the verge of ending don't get new antags, they just run out - if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE) - return 1 - if(SHUTTLE_CALL) - 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.") - return null - - var/list/antag_candidates = list() - - for(var/mob/living/carbon/human/H in living_crew) - if(H.client && H.client.prefs.allow_midround_antag) - antag_candidates += H - - if(!antag_candidates) - message_admins("Convert_roundtype failed due to no antag candidates.") - return null - - antag_candidates = shuffle(antag_candidates) - - if(config.protect_roles_from_antagonist) - replacementmode.restricted_jobs += replacementmode.protected_jobs - if(config.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.") - - . = 1 - sleep(rand(600,1800)) - if(!SSticker.IsRoundInProgress()) - message_admins("Roundtype conversion cancelled, the game appears to have finished!") - round_converted = 0 - return - //somewhere between 1 and 3 minutes from now - if(!config.midround_antag[SSticker.mode.config_tag]) - round_converted = 0 - return 1 - for(var/mob/living/carbon/human/H in antag_candidates) - replacementmode.make_antag_chance(H) - round_converted = 2 - message_admins("-- IMPORTANT: The roundtype has been converted to [replacementmode.name], antagonists may have been created! --") - - -///Called by the gameSSticker -/datum/game_mode/process() - return 0 - - -/datum/game_mode/proc/check_finished(force_ending) //to be called by SSticker - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - if(SSshuttle.emergency && (SSshuttle.emergency.mode == SHUTTLE_ENDGAME)) - 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 - 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) - if(Player.mind.special_role) - continuous_sanity_checked = 1 - 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 - SSshuttle.clearHostileEnvironment(src) - return 0 - - - if(living_antag_player && living_antag_player.mind && isliving(living_antag_player) && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player)) - return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark. - - for(var/mob/Player in GLOB.living_mob_list) - if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client) - if(Player.mind.special_role) //Someone's still antaging! - living_antag_player = Player - return 0 - - if(!config.continuous[config_tag] || force_ending) - return 1 - - else - round_converted = convert_roundtype() - if(!round_converted) - if(round_ends_with_antag_death) - return 1 - else - config.midround_antag[config_tag] = 0 - return 0 - - return 0 - - -/datum/game_mode/proc/declare_completion() - var/clients = 0 - var/surviving_humans = 0 - var/surviving_total = 0 - var/ghosts = 0 - var/escaped_humans = 0 - var/escaped_total = 0 - - for(var/mob/M in GLOB.player_list) - if(M.client) - clients++ - if(ishuman(M)) - if(!M.stat) - surviving_humans++ - if(M.z == ZLEVEL_CENTCOM) - escaped_humans++ - if(!M.stat) - surviving_total++ - if(M.z == ZLEVEL_CENTCOM) - escaped_total++ - - - if(isobserver(M)) - ghosts++ - - if(clients > 0) - SSblackbox.set_val("round_end_clients",clients) - if(ghosts > 0) - SSblackbox.set_val("round_end_ghosts",ghosts) - if(surviving_humans > 0) - SSblackbox.set_val("survived_human",surviving_humans) - if(surviving_total > 0) - SSblackbox.set_val("survived_total",surviving_total) - if(escaped_humans > 0) - SSblackbox.set_val("escaped_human",escaped_humans) - if(escaped_total > 0) - SSblackbox.set_val("escaped_total",escaped_total) - send2irc("Server", "Round just ended.") - if(cult.len && !istype(SSticker.mode, /datum/game_mode/cult)) - datum_cult_completion() - - - if(GLOB.borers.len) - var/borertext = "
The borers were:" - for(var/mob/living/simple_animal/borer/B in GLOB.borers) - if((B.key || B.controlling) && B.stat != DEAD) - borertext += "
[B.controlling ? B.victim.key : B.key] was [B.truename]" - var/count = 1 - for(var/datum/objective/objective in B.mind.objectives) - if(objective.check_completion()) - borertext += "
Objective #[count]: [objective.explanation_text] Success!" - else - borertext += "
Objective #[count]: [objective.explanation_text] Fail." - count++ - - - to_chat(world, borertext) - - var/total_borers = 0 - for(var/mob/living/simple_animal/borer/B in GLOB.borers) - if((B.key || B.victim) && B.stat != DEAD) - total_borers++ - if(total_borers) - var/total_borer_hosts = 0 - for(var/mob/living/carbon/C in GLOB.mob_list) - var/mob/living/simple_animal/borer/D = C.has_brain_worms() - var/turf/location = get_turf(C) - if(location.z == ZLEVEL_CENTCOM && D && D.stat != DEAD) - total_borer_hosts++ - to_chat(world, "There were [total_borers] borers alive at round end!") - to_chat(world, "A total of [total_borer_hosts] borers with hosts escaped on the shuttle alive.") - - CHECK_TICK - return 0 - - -/datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere. - return 0 - - -/datum/game_mode/proc/send_intercept() - var/intercepttext = "Central Command Status Summary
" - intercepttext += "Central Command has intercepted and partially decoded a Syndicate transmission with vital information regarding their movements. The following report outlines the most \ - likely threats to appear in your sector." - var/list/possible_modes = list() - possible_modes.Add("blob", "changeling", "clock_cult", "cult", "extended", "gang", "malf", "nuclear", "revolution", "traitor", "wizard") - possible_modes -= name //remove the current gamemode to prevent it from being randomly deleted, it will be readded later - - for(var/i in 1 to 6) //Remove a few modes to leave four - possible_modes -= pick(possible_modes) - - possible_modes |= name //Re-add the actual gamemode - the intercept will thus always have the correct mode in its list - possible_modes = shuffle(possible_modes) //Meta prevention - - var/datum/intercept_text/i_text = new /datum/intercept_text - for(var/V in possible_modes) - intercepttext += i_text.build(V) - - if(station_goals.len) - intercepttext += "
Special Orders for [station_name()]:" - for(var/datum/station_goal/G in station_goals) - G.on_report() - intercepttext += G.get_report() - - print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE) - priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/ai/intercept.ogg') - if(GLOB.security_level < SEC_LEVEL_BLUE) - set_security_level(SEC_LEVEL_BLUE) - - -/datum/game_mode/proc/get_players_for_role(role) - var/list/players = list() - var/list/candidates = list() - var/list/drafted = list() - var/datum/mind/applicant = null - - // Ultimate randomizing code right here - for(var/mob/dead/new_player/player in GLOB.player_list) - if(player.client && player.ready == PLAYER_READY_TO_PLAY) - players += player - - // Shuffling, the players list is now ping-independent!!! - // Goodbye antag dante - players = shuffle(players) - - for(var/mob/dead/new_player/player in players) - if(player.client && player.ready == PLAYER_READY_TO_PLAY) - if(role in player.client.prefs.be_special) - if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans - if(age_check(player.client)) //Must be older than the minimum age - candidates += player.mind // Get a list of all the people who want to be the antagonist for this round - - if(restricted_jobs) - for(var/datum/mind/player in candidates) - for(var/job in restricted_jobs) // Remove people who want to be antagonist but have a job already that precludes it - if(player.assigned_role == job) - candidates -= player - - if(candidates.len < recommended_enemies) - for(var/mob/dead/new_player/player in players) - if(player.client && player.ready == PLAYER_READY_TO_PLAY) - if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one - if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans - drafted += player.mind - - if(restricted_jobs) - for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist - for(var/job in restricted_jobs) - if(player.assigned_role == job) - drafted -= player - - drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie - - while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates - if(drafted.len > 0) - applicant = pick(drafted) - if(applicant) - candidates += applicant - drafted.Remove(applicant) - - else // Not enough scrubs, ABORT ABORT ABORT - break - - if(restricted_jobs) - for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist - for(var/job in restricted_jobs) - if(player.assigned_role == job) - drafted -= player - - drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie - - while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates - if(drafted.len > 0) - applicant = pick(drafted) - if(applicant) - candidates += applicant - drafted.Remove(applicant) - - else // Not enough scrubs, ABORT ABORT ABORT - break - - return candidates // Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies - // recommended_enemies if the number of people with that role set to yes is less than recomended_enemies, - // Less if there are not enough valid players in the game entirely to make recommended_enemies. - - - -/datum/game_mode/proc/num_players() - . = 0 - for(var/mob/dead/new_player/P in GLOB.player_list) - if(P.client && P.ready == PLAYER_READY_TO_PLAY) - . ++ - -/////////////////////////////////// -//Keeps track of all living heads// -/////////////////////////////////// -/datum/game_mode/proc/get_living_heads() - . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) - if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions)) - . |= player.mind - - -//////////////////////////// -//Keeps track of all heads// -//////////////////////////// -/datum/game_mode/proc/get_all_heads() - . = list() - for(var/mob/player in GLOB.mob_list) - if(player.mind && (player.mind.assigned_role in GLOB.command_positions)) - . |= player.mind - -////////////////////////////////////////////// -//Keeps track of all living security members// -////////////////////////////////////////////// -/datum/game_mode/proc/get_living_sec() - . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) - if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions)) - . |= player.mind - -//////////////////////////////////////// -//Keeps track of all security members// -//////////////////////////////////////// -/datum/game_mode/proc/get_all_sec() - . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) - if(player.mind && (player.mind.assigned_role in GLOB.security_positions)) - . |= player.mind - -////////////////////////// -//Reports player logouts// -////////////////////////// -/proc/display_roundstart_logout_report() - var/msg = "Roundstart logout report\n\n" - for(var/mob/living/L in GLOB.mob_list) - - if(L.ckey) - var/found = 0 - for(var/client/C in GLOB.clients) - if(C.ckey == L.ckey) - found = 1 - break - if(!found) - msg += "[L.name] ([L.ckey]), the [L.job] (Disconnected)\n" - - - if(L.ckey && L.client) - if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something) - msg += "[L.name] ([L.ckey]), the [L.job] (Connected, Inactive)\n" - continue //AFK client - if(L.stat) - if(L.suiciding) //Suicider - msg += "[L.name] ([L.ckey]), the [L.job] (Suicide)\n" - continue //Disconnected client - if(L.stat == UNCONSCIOUS) - msg += "[L.name] ([L.ckey]), the [L.job] (Dying)\n" - continue //Unconscious - if(L.stat == DEAD) - msg += "[L.name] ([L.ckey]), the [L.job] (Dead)\n" - continue //Dead - - continue //Happy connected client - for(var/mob/dead/observer/D in GLOB.mob_list) - if(D.mind && D.mind.current == L) - if(L.stat == DEAD) - if(L.suiciding) //Suicider - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n" - continue //Disconnected client - else - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n" - continue //Dead mob, ghost abandoned - else - if(D.can_reenter_corpse) - continue //Adminghost, or cult/wizard ghost - else - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n" - continue //Ghosted while alive - - - - for(var/mob/M in GLOB.mob_list) - if(M.client && M.client.holder) - to_chat(M, msg) - -/datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck) - var/text = "
[ply.key] was [ply.name] the [ply.assigned_role] and" - if(ply.current) - if(ply.current.stat == DEAD) - text += " died" - else - text += " survived" - if(fleecheck && ply.current.z > ZLEVEL_STATION) - text += " while fleeing the station" - if(ply.current.real_name != ply.name) - text += " as [ply.current.real_name]" - else - text += " had their body destroyed" - return text - -/datum/game_mode/proc/printobjectives(datum/mind/ply) - var/text = "" - var/count = 1 - for(var/datum/objective/objective in ply.objectives) - if(objective.check_completion()) - text += "
Objective #[count]: [objective.explanation_text] Success!" - else - text += "
Objective #[count]: [objective.explanation_text] Fail." - count++ - return text - -//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 -/datum/game_mode/proc/age_check(client/C) - if(get_remaining_days(C) == 0) - return 1 //Available in 0 days = available right now = player is old enough to play. - return 0 - - -/datum/game_mode/proc/get_remaining_days(client/C) - if(!C) - return 0 - if(!config.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 - if(!isnum(enemy_minimum_age)) - return 0 - - return max(0, enemy_minimum_age - C.player_age) - -/datum/game_mode/proc/replace_jobbaned_player(mob/living/M, role_type, pref) - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [role_type]?", "[role_type]", null, pref, 50, M) - var/mob/dead/observer/theghost = null - if(candidates.len) - theghost = pick(candidates) - to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") - message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbaned player.") - M.ghostize(0) - M.key = theghost.key - -/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie) - SSticker.mode.remove_cultist(newborgie, 0, 0) - SSticker.mode.remove_revolutionary(newborgie, 0) - SSticker.mode.remove_gangster(newborgie, 0, remove_bosses=1) - -/datum/game_mode/proc/generate_station_goals() - var/list/possible = list() - for(var/T in subtypesof(/datum/station_goal)) - var/datum/station_goal/G = T - if(config_tag in initial(G.gamemode_blacklist)) - continue - possible += T - var/goal_weights = 0 - while(possible.len && goal_weights < STATION_GOAL_BUDGET) - var/datum/station_goal/picked = pick_n_take(possible) - goal_weights += initial(picked.weight) - station_goals += new picked - - -/datum/game_mode/proc/declare_station_goal_completion() - for(var/V in station_goals) - var/datum/station_goal/G = V - G.print_result() + + +/* + * GAMEMODES (by Rastaf0) + * + * In the new mode system all special roles are fully supported. + * You can have proper wizards/traitors/changelings/cultists during any mode. + * Only two things really depends on gamemode: + * 1. Starting roles, equipment and preparations + * 2. Conditions of finishing the round. + * + */ + + +/datum/game_mode + var/name = "invalid" + var/config_tag = null + var/votable = 1 + 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/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 + var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist + var/list/protected_jobs = list() // Jobs that can't be traitors because + var/required_players = 0 + var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations + var/required_enemies = 0 + var/recommended_enemies = 0 + var/antag_flag = null //preferences flag such as BE_WIZARD that need to be turned on for players to be antag + var/mob/living/living_antag_player = null + var/list/datum/game_mode/replacementmode = null + var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted + var/reroll_friendly //During mode conversion only these are in the running + var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die + var/enemy_minimum_age = 7 //How many days must players have been playing before they can play this antagonist + + var/announce_span = "warning" //The gamemode's name will be in this span during announcement. + var/announce_text = "This gamemode forgot to set a descriptive text! Uh oh!" //Used to describe a gamemode when it's announced. + + var/const/waittime_l = 600 + var/const/waittime_h = 1800 // started at 1800 + + var/list/datum/station_goal/station_goals = list() + + var/allow_persistence_save = TRUE + +/datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description. + to_chat(world, "The gamemode is: [name]!") + to_chat(world, "[announce_text]") + + +///Checks to see if the game can be setup and ran with the current number of players or whatnot. +/datum/game_mode/proc/can_start() + var/playerC = 0 + for(var/mob/dead/new_player/player in GLOB.player_list) + if((player.client)&&(player.ready == PLAYER_READY_TO_PLAY)) + playerC++ + if(!GLOB.Debug2) + if(playerC < required_players || (maximum_players >= 0 && playerC > maximum_players)) + return 0 + antag_candidates = get_players_for_role(antag_flag) + if(!GLOB.Debug2) + if(antag_candidates.len < required_enemies) + return 0 + return 1 + else + message_admins("DEBUG: GAME STARTING WITHOUT PLAYER NUMBER CHECKS, THIS WILL PROBABLY BREAK SHIT.") + return 1 + + +///Attempts to select players for special roles the mode might have. +/datum/game_mode/proc/pre_setup() + return 1 + + +///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_GET(flag/no_intercept_report) + addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) + + if(SSdbcore.Connect()) + var/sql + if(SSticker.mode) + sql += "game_mode = '[SSticker.mode]'" + if(GLOB.revdata.originmastercommit) + if(sql) + sql += ", " + sql += "commit_hash = '[GLOB.revdata.originmastercommit]'" + if(sql) + var/datum/DBQuery/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET [sql] WHERE id = [GLOB.round_id]") + query_round_game_mode.Execute() + if(report) + addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h)) + generate_station_goals() + return 1 + + +///Handles late-join antag assignments +/datum/game_mode/proc/make_antag_chance(mob/living/carbon/human/character) + if(replacementmode && round_converted == 2) + replacementmode.make_antag_chance(character) + return + + +///Allows rounds to basically be "rerolled" should the initial premise fall through. Also known as mulligan antags. +/datum/game_mode/proc/convert_roundtype() + set waitfor = FALSE + var/list/living_crew = list() + + for(var/mob/Player in GLOB.mob_list) + if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client) + living_crew += Player + 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.len >= G.required_players) + usable_modes += G + else + qdel(G) + + if(!usable_modes) + message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.") + return null + + replacementmode = pickweight(usable_modes) + + switch(SSshuttle.emergency.mode) //Rounds on the verge of ending don't get new antags, they just run out + if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE) + return 1 + if(SHUTTLE_CALL) + if(SSshuttle.emergency.timeLeft(1) < initial(SSshuttle.emergencyCallTime)*0.5) + return 1 + + 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() + + for(var/mob/living/carbon/human/H in living_crew) + if(H.client && H.client.prefs.allow_midround_antag) + antag_candidates += H + + if(!antag_candidates) + message_admins("Convert_roundtype failed due to no antag candidates.") + return null + + antag_candidates = shuffle(antag_candidates) + + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + replacementmode.restricted_jobs += replacementmode.protected_jobs + 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.") + + . = 1 + sleep(rand(600,1800)) + if(!SSticker.IsRoundInProgress()) + message_admins("Roundtype conversion cancelled, the game appears to have finished!") + round_converted = 0 + return + //somewhere between 1 and 3 minutes from now + 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) + replacementmode.make_antag_chance(H) + round_converted = 2 + message_admins("-- IMPORTANT: The roundtype has been converted to [replacementmode.name], antagonists may have been created! --") + + +///Called by the gameSSticker +/datum/game_mode/process() + return 0 + + +/datum/game_mode/proc/check_finished(force_ending) //to be called by SSticker + if(replacementmode && round_converted == 2) + return replacementmode.check_finished() + if(SSshuttle.emergency && (SSshuttle.emergency.mode == SHUTTLE_ENDGAME)) + return TRUE + if(station_was_nuked) + return TRUE + 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) + if(Player.mind.special_role) + continuous_sanity_checked = 1 + 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.") + continuous[config_tag] = TRUE + midround_antag[config_tag] = FALSE + SSshuttle.clearHostileEnvironment(src) + return 0 + + + if(living_antag_player && living_antag_player.mind && isliving(living_antag_player) && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player)) + return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark. + + for(var/mob/Player in GLOB.living_mob_list) + if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client) + if(Player.mind.special_role) //Someone's still antaging! + living_antag_player = Player + return 0 + + if(!continuous[config_tag] || force_ending) + return 1 + + else + round_converted = convert_roundtype() + if(!round_converted) + if(round_ends_with_antag_death) + return 1 + else + midround_antag[config_tag] = 0 + return 0 + + return 0 + + +/datum/game_mode/proc/declare_completion() + var/clients = 0 + var/surviving_humans = 0 + var/surviving_total = 0 + var/ghosts = 0 + var/escaped_humans = 0 + var/escaped_total = 0 + + for(var/mob/M in GLOB.player_list) + if(M.client) + clients++ + if(ishuman(M)) + if(!M.stat) + surviving_humans++ + if(M.z == ZLEVEL_CENTCOM) + escaped_humans++ + if(!M.stat) + surviving_total++ + if(M.z == ZLEVEL_CENTCOM) + escaped_total++ + + + if(isobserver(M)) + ghosts++ + + if(clients > 0) + SSblackbox.set_val("round_end_clients",clients) + if(ghosts > 0) + SSblackbox.set_val("round_end_ghosts",ghosts) + if(surviving_humans > 0) + SSblackbox.set_val("survived_human",surviving_humans) + if(surviving_total > 0) + SSblackbox.set_val("survived_total",surviving_total) + if(escaped_humans > 0) + SSblackbox.set_val("escaped_human",escaped_humans) + if(escaped_total > 0) + SSblackbox.set_val("escaped_total",escaped_total) + send2irc("Server", "Round just ended.") + if(cult.len && !istype(SSticker.mode, /datum/game_mode/cult)) + datum_cult_completion() + + return 0 + + +/datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere. + return 0 + + +/datum/game_mode/proc/send_intercept() + var/intercepttext = "Central Command Status Summary
" + intercepttext += "Central Command has intercepted and partially decoded a Syndicate transmission with vital information regarding their movements. The following report outlines the most \ + likely threats to appear in your sector." + var/list/report_weights = config.mode_false_report_weight.Copy() + report_weights[config_tag] = 0 //Prevent the current mode from being falsely selected. + var/list/reports = list() + for(var/i in 1 to rand(3,5)) //Between three and five wrong entries on the list. + var/false_report_type = pickweightAllowZero(report_weights) + report_weights[false_report_type] = 0 //Make it so the same false report won't be selected twice + reports += config.mode_reports[false_report_type] + reports += config.mode_reports[config_tag] + reports = shuffle(reports) //Randomize the order, so the real one is at a random position. + + for(var/report in reports) + intercepttext += "
" + intercepttext += report + + if(station_goals.len) + intercepttext += "
Special Orders for [station_name()]:" + for(var/datum/station_goal/G in station_goals) + G.on_report() + intercepttext += G.get_report() + + print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE) + priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/ai/intercept.ogg') + if(GLOB.security_level < SEC_LEVEL_BLUE) + set_security_level(SEC_LEVEL_BLUE) + + +/datum/game_mode/proc/get_players_for_role(role) + var/list/players = list() + var/list/candidates = list() + var/list/drafted = list() + var/datum/mind/applicant = null + + // Ultimate randomizing code right here + for(var/mob/dead/new_player/player in GLOB.player_list) + if(player.client && player.ready == PLAYER_READY_TO_PLAY) + players += player + + // Shuffling, the players list is now ping-independent!!! + // Goodbye antag dante + players = shuffle(players) + + for(var/mob/dead/new_player/player in players) + if(player.client && player.ready == PLAYER_READY_TO_PLAY) + if(role in player.client.prefs.be_special) + if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans + if(age_check(player.client)) //Must be older than the minimum age + candidates += player.mind // Get a list of all the people who want to be the antagonist for this round + + if(restricted_jobs) + for(var/datum/mind/player in candidates) + for(var/job in restricted_jobs) // Remove people who want to be antagonist but have a job already that precludes it + if(player.assigned_role == job) + candidates -= player + + if(candidates.len < recommended_enemies) + for(var/mob/dead/new_player/player in players) + if(player.client && player.ready == PLAYER_READY_TO_PLAY) + if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one + if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans + drafted += player.mind + + if(restricted_jobs) + for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist + for(var/job in restricted_jobs) + if(player.assigned_role == job) + drafted -= player + + drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie + + while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates + if(drafted.len > 0) + applicant = pick(drafted) + if(applicant) + candidates += applicant + drafted.Remove(applicant) + + else // Not enough scrubs, ABORT ABORT ABORT + break + + if(restricted_jobs) + for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist + for(var/job in restricted_jobs) + if(player.assigned_role == job) + drafted -= player + + drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie + + while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates + if(drafted.len > 0) + applicant = pick(drafted) + if(applicant) + candidates += applicant + drafted.Remove(applicant) + + else // Not enough scrubs, ABORT ABORT ABORT + break + + return candidates // Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies + // recommended_enemies if the number of people with that role set to yes is less than recomended_enemies, + // Less if there are not enough valid players in the game entirely to make recommended_enemies. + + + +/datum/game_mode/proc/num_players() + . = 0 + for(var/mob/dead/new_player/P in GLOB.player_list) + if(P.client && P.ready == PLAYER_READY_TO_PLAY) + . ++ + +/////////////////////////////////// +//Keeps track of all living heads// +/////////////////////////////////// +/datum/game_mode/proc/get_living_heads() + . = list() + for(var/mob/living/carbon/human/player in GLOB.mob_list) + if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions)) + . |= player.mind + + +//////////////////////////// +//Keeps track of all heads// +//////////////////////////// +/datum/game_mode/proc/get_all_heads() + . = list() + for(var/mob/player in GLOB.mob_list) + if(player.mind && (player.mind.assigned_role in GLOB.command_positions)) + . |= player.mind + +////////////////////////////////////////////// +//Keeps track of all living security members// +////////////////////////////////////////////// +/datum/game_mode/proc/get_living_sec() + . = list() + for(var/mob/living/carbon/human/player in GLOB.mob_list) + if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions)) + . |= player.mind + +//////////////////////////////////////// +//Keeps track of all security members// +//////////////////////////////////////// +/datum/game_mode/proc/get_all_sec() + . = list() + for(var/mob/living/carbon/human/player in GLOB.mob_list) + if(player.mind && (player.mind.assigned_role in GLOB.security_positions)) + . |= player.mind + +////////////////////////// +//Reports player logouts// +////////////////////////// +/proc/display_roundstart_logout_report() + var/msg = "Roundstart logout report\n\n" + for(var/mob/living/L in GLOB.mob_list) + + if(L.ckey) + var/found = 0 + for(var/client/C in GLOB.clients) + if(C.ckey == L.ckey) + found = 1 + break + if(!found) + msg += "[L.name] ([L.ckey]), the [L.job] (Disconnected)\n" + + + if(L.ckey && L.client) + if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something) + msg += "[L.name] ([L.ckey]), the [L.job] (Connected, Inactive)\n" + continue //AFK client + if(L.stat) + if(L.suiciding) //Suicider + msg += "[L.name] ([L.ckey]), the [L.job] (Suicide)\n" + continue //Disconnected client + if(L.stat == UNCONSCIOUS) + msg += "[L.name] ([L.ckey]), the [L.job] (Dying)\n" + continue //Unconscious + if(L.stat == DEAD) + msg += "[L.name] ([L.ckey]), the [L.job] (Dead)\n" + continue //Dead + + continue //Happy connected client + for(var/mob/dead/observer/D in GLOB.mob_list) + if(D.mind && D.mind.current == L) + if(L.stat == DEAD) + if(L.suiciding) //Suicider + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n" + continue //Disconnected client + else + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n" + continue //Dead mob, ghost abandoned + else + if(D.can_reenter_corpse) + continue //Adminghost, or cult/wizard ghost + else + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n" + continue //Ghosted while alive + + + + for(var/mob/M in GLOB.mob_list) + if(M.client && M.client.holder) + to_chat(M, msg) + +/datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck) + var/text = "
[ply.key] was [ply.name] the [ply.assigned_role] and" + if(ply.current) + if(ply.current.stat == DEAD) + text += " died" + else + text += " survived" + if(fleecheck && (!(ply.current.z in GLOB.station_z_levels))) + text += " while fleeing the station" + if(ply.current.real_name != ply.name) + text += " as [ply.current.real_name]" + else + text += " had their body destroyed" + return text + +/datum/game_mode/proc/printobjectives(datum/mind/ply) + var/text = "" + var/count = 1 + for(var/datum/objective/objective in ply.objectives) + if(objective.check_completion()) + text += "
Objective #[count]: [objective.explanation_text] Success!" + else + text += "
Objective #[count]: [objective.explanation_text] Fail." + count++ + return text + +//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 +/datum/game_mode/proc/age_check(client/C) + if(get_remaining_days(C) == 0) + return 1 //Available in 0 days = available right now = player is old enough to play. + return 0 + + +/datum/game_mode/proc/get_remaining_days(client/C) + if(!C) + return 0 + 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 + if(!isnum(enemy_minimum_age)) + return 0 + + return max(0, enemy_minimum_age - C.player_age) + +/datum/game_mode/proc/replace_jobbaned_player(mob/living/M, role_type, pref) + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [role_type]?", "[role_type]", null, pref, 50, M) + var/mob/dead/observer/theghost = null + if(candidates.len) + theghost = pick(candidates) + to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") + message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbaned player.") + M.ghostize(0) + M.key = theghost.key + +/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie) + SSticker.mode.remove_cultist(newborgie, 0, 0) + SSticker.mode.remove_revolutionary(newborgie, 0) + +/datum/game_mode/proc/generate_station_goals() + var/list/possible = list() + for(var/T in subtypesof(/datum/station_goal)) + var/datum/station_goal/G = T + if(config_tag in initial(G.gamemode_blacklist)) + continue + possible += T + var/goal_weights = 0 + while(possible.len && goal_weights < STATION_GOAL_BUDGET) + var/datum/station_goal/picked = pick_n_take(possible) + goal_weights += initial(picked.weight) + station_goals += new picked + + +/datum/game_mode/proc/declare_station_goal_completion() + for(var/V in station_goals) + var/datum/station_goal/G = V + G.print_result() + +/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/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index b7b20a7311..510883ada5 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -331,16 +331,3 @@ adjust_influence(bawss, amount/bosses.len) announce_to_mind(bawss, "[name] Gang: [amount/bosses.len] influence given from internal automatic restructuring.") -//Multiverse - -/datum/gang/multiverse - dom_attempts = 0 - fighting_style = "multiverse" - is_deconvertible = FALSE - -/datum/gang/multiverse/New(loc, multiverse_override) - name = multiverse_override - ganghud = new() - -/datum/gang/multiverse/income() - return diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm index 86f68029d0..120e3a6345 100644 --- a/code/game/gamemodes/gang/recaller.dm +++ b/code/game/gamemodes/gang/recaller.dm @@ -3,7 +3,9 @@ name = "suspicious device" desc = "A strange device of sorts. Hard to really make out what it actually does if you don't know how to operate it." icon_state = "gangtool-white" - item_state = "walkietalkie" + item_state = "radio" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 3 diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index febef46e74..af138c689e 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -30,11 +30,6 @@ altogether." if("extended") text += "The transmission mostly failed to mention your sector. It is possible that there is nothing in the Syndicate that could threaten your station during this shift." - if("gang") - text += "Cybersun Industries representatives claimed that they, in joint research with the Tiger Cooperative, have made a major breakthrough in brainwashing technology, and have \ - made the nanobots that apply the \"conversion\" very small and capable of fitting into usually innocent objects - namely, pens. While they refused to outsource this technology for \ - months to come due to its flaws, they reported some as missing but passed it off to carelessness. At Central Command, we don't like mysteries, and we have reason to believe that this \ - technology was stolen for anti-Nanotrasen use. Be on the lookout for territory claims and unusually violent crew behavior, applying mindshield implants as necessary." if("malf") text += "A large ionospheric anomaly recently passed through your sector. Although physically undetectable, ionospherics tend to have an extreme effect on telecommunications equipment \ as well as artificial intelligence units. Closely observe the behavior of artificial intelligence, and treat any machine malfunctions as purposeful. If necessary, termination of the \ diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5dfd8f7396..e087b23392 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -1,4 +1,5 @@ #define DEFAULT_DOOMSDAY_TIMER 4500 +#define DOOMSDAY_ANNOUNCE_INTERVAL 600 GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/field/containment, @@ -232,7 +233,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/nuke_station/Activate() var/turf/T = get_turf(owner) - if(!istype(T) || T.z != ZLEVEL_STATION) + if(!istype(T) || !(T.z in GLOB.station_z_levels)) to_chat(owner, "You cannot activate the doomsday device while off-station!") return if(alert(owner, "Send arming signal? (true = arm, false = cancel)", "purge_all_life()", "confirm = TRUE;", "confirm = FALSE;") != "confirm = TRUE;") @@ -309,8 +310,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( owner_AI.nuking = TRUE owner_AI.doomsday_device = DOOM owner_AI.doomsday_device.start() - for(var/pinpointer in GLOB.pinpointer_list) - var/obj/item/pinpointer/P = pinpointer + for(var/obj/item/pinpointer/nuke/P in GLOB.pinpointer_list) P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes qdel(src) @@ -325,12 +325,11 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/timing = FALSE var/obj/effect/countdown/doomsday/countdown var/detonation_timer - var/list/milestones + var/next_announce /obj/machinery/doomsday_device/Initialize() . = ..() countdown = new(src) - milestones = list() /obj/machinery/doomsday_device/Destroy() QDEL_NULL(countdown) @@ -345,6 +344,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/doomsday_device/proc/start() detonation_timer = world.time + DEFAULT_DOOMSDAY_TIMER + next_announce = world.time + DOOMSDAY_ANNOUNCE_INTERVAL timing = TRUE countdown.start() START_PROCESSING(SSfastprocess, src) @@ -356,7 +356,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/doomsday_device/process() var/turf/T = get_turf(src) - if(!T || T.z != ZLEVEL_STATION) + if(!T || !(T.z in GLOB.station_z_levels)) minor_announce("DOOMSDAY DEVICE OUT OF STATION RANGE, ABORTING", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE) SSshuttle.clearHostileEnvironment(src) qdel(src) @@ -368,18 +368,16 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!sec_left) timing = FALSE detonate(T.z) - else - var/key = num2text(sec_left) - if(!(sec_left % 60) && !(key in milestones)) - milestones[key] = TRUE - minor_announce("[key] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE) + 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) +/obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION_PRIMARY) 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 @@ -426,7 +424,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/lockdown/Activate() for(var/obj/machinery/door/D in GLOB.airlocks) - if(D.z != ZLEVEL_STATION) + if(!(D.z in GLOB.station_z_levels)) continue INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, src) addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900) @@ -504,7 +502,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/break_fire_alarms/Activate() for(var/obj/machinery/firealarm/F in GLOB.machines) - if(F.z != ZLEVEL_STATION) + if(!(F.z in GLOB.station_z_levels)) continue F.emagged = TRUE to_chat(owner, "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.") @@ -531,10 +529,10 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/break_air_alarms/Activate() for(var/obj/machinery/airalarm/AA in GLOB.machines) - if(AA.z != ZLEVEL_STATION) + if(!(AA.z in GLOB.station_z_levels)) continue AA.emagged = TRUE - to_chat(owner, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.") + to_chat(owner, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.") owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) @@ -672,7 +670,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/obj/machinery/transformer/conveyor = new(T) conveyor.masterAI = owner playsound(T, 'sound/effects/phasein.ogg', 100, 1) - owner_AI.can_shunt = TRUE + owner_AI.can_shunt = FALSE to_chat(owner, "You are no longer able to shunt your core to APCs.") adjust_uses(-1) @@ -829,3 +827,4 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( AI.eyeobj.relay_speech = TRUE #undef DEFAULT_DOOMSDAY_TIMER +#undef DOOMSDAY_ANNOUNCE_INTERVAL diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index d652d38d11..b7a6580570 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -1,6 +1,7 @@ /datum/game_mode/meteor name = "meteor" config_tag = "meteor" + false_report_weight = 1 var/meteordelay = 2000 var/nometeors = 0 var/rampupdelta = 5 @@ -53,3 +54,7 @@ SSticker.mode_result = "end - evacuation" ..() return 1 + +/datum/game_mode/meteor/generate_report() + return "[pick("Asteroids have", "Meteors have", "Large rocks have", "Stellar minerals have", "Space hail has", "Debris has")] been detected near your station, and a collision is possible, \ + though unlikely. Be prepared for largescale impacts and destruction. Please note that the debris will prevent the escape shuttle from arriving quickly." diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 0265b37194..60bbefb7fc 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) - pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION) + 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 + M.z_original = M.z spawn(0) walk_towards(M, M.dest, 1) @@ -96,7 +97,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event pass_flags = PASSTABLE var/heavy = 0 var/meteorsound = 'sound/effects/meteorimpact.ogg' - var/z_original = ZLEVEL_STATION + var/z_original = ZLEVEL_STATION_PRIMARY var/threat = 0 // used for determining which meteors are most interesting var/lifetime = DEFAULT_METEOR_LIFETIME @@ -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 . = ..() @@ -309,6 +311,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event /obj/effect/meteor/meaty/xeno/New() meteordrop += subtypesof(/obj/item/organ/alien) + meteordrop -= /obj/item/organ/alien/eggsac ..() /obj/effect/meteor/meaty/xeno/ram_turf(turf/T) diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index ce0ab22373..d6f1b775e9 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() @@ -7,16 +19,13 @@ name = "abduction" config_tag = "abduction" antag_flag = ROLE_ABDUCTOR + false_report_weight = 1 recommended_enemies = 2 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!") @@ -25,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 = 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 = "" @@ -199,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 /datum/objective/experiment/New() explanation_text = "Experiment on [target_amount] humans." /datum/objective/experiment/check_completion() - var/ab_team = team - 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] @@ -243,3 +155,7 @@ var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_ABDUCTOR] hud.leave_hud(alien_mind.current) set_antag_hud(alien_mind.current, null) + +/datum/game_mode/abduction/generate_report() + return "Nearby spaceships report crewmembers having been [pick("kidnapped", "abducted", "captured")] and [pick("tortured", "experimented on", "probed", "implanted")] by mysterious \ + grey humanoids, before being sent back. Be advised that the kidnapped crewmembers behave strangely upon return to duties." diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index c55b4db407..36168a58d2 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 aa97d1e2d8..b24bef0433 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 8c408c007e..0458690a40 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 ffd1b88d25..fd9ca0a658 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 + 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 f3deebc6b7..d44ff57c96 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 88bb84fc4a..2b012e5f81 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 58ca8bbea9..99059e7a25 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -12,6 +12,8 @@ var/list/abductee_minds var/flash = " - || - " var/obj/machinery/abductor/console/console + var/message_cooldown = 0 + 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)) @@ -40,29 +42,27 @@ /obj/machinery/abductor/experiment/relaymove(mob/user) if(user.stat != CONSCIOUS) return - container_resist(user) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") /obj/machinery/abductor/experiment/container_resist(mob/living/user) - var/breakout_time = 600 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)") - user.visible_message("You hear a metallic creaking from [src]!") - + 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 [DisplayTimeText(breakout_time)].)", \ + "You hear a metallic creaking from [src].") if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return - - visible_message("[user] successfully broke out of [src]!") - to_chat(user, "You successfully break out of [src]!") - + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") open_machine() - /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/borer/borer_event.dm b/code/game/gamemodes/miniantags/borer/borer_event.dm index 7d74a065aa..6875a97db5 100644 --- a/code/game/gamemodes/miniantags/borer/borer_event.dm +++ b/code/game/gamemodes/miniantags/borer/borer_event.dm @@ -26,7 +26,7 @@ for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines) if(QDELETED(temp_vent)) continue - if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded) + if(temp_vent.loc.z == ZLEVEL_STATION_PRIMARY && !temp_vent.welded) var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1 if(temp_vent_parent.other_atmosmch.len > 20) vents += temp_vent diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index bbd78ff76a..c125f7648d 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -257,10 +257,15 @@ /obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(get_area(src), /area/shuttle) for(var/turf/T in range(1, src)) - if(isspaceturf(T) || (!isonshuttle && (istype(T.loc, /area/shuttle) || istype(T.loc, /area/space))) || (isonshuttle && !istype(T.loc, /area/shuttle))) + var/area/A = get_area(T) + if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") S.target = null return FALSE + else if(istype(A, /area/engine/supermatter)) + to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") + S.target = null + return FALSE S.DisIntegrate(src) return TRUE @@ -301,10 +306,6 @@ to_chat(S, "This device is attempting to corrupt our entire network; attempting to interact with it is too risky. Aborting.") return FALSE -/obj/effect/decal/cleanable/crayon/gang/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.") - return FALSE - /obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.") return FALSE @@ -344,19 +345,29 @@ /turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(loc, /area/shuttle) for(var/turf/T in range(1, src)) - if(isspaceturf(T) || (!isonshuttle && (istype(T.loc, /area/shuttle) || istype(T.loc, /area/space))) || (isonshuttle && !istype(T.loc, /area/shuttle))) + var/area/A = get_area(T) + if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") S.target = null return TRUE + else if(istype(A, /area/engine/supermatter)) + to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") + S.target = null + return TRUE return ..() /obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(get_area(src), /area/shuttle) for(var/turf/T in range(1, src)) - if(isspaceturf(T) || (!isonshuttle && (istype(T.loc, /area/shuttle) || istype(T.loc, /area/space))) || (isonshuttle && !istype(T.loc, /area/shuttle))) + var/area/A = get_area(T) + if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") S.target = null return TRUE + else if(istype(A, /area/engine/supermatter)) + to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") + S.target = null + return TRUE return ..() /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource @@ -447,7 +458,7 @@ if(target == src) return - if(z != ZLEVEL_STATION && z != ZLEVEL_LAVALAND) + if(!(z in GLOB.station_z_levels) && z != ZLEVEL_LAVALAND) to_chat(src, "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area.") return @@ -457,11 +468,8 @@ return var/turf/open/floor/F - switch(z) //Only the station/lavaland - if(ZLEVEL_STATION) - F =find_safe_turf(zlevels = ZLEVEL_STATION, 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 @@ -491,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 @@ -500,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/monkey/monkey.dm b/code/game/gamemodes/miniantags/monkey/monkey.dm index f84e4e72b6..b0d78f57a4 100644 --- a/code/game/gamemodes/miniantags/monkey/monkey.dm +++ b/code/game/gamemodes/miniantags/monkey/monkey.dm @@ -5,6 +5,7 @@ name = "monkey" config_tag = "monkey" antag_flag = ROLE_MONKEY + false_report_weight = 1 required_players = 20 required_enemies = 1 @@ -46,7 +47,7 @@ /datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier) - to_chat(carrier.current, "You are the Jungle Fever patient zero!!") + to_chat(carrier.current, "You are the Jungle Fever patient zero!!") to_chat(carrier.current, "You have been planted onto this station by the Animal Rights Consortium.") to_chat(carrier.current, "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.") to_chat(carrier.current, "While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.") @@ -111,3 +112,7 @@ else SSticker.mode_result = "loss - staff stopped the monkeys" to_chat(world, "The staff managed to contain the monkey infestation!") + +/datum/game_mode/monkey/generate_report() + return "Reports of an ancient [pick("retrovirus", "flesh eating bacteria", "disease", "magical curse blamed on viruses", "bananna blight")] outbreak that turn humans into monkies has been \ + reported in your quadrant. Any such infections may be treated with bananna juice. If an outbreak occurs, ensure the station is quarantined to prevent a largescale outbreak at Centcom." diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index f763f742f7..5e1a97675b 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 783cfdd930..fb0bdfb6f9 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 bcb2218fe6..4d85744738 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 59650561a6..2179177fc1 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -5,6 +5,7 @@ /datum/game_mode/nuclear name = "nuclear emergency" config_tag = "nuclear" + false_report_weight = 10 required_players = 30 // 30 players - 3 players to be the nuke ops = 27 players remaining required_enemies = 2 recommended_enemies = 5 @@ -21,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 //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -59,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) @@ -131,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 @@ -160,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) @@ -273,6 +258,10 @@ ..() return +/datum/game_mode/nuclear/generate_report() + return "One of Central Command's trading routes was recently disrupted by a raid carried out by the Gorlex Marauders. They seemed to only be after one ship - a highly-sensitive \ + transport containing a nuclear fission explosive, although it is useless without the proper code and authorization disk. While the code was likely found in minutes, the only disk that \ + can activate this explosive is on your station. Ensure that it is protected at all times, and remain alert for possible intruders." /datum/game_mode/proc/auto_declare_completion_nuclear() if( syndicates.len || (SSticker && istype(SSticker.mode, /datum/game_mode/nuclear)) ) @@ -325,7 +314,7 @@ gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack ears = /obj/item/device/radio/headset/syndicate/alt - l_pocket = /obj/item/pinpointer/syndicate + l_pocket = /obj/item/pinpointer/nuke/syndicate id = /obj/item/card/id/syndicate belt = /obj/item/gun/ballistic/automatic/pistol backpack_contents = list(/obj/item/storage/box/syndie=1) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index f671d38395..6e7a567324 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -6,7 +6,9 @@ /obj/item/device/nuclear_challenge name = "Declaration of War (Challenge Mode)" icon_state = "gangtool-red" - item_state = "walkietalkie" + item_state = "radio" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' desc = "Use to send a declaration of hostilities to the target, delaying your shuttle departure for 20 minutes while they prepare for your assault. \ Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. \ Must be used within five minutes, or your benefactors will lose interest." @@ -17,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)) @@ -56,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 ee611349f8..8870399f24 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 @@ -362,9 +376,9 @@ if(safety) if(timing) set_security_level(previous_level) - for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list) + for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(initial(S.mode)) - S.nuke_warning = FALSE + S.alert = FALSE timing = FALSE bomb_set = TRUE detonation_timer = null @@ -381,16 +395,16 @@ bomb_set = TRUE set_security_level("delta") detonation_timer = world.time + (timer_set * 10) - for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list) + for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(TRACK_INFILTRATOR) countdown.start() else bomb_set = FALSE detonation_timer = null set_security_level(previous_level) - for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list) + for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(initial(S.mode)) - S.nuke_warning = FALSE + S.alert = FALSE countdown.stop() update_icon() @@ -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 @@ -435,30 +449,39 @@ var/off_station = 0 var/turf/bomb_location = get_turf(src) var/area/A = get_area(bomb_location) - if(bomb_location && (bomb_location.z == ZLEVEL_STATION)) + 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 - else if(istype(A, /area/syndicate_mothership) || (istype(A, /area/shuttle/syndicate) && bomb_location.z == ZLEVEL_CENTCOM)) + 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/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 9f63309643..461ef78ef3 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -1,56 +1,7 @@ -//Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk. -/obj/item/pinpointer - name = "pinpointer" - desc = "A handheld tracking device that locks onto certain signals." - icon = 'icons/obj/device.dmi' - icon_state = "pinoff" - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - w_class = WEIGHT_CLASS_SMALL - item_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - throw_speed = 3 - throw_range = 7 - materials = list(MAT_METAL = 500, MAT_GLASS = 250) - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - var/active = FALSE - var/atom/movable/target = null //The thing we're searching for - var/atom/movable/constant_target = null //The thing we're always focused on, if we're in the right mode - var/target_x = 0 //The target coordinates if we're tracking those - var/target_y = 0 - var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination - var/nuke_warning = FALSE // If we've set off a miniature alarm about an armed nuke - var/mode = TRACK_NUKE_DISK //What are we looking for? +/obj/item/pinpointer/nuke + var/mode = TRACK_NUKE_DISK -/obj/item/pinpointer/New() - ..() - GLOB.pinpointer_list += src - -/obj/item/pinpointer/Destroy() - STOP_PROCESSING(SSfastprocess, src) - GLOB.pinpointer_list -= src - return ..() - -/obj/item/pinpointer/attack_self(mob/living/user) - active = !active - user.visible_message("[user] [active ? "" : "de"]activates their pinpointer.", "You [active ? "" : "de"]activate your pinpointer.") - playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) - icon_state = "pin[active ? "onnull" : "off"]" - if(active) - START_PROCESSING(SSfastprocess, src) - else - target = null //Restarting the pinpointer forces a target reset - STOP_PROCESSING(SSfastprocess, src) - -/obj/item/pinpointer/attackby(obj/item/I, mob/living/user, params) - if(mode != TRACK_ATOM) - return ..() - user.visible_message("[user] tunes [src] to [I].", "You fine-tune [src]'s tracking to track [I].") - playsound(src, 'sound/machines/click.ogg', 50, 1) - constant_target = I - -/obj/item/pinpointer/examine(mob/user) +/obj/item/pinpointer/nuke/examine(mob/user) ..() var/msg = "Its tracking indicator reads " switch(mode) @@ -60,12 +11,6 @@ msg += "\"01000001 01001001\"." if(TRACK_INFILTRATOR) msg += "\"vasvygengbefuvc\"." - if(TRACK_OPERATIVES) - msg += "\"[target ? "Operative [target]" : "friends"]\"." - if(TRACK_ATOM) - msg += "\"[initial(constant_target.name)]\"." - if(TRACK_COORDINATES) - msg += "\"([target_x], [target_y])\"." else msg = "Its tracking indicator is blank." to_chat(user, msg) @@ -73,22 +18,20 @@ if(bomb.timing) to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]") -/obj/item/pinpointer/process() - if(!active) - STOP_PROCESSING(SSfastprocess, src) - return - scan_for_target() - point_to_target() - my_god_jc_a_bomb() - addtimer(CALLBACK(src, .proc/refresh_target), 50, TIMER_UNIQUE) +/obj/item/pinpointer/nuke/process() + ..() + if(active) // If shit's going down + for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list) + if(bomb.timing) + if(!alert) + alert = TRUE + playsound(src, 'sound/items/nuke_toy_lowpower.ogg', 50, 0) + if(isliving(loc)) + var/mob/living/L = loc + to_chat(L, "Your [name] vibrates and lets out a tinny alarm. Uh oh.") -/obj/item/pinpointer/proc/scan_for_target() //Looks for whatever it's tracking - if(target) - if(isliving(target)) - var/mob/living/L = target - if(L.stat == DEAD) - target = null - return +/obj/item/pinpointer/nuke/scan_for_target() + target = null switch(mode) if(TRACK_NUKE_DISK) var/obj/item/disk/nuclear/N = locate() in GLOB.poi_list @@ -104,76 +47,36 @@ target = A if(TRACK_INFILTRATOR) target = SSshuttle.getShuttle("syndicate") - if(TRACK_OPERATIVES) - var/list/possible_targets = list() - var/turf/here = get_turf(src) - for(var/V in SSticker.mode.syndicates) - var/datum/mind/M = V - if(M.current && M.current.stat != DEAD) - possible_targets |= M.current - var/mob/living/closest_operative = get_closest_atom(/mob/living/carbon/human, possible_targets, here) - if(closest_operative) - target = closest_operative - if(TRACK_ATOM) - if(constant_target) - target = constant_target - if(TRACK_COORDINATES) - var/turf/T = get_turf(src) - target = locate(target_x, target_y, T.z) + ..() -/obj/item/pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction - if(!active) - return - if(!target || (mode == TRACK_ATOM && !constant_target)) - icon_state = "pinon[nuke_warning ? "alert" : ""]null" - return - var/turf/here = get_turf(src) - var/turf/there = get_turf(target) - if(here.z != there.z) - icon_state = "pinon[nuke_warning ? "alert" : ""]null" - return - if(get_dist_euclidian(here,there)<=minimum_range) - icon_state = "pinon[nuke_warning ? "alert" : ""]direct" - else - setDir(get_dir(here, there)) - switch(get_dist(here, there)) - if(1 to 8) - icon_state = "pinon[nuke_warning ? "alert" : "close"]" - if(9 to 16) - icon_state = "pinon[nuke_warning ? "alert" : "medium"]" - if(16 to INFINITY) - icon_state = "pinon[nuke_warning ? "alert" : "far"]" - -/obj/item/pinpointer/proc/my_god_jc_a_bomb() //If we should get the hell back to the ship - for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list) - if(bomb.timing) - if(!nuke_warning) - nuke_warning = TRUE - playsound(src, 'sound/items/nuke_toy_lowpower.ogg', 50, 0) - if(isliving(loc)) - var/mob/living/L = loc - to_chat(L, "Your [name] vibrates and lets out a tinny alarm. Uh oh.") - -/obj/item/pinpointer/proc/switch_mode_to(new_mode) //If we shouldn't be tracking what we are +/obj/item/pinpointer/nuke/proc/switch_mode_to(new_mode) if(isliving(loc)) var/mob/living/L = loc to_chat(L, "Your [name] beeps as it reconfigures its tracking algorithms.") playsound(L, 'sound/machines/triple_beep.ogg', 50, 1) mode = new_mode - target = null //Switch modes so we can find the new target + scan_for_target() -/obj/item/pinpointer/proc/refresh_target() //Periodically removes the target to allow the pinpointer to update (i.e. malf AI shunts, an operative dies) - target = null - -/obj/item/pinpointer/syndicate //Syndicate pinpointers automatically point towards the infiltrator once the nuke is active. +/obj/item/pinpointer/nuke/syndicate // Syndicate pinpointers automatically point towards the infiltrator once the nuke is active. name = "syndicate pinpointer" desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device." + icon_state = "pinpointer_syndicate" -/obj/item/pinpointer/syndicate/cyborg //Cyborg pinpointers just look for a random operative. +/obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative. name = "cyborg syndicate pinpointer" desc = "An integrated tracking device, jury-rigged to search for living Syndicate operatives." - mode = TRACK_OPERATIVES flags_1 = NODROP_1 - +/obj/item/pinpointer/syndicate_cyborg/scan_for_target() + target = null + var/list/possible_targets = list() + var/turf/here = get_turf(src) + for(var/V in SSticker.mode.syndicates) + var/datum/mind/M = V + if(M.current && M.current.stat != DEAD) + possible_targets |= M.current + var/mob/living/closest_operative = get_closest_atom(/mob/living/carbon/human, possible_targets, here) + if(closest_operative) + target = closest_operative + ..() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b33500db22..effe2212a7 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,6 +1,8 @@ /datum/objective - var/datum/mind/owner = null //Who owns the objective. + var/datum/mind/owner //The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code. + var/datum/objective_team/team //An alternative to 'owner': a team. Use this when writing new code. var/explanation_text = "Nothing" //What that person is supposed to do. + var/team_explanation_text //For when there are multiple owners. var/datum/mind/target = null //If they are focused on a particular person. var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter. var/completed = 0 //currently only used for custom objectives. @@ -10,19 +12,37 @@ if(text) explanation_text = text +/datum/objective/proc/get_owners() // Combine owner and team into a single list. + . = (team && team.members) ? team.members.Copy() : list() + if(owner) + . += owner + +/datum/objective/proc/considered_escaped(datum/mind/M) + if(!considered_alive(M)) + return FALSE + if(SSticker.force_ending || SSticker.mode.station_was_nuked) // Just let them win. + return TRUE + if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) + return FALSE + var/turf/location = get_turf(M.current) + if(!location || istype(location, /turf/open/floor/plasteel/shuttle/red) || istype(location, /turf/open/floor/mineral/plastitanium/brig)) // Fails if they are in the shuttle brig + return FALSE + return location.onCentCom() || location.onSyndieBase() + /datum/objective/proc/check_completion() return completed /datum/objective/proc/is_unique_objective(possible_target) - for(var/datum/objective/O in owner.objectives) - if(istype(O, type) && O.get_target() == possible_target) - return 0 - return 1 + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + for(var/datum/objective/O in M.objectives) + if(istype(O, type) && O.get_target() == possible_target) + return FALSE + return TRUE /datum/objective/proc/get_target() return target - /datum/objective/proc/get_crewmember_minds() . = list() for(var/V in GLOB.data_core.locked) @@ -32,9 +52,10 @@ . += M.mind /datum/objective/proc/find_target() + var/list/datum/mind/owners = get_owners() var/list/possible_targets = list() for(var/datum/mind/possible_target in get_crewmember_minds()) - if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != 2) && is_unique_objective(possible_target)) + if(!(possible_target in owners) && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && is_unique_objective(possible_target)) possible_targets += possible_target if(possible_targets.len > 0) target = pick(possible_targets) @@ -42,8 +63,9 @@ return target /datum/objective/proc/find_target_by_role(role, role_type=0, invert=0)//Option sets either to check assigned role or special role. Default to assigned., invert inverts the check, eg: "Don't choose a Ling" + var/list/datum/mind/owners = get_owners() for(var/datum/mind/possible_target in get_crewmember_minds()) - if((possible_target != owner) && ishuman(possible_target.current)) + if(!(possible_target in owners) && ishuman(possible_target.current)) var/is_role = 0 if(role_type) if(possible_target.special_role == role) @@ -64,13 +86,15 @@ update_explanation_text() /datum/objective/proc/update_explanation_text() - //Default does nothing, override where needed + if(team_explanation_text && LAZYLEN(get_owners()) > 1) + explanation_text = team_explanation_text /datum/objective/proc/give_special_equipment(special_equipment) - if(owner && owner.current) - if(ishuman(owner.current)) - var/mob/living/carbon/human/H = owner.current - var/list/slots = list ("backpack" = slot_in_backpack) + var/datum/mind/receiver = pick(get_owners()) + if(receiver && receiver.current) + if(ishuman(receiver.current)) + var/mob/living/carbon/human/H = receiver.current + var/list/slots = list("backpack" = slot_in_backpack) for(var/eq_path in special_equipment) var/obj/O = new eq_path H.equip_in_one_of_slots(O, slots) @@ -86,14 +110,7 @@ return target /datum/objective/assassinate/check_completion() - if(target && target.current) - var/mob/living/carbon/human/H - if(ishuman(target.current)) - H = target.current - if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite - return 1 - return 0 - return 1 + return !considered_alive(target) || considered_afk(target) /datum/objective/assassinate/update_explanation_text() ..() @@ -110,7 +127,6 @@ if(target && !target.current) explanation_text = "Assassinate [target.name], who was obliterated" - /datum/objective/mutiny var/target_role_type=0 martyr_compatible = 1 @@ -122,14 +138,10 @@ return target /datum/objective/mutiny/check_completion() - if(target && target.current) - if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey) - return 1 - var/turf/T = get_turf(target.current) - if(T && (T.z > ZLEVEL_STATION) || (target.current.client && target.current.client.is_afk())) //If they leave the station or go afk they count as dead for this - return 2 - return 0 - return 1 + if(!target || !considered_alive(target) || considered_afk(target)) + return TRUE + var/turf/T = get_turf(target.current) + return T && !(T.z in GLOB.station_z_levels) /datum/objective/mutiny/update_explanation_text() ..() @@ -138,8 +150,6 @@ else explanation_text = "Free Objective" - - /datum/objective/maroon var/target_role_type=0 martyr_compatible = 1 @@ -151,15 +161,7 @@ return target /datum/objective/maroon/check_completion() - if(target && target.current) - var/mob/living/carbon/human/H - if(ishuman(target.current)) - H = target.current - if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite - return 1 - if(target.current.onCentCom() || target.current.onSyndieBase()) - return 0 - return 1 + return !target || !considered_alive(target) || (!target.current.onCentCom() && !target.current.onSyndieBase()) /datum/objective/maroon/update_explanation_text() if(target && target.current) @@ -167,9 +169,7 @@ else explanation_text = "Free Objective" - - -/datum/objective/debrain//I want braaaainssss +/datum/objective/debrain var/target_role_type=0 /datum/objective/debrain/find_target_by_role(role, role_type=0, invert=0) @@ -180,17 +180,20 @@ /datum/objective/debrain/check_completion() if(!target)//If it's a free objective. - return 1 - if( !owner.current || owner.current.stat==DEAD )//If you're otherwise dead. - return 0 - if( !target.current || !isbrain(target.current) ) - return 0 + return TRUE + + if(!target.current || !isbrain(target.current)) + return FALSE + var/atom/A = target.current - while(A.loc) //check to see if the brainmob is on our person + var/list/datum/mind/owners = get_owners() + + while(A.loc) // Check to see if the brainmob is on our person A = A.loc - if(A == owner.current) - return 1 - return 0 + for(var/datum/mind/M in owners) + if(M.current && M.current.stat != DEAD && A == M.current) + return TRUE + return FALSE /datum/objective/debrain/update_explanation_text() ..() @@ -199,8 +202,6 @@ else explanation_text = "Free Objective" - - /datum/objective/protect//The opposite of killing a dude. var/target_role_type=0 martyr_compatible = 1 @@ -212,13 +213,7 @@ return target /datum/objective/protect/check_completion() - if(!target) //If it's a free objective. - return 1 - if(target.current) - if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current)) - return 0 - return 1 - return 0 + return !target || considered_alive(target) /datum/objective/protect/update_explanation_text() ..() @@ -227,76 +222,32 @@ else explanation_text = "Free Objective" - - /datum/objective/hijack explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody." + team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Leave no team member behind." martyr_compatible = 0 //Technically you won't get both anyway. -/datum/objective/hijack/check_completion() - if(!owner.current || owner.current.stat) - return 0 +/datum/objective/hijack/check_completion() // Requires all owners to escape. if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) - return 0 - if(issilicon(owner.current)) - return 0 - if(!SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) - return 0 + return FALSE + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!considered_alive(M) || !SSshuttle.emergency.shuttle_areas[get_area(M.current)]) + return FALSE return SSshuttle.emergency.is_hijacked() - -/datum/objective/hijackclone - explanation_text = "Hijack the emergency shuttle by ensuring only you (or your copies) escape." - martyr_compatible = 0 - -/datum/objective/hijackclone/check_completion() - if(!owner.current) - return FALSE - if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) - return FALSE - - var/in_shuttle = FALSE - for(var/mob/living/player in GLOB.player_list) //Make sure nobody else is onboard - if(SSshuttle.emergency.shuttle_areas[get_area(player)]) - if(player.mind && player.mind != owner) - if(player.stat != DEAD) - if(issilicon(player)) //Borgs are technically dead anyways - continue - if(isanimal(player)) //animals don't count - continue - if(isbrain(player)) //also technically dead - continue - var/location = get_turf(player.mind.current) - if(istype(location, /turf/open/floor/plasteel/shuttle/red)) - continue - if(istype(location, /turf/open/floor/mineral/plastitanium/brig)) - continue - if(player.real_name != owner.current.real_name) - return FALSE - else - in_shuttle = TRUE - return in_shuttle - /datum/objective/block explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive." martyr_compatible = 1 /datum/objective/block/check_completion() - if(!issilicon(owner.current)) - return 0 if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) - return 1 - + return TRUE for(var/mob/living/player in GLOB.player_list) - if(issilicon(player)) - continue - if(player.mind) - if(player.stat != DEAD) - if(get_area(player) in SSshuttle.emergency.shuttle_areas) - return 0 - - return 1 - + if(player.mind && player.stat != DEAD && !issilicon(player)) + if(get_area(player) in SSshuttle.emergency.shuttle_areas) + return FALSE + return TRUE /datum/objective/purge explanation_text = "Ensure no mutant humanoid species are present aboard the escape shuttle." @@ -304,63 +255,41 @@ /datum/objective/purge/check_completion() if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) - return 1 - + return TRUE for(var/mob/living/player in GLOB.player_list) if(get_area(player) in SSshuttle.emergency.shuttle_areas && player.mind && player.stat != DEAD && ishuman(player)) var/mob/living/carbon/human/H = player if(H.dna.species.id != "human") - return 0 - - return 1 - + return FALSE + return TRUE /datum/objective/robot_army explanation_text = "Have at least eight active cyborgs synced to you." martyr_compatible = 0 /datum/objective/robot_army/check_completion() - if(!isAI(owner.current)) - return 0 - var/mob/living/silicon/ai/A = owner.current - var/counter = 0 - - for(var/mob/living/silicon/robot/R in A.connected_robots) - if(R.stat != DEAD) - counter++ - - if(counter < 8) - return 0 - return 1 + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!M.current || !isAI(M.current)) + continue + var/mob/living/silicon/ai/A = M.current + for(var/mob/living/silicon/robot/R in A.connected_robots) + if(R.stat != DEAD) + counter++ + return counter >= 8 /datum/objective/escape explanation_text = "Escape on the shuttle or an escape pod alive and without being in custody." + team_explanation_text = "Have all members of your team escape on a shuttle or pod alive, without being in custody." /datum/objective/escape/check_completion() - if(issilicon(owner.current)) - return 0 - if(isbrain(owner.current)) - return 0 - if(!owner.current || owner.current.stat == DEAD) - return 0 - if(SSticker.force_ending) //This one isn't their fault, so lets just assume good faith - return 1 - if(SSticker.mode.station_was_nuked) //If they escaped the blast somehow, let them win - return 1 - if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) - return 0 - var/turf/location = get_turf(owner.current) - if(!location) - return 0 - - if(istype(location, /turf/open/floor/plasteel/shuttle/red) || istype(location, /turf/open/floor/mineral/plastitanium/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph - return 0 - - if(location.onCentCom() || location.onSyndieBase()) - return 1 - - return 0 + // Require all owners escape safely. + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!considered_escaped(M)) + return FALSE + return TRUE /datum/objective/escape/escape_with_identity var/target_real_name // Has to be stored because the target's real_name can change over the course of the round @@ -387,39 +316,45 @@ explanation_text = "Free Objective." /datum/objective/escape/escape_with_identity/check_completion() - if(!target_real_name) - return 1 - if(!ishuman(owner.current)) - return 0 - var/mob/living/carbon/human/H = owner.current - if(..()) - if(H.dna.real_name == target_real_name) - if(H.get_id_name()== target_real_name || target_missing_id) - return 1 - return 0 - + if(!target || !target_real_name) + return TRUE + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!ishuman(M.current) || !considered_escaped(M)) + continue + var/mob/living/carbon/human/H = M.current + if(H.dna.real_name == target_real_name && (H.get_id_name() == target_real_name || target_missing_id)) + return TRUE + return FALSE /datum/objective/survive explanation_text = "Stay alive until the end." /datum/objective/survive/check_completion() - if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current)) - return 0 //Brains no longer win survive objectives. --NEO - if(!is_special_character(owner.current)) //This fails borg'd traitors - return 0 - return 1 + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!considered_alive(M)) + 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." /datum/objective/martyr/check_completion() - if(!owner.current) //Gibbed, etc. - return 1 - if(owner.current && owner.current.stat == DEAD) //You're dead! Yay! - return 1 - return 0 - + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(considered_alive(M)) + return FALSE + return TRUE /datum/objective/nuclear explanation_text = "Destroy the station with a nuclear device." @@ -427,8 +362,8 @@ /datum/objective/nuclear/check_completion() if(SSticker && SSticker.mode && SSticker.mode.station_was_nuked) - return 1 - return 0 + return TRUE + return FALSE GLOBAL_LIST_EMPTY(possible_items) /datum/objective/steal @@ -446,16 +381,21 @@ GLOBAL_LIST_EMPTY(possible_items) new I /datum/objective/steal/find_target() + var/list/datum/mind/owners = get_owners() var/approved_targets = list() - for(var/datum/objective_item/possible_item in GLOB.possible_items) - if(is_unique_objective(possible_item.targetitem) && !(owner.current.mind.assigned_role in possible_item.excludefromjob)) + check_items: + for(var/datum/objective_item/possible_item in GLOB.possible_items) + if(!is_unique_objective(possible_item.targetitem)) + continue + for(var/datum/mind/M in owners) + if(M.current.mind.assigned_role in possible_item.excludefromjob) + continue check_items approved_targets += possible_item return set_target(safepick(approved_targets)) /datum/objective/steal/proc/set_target(datum/objective_item/item) if(item) targetinfo = item - steal_target = targetinfo.targetitem explanation_text = "Steal [targetinfo.name]" give_special_equipment(targetinfo.special_equipment) @@ -483,23 +423,26 @@ GLOBAL_LIST_EMPTY(possible_items) return steal_target /datum/objective/steal/check_completion() + var/list/datum/mind/owners = get_owners() if(!steal_target) - return 1 - if(!isliving(owner.current)) - return 0 - var/list/all_items = owner.current.GetAllContents() //this should get things in cheesewheels, books, etc. + return TRUE + for(var/datum/mind/M in owners) + if(!isliving(M.current)) + continue - for(var/obj/I in all_items) //Check for items - if(istype(I, steal_target)) - if(!targetinfo) //If there's no targetinfo, then that means it was a custom objective. At this point, we know you have the item, so return 1. - return 1 - else if(targetinfo.check_special_completion(I))//Returns 1 by default. Items with special checks will return 1 if the conditions are fulfilled. - return 1 + var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. - if(targetinfo && I.type in targetinfo.altitems) //Ok, so you don't have the item. Do you have an alternative, at least? - if(targetinfo.check_special_completion(I))//Yeah, we do! Don't return 0 if we don't though - then you could fail if you had 1 item that didn't pass and got checked first! - return 1 - return 0 + for(var/obj/I in all_items) //Check for items + if(istype(I, steal_target)) + if(!targetinfo) //If there's no targetinfo, then that means it was a custom objective. At this point, we know you have the item, so return 1. + return TRUE + else if(targetinfo.check_special_completion(I))//Returns 1 by default. Items with special checks will return 1 if the conditions are fulfilled. + return TRUE + + if(targetinfo && I.type in targetinfo.altitems) //Ok, so you don't have the item. Do you have an alternative, at least? + if(targetinfo.check_special_completion(I))//Yeah, we do! Don't return 0 if we don't though - then you could fail if you had 1 item that didn't pass and got checked first! + return TRUE + return FALSE GLOBAL_LIST_EMPTY(possible_items_special) @@ -553,33 +496,31 @@ GLOBAL_LIST_EMPTY(possible_items_special) explanation_text = "Download [target_amount] research level\s." return target_amount -/datum/objective/download/check_completion()//NINJACODE - if(!ishuman(owner.current)) - return 0 - - var/mob/living/carbon/human/H = owner.current - if(!H || H.stat == DEAD) - return 0 - - if(!istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja)) - return 0 - - var/obj/item/clothing/suit/space/space_ninja/SN = H.wear_suit - if(!SN.s_initialized) - return 0 - - var/current_amount - if(!SN.stored_research.len) - return 0 - else - for(var/datum/tech/current_data in SN.stored_research) - if(current_data.level) - current_amount += (current_data.level-1) - if(current_amount
" to_chat(world, text) + +/datum/game_mode/revolution/generate_report() + return "Employee unrest has spiked in recent weeks, with several attempted mutinies on heads of staff. Some crew have been observed using flashbulb devices to blind their colleagues, \ + who then follow their orders without question and work towards dethroning departmental leaders. Watch for behavior such as this with caution. If the crew attempts a mutiny, you and \ + your heads of staff are fully authorized to execute them using lethal weaponry - they will be later cloned and interrogated at Central Command." diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 7a17d54b4c..15cd346b2d 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -1,303 +1,303 @@ - - -GLOBAL_VAR_INIT(hsboxspawn, TRUE) - -/mob - var/datum/hSB/sandbox = null -/mob/proc/CanBuild() - sandbox = new/datum/hSB - sandbox.owner = src.ckey - if(src.client.holder) - sandbox.admin = 1 - verbs += new/mob/proc/sandbox_panel -/mob/proc/sandbox_panel() - set name = "Sandbox Panel" - if(sandbox) - sandbox.update() - -/datum/hSB - var/owner = null - var/admin = 0 - + + +GLOBAL_VAR_INIT(hsboxspawn, TRUE) + +/mob + var/datum/hSB/sandbox = null +/mob/proc/CanBuild() + sandbox = new/datum/hSB + sandbox.owner = src.ckey + if(src.client.holder) + sandbox.admin = 1 + verbs += new/mob/proc/sandbox_panel +/mob/proc/sandbox_panel() + set name = "Sandbox Panel" + if(sandbox) + sandbox.update() + +/datum/hSB + var/owner = null + var/admin = 0 + var/static/clothinfo = null var/static/reaginfo = null var/static/objinfo = null - var/canisterinfo = null - var/hsbinfo = null - //items that shouldn't spawn on the floor because they would bug or act weird - var/global/list/spawn_forbidden = list( - /obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you + var/canisterinfo = null + var/hsbinfo = null + //items that shouldn't spawn on the floor because they would bug or act weird + var/global/list/spawn_forbidden = list( + /obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you /obj/item/assembly, /obj/item/device/onetankbomb, /obj/item/radio, /obj/item/device/pda/ai, - /obj/item/device/uplink, /obj/item/smallDelivery, /obj/item/projectile, + /obj/item/device/uplink, /obj/item/smallDelivery, /obj/item/projectile, /obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module) - -/datum/hSB/proc/update() - var/global/list/hrefs = list( - "Space Gear", - "Suit Up (Space Travel Gear)" = "hsbsuit", - "Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]", - "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/tank/internals/emergency_oxygen/double]", - - "Standard Tools", - "Spawn Flashlight" = "hsbspawn&path=[/obj/item/device/flashlight]", - "Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]", - "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/device/lightreplacer]", - "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]", - "Spawn All-Access ID" = "hsbaaid", - - "Building Supplies", - "Spawn 50 Wood" = "hsbwood", - "Spawn 50 Metal" = "hsbmetal", - "Spawn 50 Plasteel" = "hsbplasteel", - "Spawn 50 Reinforced Glass" = "hsbrglass", - "Spawn 50 Glass" = "hsbglass", - "Spawn Full Cable Coil" = "hsbspawn&path=[/obj/item/stack/cable_coil]", - "Spawn Hyper Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/hyper]", - "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/infinite]", - "Spawn Rapid Construction Device" = "hsbrcd", - "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/rcd_ammo]", - "Spawn Airlock" = "hsbairlock", - - "Miscellaneous", - "Spawn Air Scrubber" = "hsbscrubber", - "Spawn Welding Fuel Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/fueltank]", - "Spawn Water Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/watertank]", - - "Bots", - "Spawn Cleanbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/cleanbot]", - "Spawn Floorbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/floorbot]", - "Spawn Medbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/medbot]", - - "Canisters", - "Spawn O2 Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/oxygen]", - "Spawn Air Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/air]") - - - if(!hsbinfo) - hsbinfo = "
" - if(admin) - hsbinfo += "Administration
" - hsbinfo += "- Toggle Object Spawning
" - hsbinfo += "- Toggle Item Spawn Panel Auto-close
" - hsbinfo += "Canister Spawning
" - hsbinfo += "- Spawn Plasma Canister
" - hsbinfo += "- Spawn CO2 Canister
" - hsbinfo += "- Spawn Nitrogen Canister
" - hsbinfo += "- Spawn N2O Canister
" - else - hsbinfo += "Some item spawning may be disabled by the administrators.
" - hsbinfo += "Only administrators may spawn dangerous canisters.
" - for(var/T in hrefs) - var/href = hrefs[T] - if(href) - hsbinfo += "- [T]
" - else - hsbinfo += "
[T]
" - hsbinfo += "
" - hsbinfo += "- Spawn Clothing...
" - hsbinfo += "- Spawn Reagent Container...
" - hsbinfo += "- Spawn Other Item...
" - - usr << browse(hsbinfo, "window=hsbpanel") - -/datum/hSB/Topic(href, href_list) - if(!usr || !src || !(src.owner == usr.ckey)) - if(usr) - usr << browse(null,"window=sandbox") - return - - if(href_list["hsb"]) - switch(href_list["hsb"]) - // - // Admin: toggle spawning - // - if("hsbtobj") - if(!admin) return - if(GLOB.hsboxspawn) - to_chat(world, "Sandbox: \black[usr.key] has disabled object spawning!") - GLOB.hsboxspawn = FALSE - return - else - to_chat(world, "Sandbox: \black[usr.key] has enabled object spawning!") - GLOB.hsboxspawn = TRUE - return - // - // Admin: Toggle auto-close - // - if("hsbtac") - if(!admin) return - if(config.sandbox_autoclose) - 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 - return - // - // Spacesuit with full air jetpack set as internals - // - if("hsbsuit") - var/mob/living/carbon/human/P = usr - if(!istype(P)) return - if(P.wear_suit) - P.wear_suit.loc = P.loc - P.wear_suit.layer = initial(P.wear_suit.layer) - P.wear_suit.plane = initial(P.wear_suit.plane) - P.wear_suit = null - P.wear_suit = new/obj/item/clothing/suit/space(P) - P.wear_suit.layer = ABOVE_HUD_LAYER - P.wear_suit.plane = ABOVE_HUD_PLANE - P.update_inv_wear_suit() - if(P.head) - P.head.loc = P.loc - P.head.layer = initial(P.head.layer) - P.head.plane = initial(P.head.plane) - P.head = null - P.head = new/obj/item/clothing/head/helmet/space(P) - P.head.layer = ABOVE_HUD_LAYER - P.head.plane = ABOVE_HUD_PLANE - P.update_inv_head() - if(P.wear_mask) - P.wear_mask.loc = P.loc - P.wear_mask.layer = initial(P.wear_mask.layer) - P.wear_mask.plane = initial(P.wear_mask.plane) - P.wear_mask = null - P.wear_mask = new/obj/item/clothing/mask/gas(P) - P.wear_mask.layer = ABOVE_HUD_LAYER - P.wear_mask.plane = ABOVE_HUD_PLANE - P.update_inv_wear_mask() - if(P.back) - P.back.loc = P.loc - P.back.layer = initial(P.back.layer) - P.back.plane = initial(P.back.plane) - P.back = null - P.back = new/obj/item/tank/jetpack/oxygen(P) - P.back.layer = ABOVE_HUD_LAYER - P.back.plane = ABOVE_HUD_PLANE - P.update_inv_back() - P.internal = P.back - P.update_internals_hud_icon(1) - - if("hsbscrubber") // This is beyond its normal capability but this is sandbox and you spawned one, I assume you need it - var/obj/hsb = new/obj/machinery/portable_atmospherics/scrubber{volume_rate=50*ONE_ATMOSPHERE;on=1}(usr.loc) - hsb.update_icon() // hackish but it wasn't meant to be spawned I guess? - - // - // Stacked Materials - // - - if("hsbrglass") - new/obj/item/stack/sheet/rglass{amount=50}(usr.loc) - - if("hsbmetal") - new/obj/item/stack/sheet/metal{amount=50}(usr.loc) - - if("hsbplasteel") - new/obj/item/stack/sheet/plasteel{amount=50}(usr.loc) - - if("hsbglass") - new/obj/item/stack/sheet/glass{amount=50}(usr.loc) - - if("hsbwood") - new/obj/item/stack/sheet/mineral/wood{amount=50}(usr.loc) - - // - // All access ID - // - if("hsbaaid") - var/obj/item/card/id/gold/ID = new(usr.loc) - ID.registered_name = usr.real_name - ID.assignment = "Sandbox" - ID.access = get_all_accesses() - ID.update_label() - - // - // RCD - starts with full clip - // Spawn check due to grief potential (destroying floors, walls, etc) - // - if("hsbrcd") - if(!GLOB.hsboxspawn) return - - new/obj/item/construction/rcd/combat(usr.loc) - - // - // New sandbox airlock maker - // - if("hsbairlock") - new /datum/airlock_maker(usr.loc) - - // - // Object spawn window - // - - // Clothing - if("hsbcloth") - if(!GLOB.hsboxspawn) return - - if(!clothinfo) - clothinfo = "Clothing (Reagent Containers) (Other Items)
" - var/list/all_items = subtypesof(/obj/item/clothing) - for(var/typekey in spawn_forbidden) - all_items -= typesof(typekey) - for(var/O in reverseRange(all_items)) - clothinfo += "[O]
" - - usr << browse(clothinfo,"window=sandbox") - - // Reagent containers - if("hsbreag") - if(!GLOB.hsboxspawn) return - - if(!reaginfo) - reaginfo = "Reagent Containers (Clothing) (Other Items)
" - var/list/all_items = subtypesof(/obj/item/reagent_containers) - for(var/typekey in spawn_forbidden) - all_items -= typesof(typekey) - for(var/O in reverseRange(all_items)) - reaginfo += "[O]
" - - usr << browse(reaginfo,"window=sandbox") - - // Other items - if("hsbobj") - if(!GLOB.hsboxspawn) return - - if(!objinfo) - objinfo = "Other Items (Clothing) (Reagent Containers)
" - var/list/all_items = subtypesof(/obj/item/) - typesof(/obj/item/clothing) - typesof(/obj/item/reagent_containers) - for(var/typekey in spawn_forbidden) - all_items -= typesof(typekey) - - for(var/O in reverseRange(all_items)) - objinfo += "[O]
" - - usr << browse(objinfo,"window=sandbox") - - // - // Safespawn checks to see if spawning is disabled. - // - if("hsb_safespawn") - if(!GLOB.hsboxspawn) - usr << browse(null,"window=sandbox") - return - - var/typepath = text2path(href_list["path"]) - if(!typepath) - to_chat(usr, "Bad path: \"[href_list["path"]]\"") - return - new typepath(usr.loc) - - if(config.sandbox_autoclose) - usr << browse(null,"window=sandbox") - // - // For everything else in the href list - // - if("hsbspawn") - var/typepath = text2path(href_list["path"]) - if(!typepath) - to_chat(usr, "Bad path: \"[href_list["path"]]\"") - return - new typepath(usr.loc) - - if(config.sandbox_autoclose) - usr << browse(null,"window=sandbox") + +/datum/hSB/proc/update() + var/global/list/hrefs = list( + "Space Gear", + "Suit Up (Space Travel Gear)" = "hsbsuit", + "Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]", + "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/tank/internals/emergency_oxygen/double]", + + "Standard Tools", + "Spawn Flashlight" = "hsbspawn&path=[/obj/item/device/flashlight]", + "Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]", + "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/device/lightreplacer]", + "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]", + "Spawn All-Access ID" = "hsbaaid", + + "Building Supplies", + "Spawn 50 Wood" = "hsbwood", + "Spawn 50 Metal" = "hsbmetal", + "Spawn 50 Plasteel" = "hsbplasteel", + "Spawn 50 Reinforced Glass" = "hsbrglass", + "Spawn 50 Glass" = "hsbglass", + "Spawn Full Cable Coil" = "hsbspawn&path=[/obj/item/stack/cable_coil]", + "Spawn Hyper Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/hyper]", + "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/infinite]", + "Spawn Rapid Construction Device" = "hsbrcd", + "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/rcd_ammo]", + "Spawn Airlock" = "hsbairlock", + + "Miscellaneous", + "Spawn Air Scrubber" = "hsbscrubber", + "Spawn Welding Fuel Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/fueltank]", + "Spawn Water Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/watertank]", + + "Bots", + "Spawn Cleanbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/cleanbot]", + "Spawn Floorbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/floorbot]", + "Spawn Medbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/medbot]", + + "Canisters", + "Spawn O2 Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/oxygen]", + "Spawn Air Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/air]") + + + if(!hsbinfo) + hsbinfo = "
" + if(admin) + hsbinfo += "Administration
" + hsbinfo += "- Toggle Object Spawning
" + hsbinfo += "- Toggle Item Spawn Panel Auto-close
" + hsbinfo += "Canister Spawning
" + hsbinfo += "- Spawn Plasma Canister
" + hsbinfo += "- Spawn CO2 Canister
" + hsbinfo += "- Spawn Nitrogen Canister
" + hsbinfo += "- Spawn N2O Canister
" + else + hsbinfo += "Some item spawning may be disabled by the administrators.
" + hsbinfo += "Only administrators may spawn dangerous canisters.
" + for(var/T in hrefs) + var/href = hrefs[T] + if(href) + hsbinfo += "- [T]
" + else + hsbinfo += "
[T]
" + hsbinfo += "
" + hsbinfo += "- Spawn Clothing...
" + hsbinfo += "- Spawn Reagent Container...
" + hsbinfo += "- Spawn Other Item...
" + + usr << browse(hsbinfo, "window=hsbpanel") + +/datum/hSB/Topic(href, href_list) + if(!usr || !src || !(src.owner == usr.ckey)) + if(usr) + usr << browse(null,"window=sandbox") + return + + if(href_list["hsb"]) + switch(href_list["hsb"]) + // + // Admin: toggle spawning + // + if("hsbtobj") + if(!admin) return + if(GLOB.hsboxspawn) + to_chat(world, "Sandbox: \black[usr.key] has disabled object spawning!") + GLOB.hsboxspawn = FALSE + return + else + to_chat(world, "Sandbox: \black[usr.key] has enabled object spawning!") + GLOB.hsboxspawn = TRUE + return + // + // Admin: Toggle auto-close + // + if("hsbtac") + 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.") + else + to_chat(world, "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use.") + 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(P.wear_suit) + 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 + P.wear_suit = new/obj/item/clothing/suit/space(P) + P.wear_suit.layer = ABOVE_HUD_LAYER + P.wear_suit.plane = ABOVE_HUD_PLANE + P.update_inv_wear_suit() + if(P.head) + P.head.forceMove(P.drop_location()) + P.head.layer = initial(P.head.layer) + P.head.plane = initial(P.head.plane) + P.head = null + P.head = new/obj/item/clothing/head/helmet/space(P) + P.head.layer = ABOVE_HUD_LAYER + P.head.plane = ABOVE_HUD_PLANE + P.update_inv_head() + if(P.wear_mask) + 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 + P.wear_mask = new/obj/item/clothing/mask/gas(P) + P.wear_mask.layer = ABOVE_HUD_LAYER + P.wear_mask.plane = ABOVE_HUD_PLANE + P.update_inv_wear_mask() + if(P.back) + P.back.forceMove(P.drop_location()) + P.back.layer = initial(P.back.layer) + P.back.plane = initial(P.back.plane) + P.back = null + P.back = new/obj/item/tank/jetpack/oxygen(P) + P.back.layer = ABOVE_HUD_LAYER + P.back.plane = ABOVE_HUD_PLANE + P.update_inv_back() + P.internal = P.back + P.update_internals_hud_icon(1) + + if("hsbscrubber") // This is beyond its normal capability but this is sandbox and you spawned one, I assume you need it + var/obj/hsb = new/obj/machinery/portable_atmospherics/scrubber{volume_rate=50*ONE_ATMOSPHERE;on=1}(usr.loc) + hsb.update_icon() // hackish but it wasn't meant to be spawned I guess? + + // + // Stacked Materials + // + + if("hsbrglass") + new/obj/item/stack/sheet/rglass{amount=50}(usr.loc) + + if("hsbmetal") + new/obj/item/stack/sheet/metal{amount=50}(usr.loc) + + if("hsbplasteel") + new/obj/item/stack/sheet/plasteel{amount=50}(usr.loc) + + if("hsbglass") + new/obj/item/stack/sheet/glass{amount=50}(usr.loc) + + if("hsbwood") + new/obj/item/stack/sheet/mineral/wood{amount=50}(usr.loc) + + // + // All access ID + // + if("hsbaaid") + var/obj/item/card/id/gold/ID = new(usr.loc) + ID.registered_name = usr.real_name + ID.assignment = "Sandbox" + ID.access = get_all_accesses() + ID.update_label() + + // + // RCD - starts with full clip + // Spawn check due to grief potential (destroying floors, walls, etc) + // + if("hsbrcd") + if(!GLOB.hsboxspawn) return + + new/obj/item/construction/rcd/combat(usr.loc) + + // + // New sandbox airlock maker + // + if("hsbairlock") + new /datum/airlock_maker(usr.loc) + + // + // Object spawn window + // + + // Clothing + if("hsbcloth") + if(!GLOB.hsboxspawn) return + + if(!clothinfo) + clothinfo = "Clothing (Reagent Containers) (Other Items)
" + var/list/all_items = subtypesof(/obj/item/clothing) + for(var/typekey in spawn_forbidden) + all_items -= typesof(typekey) + for(var/O in reverseRange(all_items)) + clothinfo += "[O]
" + + usr << browse(clothinfo,"window=sandbox") + + // Reagent containers + if("hsbreag") + if(!GLOB.hsboxspawn) return + + if(!reaginfo) + reaginfo = "Reagent Containers (Clothing) (Other Items)
" + var/list/all_items = subtypesof(/obj/item/reagent_containers) + for(var/typekey in spawn_forbidden) + all_items -= typesof(typekey) + for(var/O in reverseRange(all_items)) + reaginfo += "[O]
" + + usr << browse(reaginfo,"window=sandbox") + + // Other items + if("hsbobj") + if(!GLOB.hsboxspawn) return + + if(!objinfo) + objinfo = "Other Items (Clothing) (Reagent Containers)
" + var/list/all_items = subtypesof(/obj/item/) - typesof(/obj/item/clothing) - typesof(/obj/item/reagent_containers) + for(var/typekey in spawn_forbidden) + all_items -= typesof(typekey) + + for(var/O in reverseRange(all_items)) + objinfo += "[O]
" + + usr << browse(objinfo,"window=sandbox") + + // + // Safespawn checks to see if spawning is disabled. + // + if("hsb_safespawn") + if(!GLOB.hsboxspawn) + usr << browse(null,"window=sandbox") + return + + var/typepath = text2path(href_list["path"]) + if(!typepath) + to_chat(usr, "Bad path: \"[href_list["path"]]\"") + return + new typepath(usr.loc) + + if(CONFIG_GET(flag/sandbox_autoclose)) + usr << browse(null,"window=sandbox") + // + // For everything else in the href list + // + if("hsbspawn") + var/typepath = text2path(href_list["path"]) + if(!typepath) + to_chat(usr, "Bad path: \"[href_list["path"]]\"") + return + new typepath(usr.loc) + + if(CONFIG_GET(flag/sandbox_autoclose)) + usr << browse(null,"window=sandbox") diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index e69682a987..21169b8236 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -1,18 +1,21 @@ -/datum/game_mode/sandbox - name = "sandbox" - config_tag = "sandbox" - required_players = 0 - - announce_span = "info" - announce_text = "Build your own station... or just shoot each other!" - - allow_persistence_save = FALSE - -/datum/game_mode/sandbox/pre_setup() - for(var/mob/M in GLOB.player_list) - M.CanBuild() - return 1 - -/datum/game_mode/sandbox/post_setup() - ..() - SSshuttle.registerHostileEnvironment(src) +/datum/game_mode/sandbox + name = "sandbox" + config_tag = "sandbox" + required_players = 0 + + announce_span = "info" + announce_text = "Build your own station... or just shoot each other!" + + allow_persistence_save = FALSE + +/datum/game_mode/sandbox/pre_setup() + for(var/mob/M in GLOB.player_list) + M.CanBuild() + return 1 + +/datum/game_mode/sandbox/post_setup() + ..() + SSshuttle.registerHostileEnvironment(src) + +/datum/game_mode/sandbox/generate_report() + return "Sensors indicate that crewmembers have been all given psychic powers from which they can manifest various objects.
This can only end poorly." diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index 32d7da4072..858f21bd76 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -5,6 +5,7 @@ /datum/game_mode/traitor/internal_affairs name = "Internal Affairs" config_tag = "internal_affairs" + false_report_weight = 10 required_players = 25 required_enemies = 5 recommended_enemies = 8 @@ -75,3 +76,6 @@ late_joining_list -= M +/datum/game_mode/traitor/internal_affairs/generate_report() + return "Nanotrasen denies any accusations of placing internal affairs agents onboard your station to eliminate inconvenient employees. Any further accusations against Centcom for such \ + actions will be met with a conversation with an official internal affairs agent." diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 3b91816ee9..64d4f84eec 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -1,164 +1,166 @@ -/datum/game_mode - var/traitor_name = "traitor" - var/list/datum/mind/traitors = list() - - var/datum/mind/exchange_red - var/datum/mind/exchange_blue - -/datum/game_mode/traitor - name = "traitor" - config_tag = "traitor" - antag_flag = ROLE_TRAITOR - restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") - required_players = 0 - required_enemies = 1 - recommended_enemies = 4 - reroll_friendly = 1 - enemy_minimum_age = 0 - - announce_span = "danger" - announce_text = "There are Syndicate agents on the station!\n\ - Traitors: Accomplish your objectives.\n\ - Crew: Do not let the traitors succeed!" - - var/list/datum/mind/pre_traitors = list() - var/traitors_possible = 4 //hard limit on traitors if scaling is turned off - var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual. - var/antag_datum = ANTAG_DATUM_TRAITOR //what type of antag to create - - -/datum/game_mode/traitor/pre_setup() - - if(config.protect_roles_from_antagonist) - restricted_jobs += protected_jobs - - if(config.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 )) - else - num_traitors = max(1, min(num_players(), traitors_possible)) - - for(var/j = 0, j < num_traitors, j++) - if (!antag_candidates.len) - break - var/datum/mind/traitor = pick(antag_candidates) - pre_traitors += traitor - traitor.special_role = traitor_name - traitor.restricted_roles = restricted_jobs - log_game("[traitor.key] (ckey) has been selected as a [traitor_name]") - antag_candidates.Remove(traitor) - - - if(pre_traitors.len < required_enemies) - return 0 - return 1 - - -/datum/game_mode/traitor/post_setup() - for(var/datum/mind/traitor in pre_traitors) - spawn(rand(10,100)) - traitor.add_antag_datum(antag_datum) - if(!exchange_blue) - exchange_blue = -1 //Block latejoiners from getting exchange objectives - modePlayer += traitors - ..() - 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 ) +/datum/game_mode + var/traitor_name = "traitor" + var/list/datum/mind/traitors = list() + + var/datum/mind/exchange_red + var/datum/mind/exchange_blue + +/datum/game_mode/traitor + name = "traitor" + config_tag = "traitor" + antag_flag = ROLE_TRAITOR + false_report_weight = 20 //Reports of traitors are pretty common. + restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") + required_players = 0 + required_enemies = 1 + recommended_enemies = 4 + reroll_friendly = 1 + enemy_minimum_age = 0 + + announce_span = "danger" + announce_text = "There are Syndicate agents on the station!\n\ + Traitors: Accomplish your objectives.\n\ + Crew: Do not let the traitors succeed!" + + var/list/datum/mind/pre_traitors = list() + var/traitors_possible = 4 //hard limit on traitors if scaling is turned off + var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual. + var/antag_datum = ANTAG_DATUM_TRAITOR //what type of antag to create + + +/datum/game_mode/traitor/pre_setup() + + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + restricted_jobs += protected_jobs + + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) + restricted_jobs += "Assistant" + + var/num_traitors = 1 + + 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)) + + for(var/j = 0, j < num_traitors, j++) + if (!antag_candidates.len) + break + var/datum/mind/traitor = pick(antag_candidates) + pre_traitors += traitor + traitor.special_role = traitor_name + traitor.restricted_roles = restricted_jobs + log_game("[traitor.key] (ckey) has been selected as a [traitor_name]") + antag_candidates.Remove(traitor) + + return pre_traitors.len > 0 + + +/datum/game_mode/traitor/post_setup() + for(var/datum/mind/traitor in pre_traitors) + spawn(rand(10,100)) + traitor.add_antag_datum(antag_datum) + if(!exchange_blue) + exchange_blue = -1 //Block latejoiners from getting exchange objectives + modePlayer += traitors + ..() + return 1 + +/datum/game_mode/traitor/make_antag_chance(mob/living/carbon/human/character) //Assigns traitor to latejoiners + 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(ROLE_TRAITOR in character.client.prefs.be_special) - if(!jobban_isbanned(character, ROLE_TRAITOR) && !jobban_isbanned(character, "Syndicate")) - if(age_check(character.client)) - if(!(character.job in restricted_jobs)) - add_latejoin_traitor(character.mind) - -/datum/game_mode/traitor/proc/add_latejoin_traitor(datum/mind/character) - character.add_antag_datum(antag_datum) - - - -/datum/game_mode/traitor/declare_completion() - ..() - return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. - - -/datum/game_mode/proc/auto_declare_completion_traitor() - if(traitors.len) - var/text = "
The [traitor_name]s were:" - for(var/datum/mind/traitor in traitors) - var/traitorwin = 1 - - text += printplayer(traitor) - - var/TC_uses = 0 - var/uplink_true = 0 - var/purchases = "" - for(var/obj/item/device/uplink/H in GLOB.uplinks) - if(H && H.owner && H.owner == traitor.key) - TC_uses += H.spent_telecrystals - uplink_true = 1 - purchases += H.purchase_log - - var/objectives = "" - if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. - var/count = 1 - for(var/datum/objective/objective in traitor.objectives) - if(objective.check_completion()) - objectives += "
Objective #[count]: [objective.explanation_text] Success!" - SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS") - else - objectives += "
Objective #[count]: [objective.explanation_text] Fail." - SSblackbox.add_details("traitor_objective","[objective.type]|FAIL") - traitorwin = 0 - count++ - - if(uplink_true) - text += " (used [TC_uses] TC) [purchases]" - if(TC_uses==0 && traitorwin) - var/static/icon/badass = icon('icons/badass.dmi', "badass") + return + 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)) + if(!(character.job in restricted_jobs)) + add_latejoin_traitor(character.mind) + +/datum/game_mode/traitor/proc/add_latejoin_traitor(datum/mind/character) + character.add_antag_datum(antag_datum) + + + +/datum/game_mode/traitor/declare_completion() + ..() + return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. + + +/datum/game_mode/proc/auto_declare_completion_traitor() + if(traitors.len) + var/text = "
The [traitor_name]s were:" + for(var/datum/mind/traitor in traitors) + var/traitorwin = 1 + + text += printplayer(traitor) + + var/TC_uses = 0 + var/uplink_true = 0 + var/purchases = "" + for(var/obj/item/device/uplink/H in GLOB.uplinks) + if(H && H.owner && H.owner == traitor.key) + TC_uses += H.spent_telecrystals + uplink_true = 1 + purchases += H.purchase_log + + var/objectives = "" + if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. + var/count = 1 + for(var/datum/objective/objective in traitor.objectives) + if(objective.check_completion()) + objectives += "
Objective #[count]: [objective.explanation_text] Success!" + SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS") + else + objectives += "
Objective #[count]: [objective.explanation_text] Fail." + SSblackbox.add_details("traitor_objective","[objective.type]|FAIL") + traitorwin = 0 + count++ + + if(uplink_true) + text += " (used [TC_uses] TC) [purchases]" + if(TC_uses==0 && traitorwin) + var/static/icon/badass = icon('icons/badass.dmi', "badass") text += "[icon2html(badass, world)]" - - text += objectives - - var/special_role_text - if(traitor.special_role) - special_role_text = lowertext(traitor.special_role) - else - special_role_text = "antagonist" - - - if(traitorwin) - text += "
The [special_role_text] was successful!" - SSblackbox.add_details("traitor_success","SUCCESS") - else - text += "
The [special_role_text] has failed!" - SSblackbox.add_details("traitor_success","FAIL") - - text += "
" - - text += "
The code phrases were: [GLOB.syndicate_code_phrase]
\ - The code responses were: [GLOB.syndicate_code_response]
" - to_chat(world, text) - - return 1 - - - - -/datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind) - var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] - traitorhud.join_hud(traitor_mind.current) - set_antag_hud(traitor_mind.current, "traitor") - -/datum/game_mode/proc/update_traitor_icons_removed(datum/mind/traitor_mind) - var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] - traitorhud.leave_hud(traitor_mind.current) - set_antag_hud(traitor_mind.current, null) + + text += objectives + + var/special_role_text + if(traitor.special_role) + special_role_text = lowertext(traitor.special_role) + else + special_role_text = "antagonist" + + + if(traitorwin) + text += "
The [special_role_text] was successful!" + SSblackbox.add_details("traitor_success","SUCCESS") + else + text += "
The [special_role_text] has failed!" + SSblackbox.add_details("traitor_success","FAIL") + + text += "
" + + text += "
The code phrases were: [GLOB.syndicate_code_phrase]
\ + The code responses were: [GLOB.syndicate_code_response]
" + to_chat(world, text) + + return 1 + +/datum/game_mode/traitor/generate_report() + return "Although more specific threats are commonplace, you should always remain vigilant for Syndicate agents aboard your station. Syndicate communications have implied that many \ + Nanotrasen employees are Syndicate agents with hidden memories that may be activated at a moment's notice, so it's possible that these agents might not even know their positions." + + +/datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind) + var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] + traitorhud.join_hud(traitor_mind.current) + set_antag_hud(traitor_mind.current, "traitor") + +/datum/game_mode/proc/update_traitor_icons_removed(datum/mind/traitor_mind) + var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] + traitorhud.leave_hud(traitor_mind.current) + set_antag_hud(traitor_mind.current, null) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 59e4db9893..42d676c29b 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -8,7 +8,9 @@ desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." icon = 'icons/obj/wizard.dmi' icon_state = "render" - item_state = "render" + item_state = "knife" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' force = 15 throwforce = 10 w_class = WEIGHT_CLASS_NORMAL @@ -196,258 +198,6 @@ H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back) - -/////////////////////Multiverse Blade//////////////////// - -/obj/item/multisword - name = "multiverse sword" - desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "multiverse" - item_state = "multiverse" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - hitsound = 'sound/weapons/bladeslice.ogg' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - sharpness = IS_SHARP - force = 20 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - var/faction = list("unassigned") - var/cooldown = 0 - var/assigned = "unassigned" - var/static/list/multiverse = list() - -/obj/item/multisword/New() - ..() - multiverse += src - - -/obj/item/multisword/Destroy() - multiverse.Remove(src) - return ..() - -/obj/item/multisword/attack_self(mob/user) - if(user.mind.special_role == "apprentice") - to_chat(user, "You know better than to touch your teacher's stuff.") - return - if(cooldown < world.time) - var/faction_check = 0 - for(var/F in faction) - if(F in user.faction) - faction_check = 1 - break - if(faction_check == 0) - faction = list("[user.real_name]") - assigned = "[user.real_name]" - user.faction = list("[user.real_name]") - to_chat(user, "You bind the sword to yourself. You can now use it to summon help.") - if(!is_gangster(user)) - var/datum/gang/multiverse/G = new(src, "[user.real_name]") - SSticker.mode.gangs += G - G.bosses[user.mind] = 0 - G.add_gang_hud(user.mind) - user.mind.gang_datum = G - to_chat(user, "With your new found power you could easily conquer the station!") - var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone - hijack_objective.owner = user.mind - user.mind.objectives += hijack_objective - hijack_objective.explanation_text = "Ensure only [user.real_name] and their copies are on the shuttle!" - to_chat(user, "Objective #[1]: [hijack_objective.explanation_text]") - SSticker.mode.traitors += user.mind - user.mind.special_role = "[user.real_name] Prime" - else - var/list/candidates = get_candidates(ROLE_WIZARD) - if(candidates.len) - var/client/C = pick(candidates) - spawn_copy(C, get_turf(user.loc), user) - to_chat(user, "The sword flashes, and you find yourself face to face with...you!") - cooldown = world.time + 400 - for(var/obj/item/multisword/M in multiverse) - if(M.assigned == assigned) - M.cooldown = cooldown - - else - to_chat(user, "You fail to summon any copies of yourself. Perhaps you should try again in a bit.") - else - to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") - - -/obj/item/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) - var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) - C.prefs.copy_to(M, icon_updates=0) - M.key = C.key - M.mind.name = user.real_name - to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.") - SSticker.mode.add_gangster(M.mind, user.mind.gang_datum, FALSE) - M.real_name = user.real_name - M.name = user.real_name - M.faction = list("[user.real_name]") - if(prob(50)) - var/list/all_species = list() - for(var/speciestype in subtypesof(/datum/species)) - var/datum/species/S = speciestype - if(!initial(S.dangerous_existence)) - all_species += speciestype - M.set_species(pick(all_species), icon_update=0) - M.update_body() - M.update_hair() - M.update_body_parts() - M.dna.update_dna_identity() - equip_copy(M) - -/obj/item/multisword/proc/equip_copy(var/mob/living/carbon/human/M) - - var/obj/item/multisword/sword = new /obj/item/multisword - sword.assigned = assigned - sword.faction = list("[assigned]") - - var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator") - - switch(randomize) - if("mobster") - M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("roman") - var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - M.equip_to_slot_or_del(new hat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/roman(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes) - M.put_in_hands_or_del(new /obj/item/shield/riot/roman(M)) - M.put_in_hands_or_del(sword) - - if("wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) - M.put_in_hands_or_del(sword) - if("cyborg") - for(var/X in M.bodyparts) - var/obj/item/bodypart/affecting = X - affecting.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) - M.put_in_hands_or_del(sword) - - if("syndicate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),slot_wear_mask) - M.put_in_hands_or_del(sword) - - if("assistant") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes) - M.put_in_hands_or_del(sword) - - if("animu") - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl/red(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("cultist") - M.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.put_in_hands_or_del(sword) - - if("highlander") - M.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.put_in_hands_or_del(sword) - - if("clown") - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/bikehorn(M), slot_l_store) - M.put_in_hands_or_del(sword) - - if("killer") - M.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), slot_l_store) - M.equip_to_slot_or_del(new /obj/item/scalpel(M), slot_r_store) - M.put_in_hands_or_del(sword) - for(var/obj/item/carried_item in M.get_equipped_items()) - carried_item.add_mob_blood(M) - for(var/obj/item/I in M.held_items) - I.add_mob_blood(M) - if("pirate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.put_in_hands_or_del(sword) - - if("soviet") - M.equip_to_slot_or_del(new /obj/item/clothing/head/pirate/captain(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate/captain(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("officer") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.put_in_hands_or_del(sword) - - if("gladiator") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/gladiator(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.put_in_hands_or_del(sword) - - - else - return - - M.update_body_parts() - - var/obj/item/card/id/W = new /obj/item/card/id - W.icon_state = "centcom" - W.access += ACCESS_MAINT_TUNNELS - W.assignment = "Multiverse Traveller" - W.registered_name = M.real_name - W.update_label(M.real_name) - M.equip_to_slot_or_del(W, slot_wear_id) - - /obj/item/voodoo name = "wicker doll" desc = "Something creepy about it." @@ -484,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 130839a373..df57ded774 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -119,7 +119,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 +164,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 @@ -237,6 +237,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 2d18c1f9e9..5e22aaac42 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) @@ -553,7 +553,7 @@ to_chat(user, "It appears to have no author.") /obj/item/spellbook/Initialize() - ..() + . = ..() prepare_spells() /obj/item/spellbook/proc/prepare_spells() diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index b342ab4009..8256d0aaf0 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -6,6 +6,7 @@ name = "wizard" config_tag = "wizard" antag_flag = ROLE_WIZARD + false_report_weight = 10 required_players = 20 required_enemies = 1 recommended_enemies = 1 @@ -29,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 @@ -46,6 +47,10 @@ ..() return +/datum/game_mode/wizard/generate_report() + return "A dangerous Wizards' Federation individual by the name of [pick(GLOB.wizard_first)] [pick(GLOB.wizard_second)] has recently escaped confinement from an unlisted prison facility. This \ + man is a dangerous mutant with the ability to alter himself and the world around him by what he and his leaders believe to be magic. If this man attempts an attack on your station, \ + his execution is highly encouraged, as is the preservation of his body for later study." /datum/game_mode/proc/forge_wizard_objectives(datum/mind/wizard) switch(rand(1,100)) @@ -240,15 +245,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 80400fee05..48eafce3c5 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 16485c1c7b..94025dae31 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -1,198 +1,226 @@ -/obj/machinery/sleep_console - name = "sleeper console" - icon = 'icons/obj/Cryogenic2.dmi' - icon_state = "console" - density = FALSE - anchored = TRUE - -/obj/machinery/sleeper - name = "sleeper" - desc = "An enclosed machine used to stabilize and heal patients." - icon = 'icons/obj/Cryogenic2.dmi' - icon_state = "sleeper" - density = FALSE - anchored = TRUE - state_open = TRUE +/obj/machinery/sleep_console + name = "sleeper console" + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "console" + density = FALSE + anchored = TRUE + +/obj/machinery/sleeper + name = "sleeper" + desc = "An enclosed machine used to stabilize and heal patients." + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "sleeper" + density = FALSE + anchored = TRUE + state_open = TRUE circuit = /obj/item/circuitboard/machine/sleeper - var/efficiency = 1 - var/min_health = -25 - var/list/available_chems - var/controls_inside = FALSE - var/list/possible_chems = list( - list("epinephrine", "morphine", "salbutamol", "bicaridine", "kelotane"), - list("oculine","inacusiate"), - list("antitoxin", "mutadone", "mannitol", "pen_acid"), - list("omnizine") - ) - 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/efficiency = 1 + var/min_health = -25 + var/list/available_chems + var/controls_inside = FALSE + var/list/possible_chems = list( + list("epinephrine", "morphine", "salbutamol", "bicaridine", "kelotane"), + list("oculine","inacusiate"), + list("antitoxin", "mutadone", "mannitol", "pen_acid"), + list("omnizine") + ) + 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() . = ..() - update_icon() - reset_chem_buttons() - -/obj/machinery/sleeper/RefreshParts() - var/E - for(var/obj/item/stock_parts/matter_bin/B in component_parts) - E += B.rating - var/I - for(var/obj/item/stock_parts/manipulator/M in component_parts) - I += M.rating - - efficiency = initial(efficiency)* E - min_health = initial(min_health) * E - available_chems = list() - for(var/i in 1 to I) - available_chems |= possible_chems[i] - reset_chem_buttons() - -/obj/machinery/sleeper/update_icon() - icon_state = initial(icon_state) - if(state_open) - icon_state += "-open" - -/obj/machinery/sleeper/container_resist(mob/living/user) - visible_message("[occupant] emerges from [src]!", - "You climb out of [src]!") - open_machine() - -/obj/machinery/sleeper/relaymove(mob/user) - container_resist(user) - -/obj/machinery/sleeper/open_machine() - if(!state_open && !panel_open) - ..() - -/obj/machinery/sleeper/close_machine(mob/user) - if((isnull(user) || istype(user)) && state_open && !panel_open) - ..(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.") - -/obj/machinery/sleeper/emp_act(severity) - if(is_operational() && occupant) - open_machine() - ..(severity) - -/obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user) - if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) - return - close_machine(target) - -/obj/machinery/sleeper/attackby(obj/item/I, mob/user, params) - if(!state_open && !occupant) - if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I)) - return - if(default_change_direction_wrench(user, I)) - return - if(exchange_parts(user, I)) - return - if(default_pry_open(I)) - return - if(default_deconstruction_crowbar(I)) - return - return ..() - + update_icon() + reset_chem_buttons() + +/obj/machinery/sleeper/RefreshParts() + var/E + for(var/obj/item/stock_parts/matter_bin/B in component_parts) + E += B.rating + var/I + for(var/obj/item/stock_parts/manipulator/M in component_parts) + I += M.rating + + efficiency = initial(efficiency)* E + min_health = initial(min_health) * E + available_chems = list() + for(var/i in 1 to I) + available_chems |= possible_chems[i] + reset_chem_buttons() + +/obj/machinery/sleeper/update_icon() + icon_state = initial(icon_state) + if(state_open) + icon_state += "-open" + +/obj/machinery/sleeper/container_resist(mob/living/user) + visible_message("[occupant] emerges from [src]!", + "You climb out of [src]!") + open_machine() + +/obj/machinery/sleeper/relaymove(mob/user) + container_resist(user) + +/obj/machinery/sleeper/open_machine() + if(!state_open && !panel_open) + ..() + +/obj/machinery/sleeper/close_machine(mob/user) + if((isnull(user) || istype(user)) && state_open && !panel_open) + ..(user) + var/mob/living/mob_occupant = occupant + if(mob_occupant && mob_occupant.stat != DEAD) + to_chat(occupant, "[enter_message]") + +/obj/machinery/sleeper/emp_act(severity) + if(is_operational() && occupant) + open_machine() + ..(severity) + +/obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) + return + close_machine(target) + +/obj/machinery/sleeper/attackby(obj/item/I, mob/user, params) + if(!state_open && !occupant) + if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I)) + return + if(default_change_direction_wrench(user, I)) + return + if(exchange_parts(user, I)) + return + if(default_pry_open(I)) + return + if(default_deconstruction_crowbar(I)) + return + return ..() + /obj/machinery/sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ - datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state) - - if(controls_inside && state == GLOB.notcontained_state) - state = GLOB.default_state // If it has a set of controls on the inside, make it actually controllable by the mob in it. - - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "sleeper", name, 375, 550, master_ui, state) - ui.open() - -/obj/machinery/sleeper/ui_data() - var/list/data = list() - data["occupied"] = occupant ? 1 : 0 - data["open"] = state_open - - data["chems"] = list() - for(var/chem in available_chems) - var/datum/reagent/R = GLOB.chemical_reagents_list[chem] - data["chems"] += list(list("name" = R.name, "id" = R.id, "allowed" = chem_allowed(chem))) - - data["occupant"] = list() - var/mob/living/mob_occupant = occupant - if(mob_occupant) - data["occupant"]["name"] = mob_occupant.name - data["occupant"]["stat"] = mob_occupant.stat - data["occupant"]["health"] = mob_occupant.health - data["occupant"]["maxHealth"] = mob_occupant.maxHealth - data["occupant"]["minHealth"] = HEALTH_THRESHOLD_DEAD - data["occupant"]["bruteLoss"] = mob_occupant.getBruteLoss() - data["occupant"]["oxyLoss"] = mob_occupant.getOxyLoss() - data["occupant"]["toxLoss"] = mob_occupant.getToxLoss() - data["occupant"]["fireLoss"] = mob_occupant.getFireLoss() - data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss() - data["occupant"]["brainLoss"] = mob_occupant.getBrainLoss() - data["occupant"]["reagents"] = list() - if(occupant.reagents.reagent_list.len) - for(var/datum/reagent/R in mob_occupant.reagents.reagent_list) - data["occupant"]["reagents"] += list(list("name" = R.name, "volume" = R.volume)) - return data - -/obj/machinery/sleeper/ui_act(action, params) - if(..()) - return - var/mob/living/mob_occupant = occupant - - switch(action) - if("door") - if(state_open) - close_machine() - else - open_machine() - . = TRUE - if("inject") - var/chem = params["chem"] - if(!is_operational() || !mob_occupant) - return - if(mob_occupant.health < min_health && chem != "epinephrine") - return - if(inject_chem(chem)) - . = TRUE - if(scrambled_chems && prob(5)) - to_chat(usr, "Chem System Re-route detected, results may not be as expected!") - -/obj/machinery/sleeper/emag_act(mob/user) - scramble_chem_buttons() - to_chat(user, "You scramble the sleepers user interface!") - -/obj/machinery/sleeper/proc/inject_chem(chem) - if((chem in available_chems) && chem_allowed(chem)) - occupant.reagents.add_reagent(chem_buttons[chem], 10) //emag effect kicks in here so that the "intended" chem is used for all checks, for extra FUUU - return TRUE - -/obj/machinery/sleeper/proc/chem_allowed(chem) - var/mob/living/mob_occupant = occupant - if(!mob_occupant) - return - var/amount = mob_occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency - var/occ_health = mob_occupant.health > min_health || chem == "epinephrine" - return amount && occ_health - -/obj/machinery/sleeper/proc/reset_chem_buttons() - scrambled_chems = FALSE - LAZYINITLIST(chem_buttons) - for(var/chem in available_chems) - chem_buttons[chem] = chem - -/obj/machinery/sleeper/proc/scramble_chem_buttons() - scrambled_chems = TRUE - var/list/av_chem = available_chems.Copy() - for(var/chem in av_chem) - chem_buttons[chem] = pick_n_take(av_chem) //no dupes, allow for random buttons to still be correct - - -/obj/machinery/sleeper/syndie - icon_state = "sleeper_s" - controls_inside = TRUE - - -/obj/machinery/sleeper/old - icon_state = "oldpod" + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state) + + if(controls_inside && state == GLOB.notcontained_state) + state = GLOB.default_state // If it has a set of controls on the inside, make it actually controllable by the mob in it. + + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "sleeper", name, 375, 550, master_ui, state) + ui.open() + +/obj/machinery/sleeper/ui_data() + var/list/data = list() + data["occupied"] = occupant ? 1 : 0 + data["open"] = state_open + + data["chems"] = list() + for(var/chem in available_chems) + var/datum/reagent/R = GLOB.chemical_reagents_list[chem] + data["chems"] += list(list("name" = R.name, "id" = R.id, "allowed" = chem_allowed(chem))) + + data["occupant"] = list() + var/mob/living/mob_occupant = occupant + if(mob_occupant) + data["occupant"]["name"] = mob_occupant.name + switch(mob_occupant.stat) + if(CONSCIOUS) + data["occupant"]["stat"] = "Conscious" + data["occupant"]["statstate"] = "good" + if(SOFT_CRIT) + data["occupant"]["stat"] = "Conscious" + data["occupant"]["statstate"] = "average" + if(UNCONSCIOUS) + data["occupant"]["stat"] = "Unconscious" + data["occupant"]["statstate"] = "average" + if(DEAD) + data["occupant"]["stat"] = "Dead" + data["occupant"]["statstate"] = "bad" + data["occupant"]["health"] = mob_occupant.health + data["occupant"]["maxHealth"] = mob_occupant.maxHealth + data["occupant"]["minHealth"] = HEALTH_THRESHOLD_DEAD + data["occupant"]["bruteLoss"] = mob_occupant.getBruteLoss() + data["occupant"]["oxyLoss"] = mob_occupant.getOxyLoss() + data["occupant"]["toxLoss"] = mob_occupant.getToxLoss() + data["occupant"]["fireLoss"] = mob_occupant.getFireLoss() + data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss() + data["occupant"]["brainLoss"] = mob_occupant.getBrainLoss() + data["occupant"]["reagents"] = list() + if(occupant.reagents.reagent_list.len) + for(var/datum/reagent/R in mob_occupant.reagents.reagent_list) + data["occupant"]["reagents"] += list(list("name" = R.name, "volume" = R.volume)) + return data + +/obj/machinery/sleeper/ui_act(action, params) + if(..()) + return + var/mob/living/mob_occupant = occupant + + switch(action) + if("door") + if(state_open) + close_machine() + else + open_machine() + . = TRUE + if("inject") + var/chem = params["chem"] + if(!is_operational() || !mob_occupant) + return + if(mob_occupant.health < min_health && chem != "epinephrine") + return + if(inject_chem(chem)) + . = TRUE + if(scrambled_chems && prob(5)) + to_chat(usr, "Chem System Re-route detected, results may not be as expected!") + +/obj/machinery/sleeper/emag_act(mob/user) + scramble_chem_buttons() + to_chat(user, "You scramble the sleepers user interface!") + +/obj/machinery/sleeper/proc/inject_chem(chem) + if((chem in available_chems) && chem_allowed(chem)) + occupant.reagents.add_reagent(chem_buttons[chem], 10) //emag effect kicks in here so that the "intended" chem is used for all checks, for extra FUUU + return TRUE + +/obj/machinery/sleeper/proc/chem_allowed(chem) + var/mob/living/mob_occupant = occupant + if(!mob_occupant) + return + var/amount = mob_occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency + var/occ_health = mob_occupant.health > min_health || chem == "epinephrine" + return amount && occ_health + +/obj/machinery/sleeper/proc/reset_chem_buttons() + scrambled_chems = FALSE + LAZYINITLIST(chem_buttons) + for(var/chem in available_chems) + chem_buttons[chem] = chem + +/obj/machinery/sleeper/proc/scramble_chem_buttons() + scrambled_chems = TRUE + var/list/av_chem = available_chems.Copy() + for(var/chem in av_chem) + chem_buttons[chem] = pick_n_take(av_chem) //no dupes, allow for random buttons to still be correct + + +/obj/machinery/sleeper/syndie + 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 1002b1f6dc..23b398605c 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -35,13 +35,12 @@ Class Variables: Next uid value in sequence stat (bitflag) - Machine status bit flags_1. - Possible bit flags_1: - BROKEN:1 -- Machine is broken - NOPOWER:2 -- No power is being supplied to machine. - POWEROFF:4 -- tbd - MAINT:8 -- machine is currently under going maintenance. - EMPED:16 -- temporary broken by EMP pulse + Machine status bit flags. + Possible bit flags: + BROKEN -- Machine is broken + NOPOWER -- No power is being supplied to machine. + MAINT -- machine is currently under going maintenance. + EMPED -- temporary broken by EMP pulse Class Procs: Initialize() 'game/machinery/machine.dm' @@ -96,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 @@ -430,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 4f691e053f..8a4c854d76 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 69ccb4240a..b5175b215f 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -20,28 +20,28 @@ close(1) if("unlock") - locked = FALSE + locked = FALSE update_icon() if("lock") - locked = TRUE + locked = TRUE update_icon() if("secure_open") - locked = FALSE + locked = FALSE update_icon() sleep(2) open(1) - locked = TRUE + locked = TRUE update_icon() if("secure_close") - locked = FALSE + locked = FALSE close(1) - locked = TRUE + locked = TRUE sleep(2) update_icon() @@ -88,7 +88,7 @@ name = "airlock sensor" resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - anchored = TRUE + anchored = TRUE power_channel = ENVIRON var/id_tag @@ -97,8 +97,8 @@ var/datum/radio_frequency/radio_connection - var/on = TRUE - var/alert = FALSE + var/on = TRUE + var/alert = FALSE /obj/machinery/airlock_sensor/update_icon() @@ -143,9 +143,9 @@ radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_AIRLOCK) /obj/machinery/airlock_sensor/Initialize() - ..() + . = ..() set_frequency(frequency) /obj/machinery/airlock_sensor/Destroy() - SSradio.remove_object(src,frequency) + SSradio.remove_object(src,frequency) return ..() \ No newline at end of file diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index ff072fd010..299b0500ce 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 c185a8f734..4894952a69 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -32,8 +32,6 @@ var/selected_category var/screen = 1 - var/datum/material_container/materials - var/list/categories = list( "Tools", "Electronics", @@ -48,15 +46,15 @@ ) /obj/machinery/autolathe/Initialize() - materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS)) + AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS)) + . = ..() + wires = new /datum/wires/autolathe(src) files = new /datum/research/autolathe(src) matching_designs = list() - return ..() /obj/machinery/autolathe/Destroy() QDEL_NULL(wires) - QDEL_NULL(materials) return ..() /obj/machinery/autolathe/interact(mob/user) @@ -81,6 +79,7 @@ popup.open() /obj/machinery/autolathe/on_deconstruction() + GET_COMPONENT(materials, /datum/component/material_container) materials.retrieve_all() /obj/machinery/autolathe/attackby(obj/item/O, mob/user, params) @@ -123,42 +122,25 @@ busy = FALSE return 1 - if(O.flags_2 & HOLOGRAM_2) - return 1 + return ..() - var/material_amount = materials.get_item_material_amount(O) - if(!material_amount) - to_chat(user, "This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe.") - return 1 - if(!materials.has_space(material_amount)) - to_chat(user, "The autolathe is full. Please remove metal or glass from the autolathe in order to insert more.") - return 1 - if(!user.temporarilyRemoveItemFromInventory(O)) - to_chat(user, "\The [O] is stuck to you and cannot be placed into the autolathe.") - return 1 - - busy = TRUE - var/inserted = materials.insert_item(O) - if(inserted) - if(istype(O, /obj/item/stack)) - if (O.materials[MAT_METAL]) - flick("autolathe_o",src)//plays metal insertion animation - if (O.materials[MAT_GLASS]) - flick("autolathe_r",src)//plays glass insertion animation - to_chat(user, "You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.") - use_power(inserted*100) - if(!QDELETED(O)) - user.put_in_active_hand(O) +/obj/machinery/mecha_part_fabricator/ComponentActivated(datum/component/C) + ..() + if(istype(C, /datum/component/material_container)) + var/datum/component/material_container/M = C + if(!M.last_insert_success) + return + var/lit = M.last_inserted_type + if(ispath(lit, /obj/item/ore/bluespace_crystal)) + use_power(max(500,M.last_amount_inserted/10)) else - to_chat(user, "You insert a material total of [inserted] to the autolathe.") - use_power(max(500,inserted/10)) - qdel(O) - else - user.put_in_active_hand(O) - - busy = FALSE - updateUsrDialog() - return 1 + 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() /obj/machinery/autolathe/Topic(href, href_list) if(..()) @@ -193,6 +175,7 @@ var/power = max(2000, (metal_cost+glass_cost)*multiplier/5) + GET_COMPONENT(materials, /datum/component/material_container) if((materials.amount(MAT_METAL) >= metal_cost*multiplier*coeff) && (materials.amount(MAT_GLASS) >= glass_cost*multiplier*coeff)) busy = TRUE use_power(power) @@ -246,6 +229,7 @@ var/T = 0 for(var/obj/item/stock_parts/matter_bin/MB in component_parts) T += MB.rating*75000 + GET_COMPONENT(materials, /datum/component/material_container) materials.max_amount = T T=1.2 for(var/obj/item/stock_parts/manipulator/M in component_parts) @@ -294,6 +278,7 @@ dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) + GET_COMPONENT(materials, /datum/component/material_container) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) dat += " x10" @@ -325,6 +310,7 @@ dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) + GET_COMPONENT(materials, /datum/component/material_container) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) dat += " x10" @@ -339,6 +325,7 @@ return dat /obj/machinery/autolathe/proc/materials_printout() + GET_COMPONENT(materials, /datum/component/material_container) var/dat = "Total amount: [materials.total_amount] / [materials.max_amount] cm3
" for(var/mat_id in materials.materials) var/datum/material/M = materials.materials[mat_id] @@ -351,6 +338,7 @@ var/coeff = (ispath(D.build_path, /obj/item/stack) ? 1 : prod_coeff) + GET_COMPONENT(materials, /datum/component/material_container) if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] * coeff * amount))) return 0 if(D.materials[MAT_GLASS] && (materials.amount(MAT_GLASS) < (D.materials[MAT_GLASS] * coeff * amount))) diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index de07fc9c2d..9d446aa77c 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 10e10e878a..8a118b8d08 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -105,8 +105,8 @@ /obj/machinery/button/emag_act(mob/user) if(emagged) return - req_access = null - req_one_access = null + req_access = list() + req_one_access = list() playsound(src, "sparks", 100, 1) emagged = TRUE @@ -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 d56837b9ef..7d3c40a0d9 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) @@ -47,7 +49,7 @@ GLOB.cameranet.addCamera(src) proximity_monitor = new(src, 1) - if(mapload && z == ZLEVEL_STATION && prob(3) && !start_active) + if(mapload && (z in GLOB.station_z_levels) && prob(3) && !start_active) toggle_cam() /obj/machinery/camera/Destroy() @@ -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 340277b441..1e6fe4c532 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -1,145 +1,145 @@ -/obj/item/wallframe/camera - name = "camera assembly" - desc = "The basic construction for Nanotrasen-Always-Watching-You cameras." - icon = 'icons/obj/monitors.dmi' - icon_state = "cameracase" - materials = list(MAT_METAL=400, MAT_GLASS=250) - result_path = /obj/structure/camera_assembly - - -/obj/structure/camera_assembly - name = "camera assembly" - desc = "The basic construction for Nanotrasen-Always-Watching-You cameras." - icon = 'icons/obj/monitors.dmi' - icon_state = "camera1" - max_integrity = 150 - // Motion, EMP-Proof, X-Ray - var/static/list/possible_upgrades = typecacheof(list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/device/analyzer)) - var/list/upgrades - var/state = 1 - - /* - 1 = Wrenched in place - 2 = Welded in place - 3 = Wires attached to it (you can now attach/dettach upgrades) - 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades) - */ - -/obj/structure/camera_assembly/Initialize(mapload, ndir, building) - . = ..() - if(building) - setDir(ndir) - upgrades = list() - -/obj/structure/camera_assembly/Destroy() - QDEL_LIST(upgrades) - return ..() - -/obj/structure/camera_assembly/attackby(obj/item/W, mob/living/user, params) - switch(state) - if(1) - // State 1 - if(istype(W, /obj/item/weldingtool)) - if(weld(W, user)) - to_chat(user, "You weld the assembly securely into place.") +/obj/item/wallframe/camera + name = "camera assembly" + desc = "The basic construction for Nanotrasen-Always-Watching-You cameras." + icon = 'icons/obj/monitors.dmi' + icon_state = "cameracase" + materials = list(MAT_METAL=400, MAT_GLASS=250) + result_path = /obj/structure/camera_assembly + + +/obj/structure/camera_assembly + name = "camera assembly" + desc = "The basic construction for Nanotrasen-Always-Watching-You cameras." + icon = 'icons/obj/monitors.dmi' + icon_state = "camera1" + max_integrity = 150 + // Motion, EMP-Proof, X-Ray + var/static/list/possible_upgrades = typecacheof(list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/device/analyzer)) + var/list/upgrades + var/state = 1 + + /* + 1 = Wrenched in place + 2 = Welded in place + 3 = Wires attached to it (you can now attach/dettach upgrades) + 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades) + */ + +/obj/structure/camera_assembly/Initialize(mapload, ndir, building) + . = ..() + if(building) + setDir(ndir) + upgrades = list() + +/obj/structure/camera_assembly/Destroy() + QDEL_LIST(upgrades) + return ..() + +/obj/structure/camera_assembly/attackby(obj/item/W, mob/living/user, params) + switch(state) + if(1) + // State 1 + if(istype(W, /obj/item/weldingtool)) + if(weld(W, user)) + to_chat(user, "You weld the assembly securely into place.") anchored = TRUE - state = 2 - return - - else if(istype(W, /obj/item/wrench)) - playsound(src.loc, W.usesound, 50, 1) - to_chat(user, "You unattach the assembly from its place.") - new /obj/item/wallframe/camera(get_turf(src)) - qdel(src) - return - - if(2) - // State 2 - if(istype(W, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/C = W - if(C.use(2)) - to_chat(user, "You add wires to the assembly.") - state = 3 - else - to_chat(user, "You need two lengths of cable to wire a camera!") - return - return - - else if(istype(W, /obj/item/weldingtool)) - - if(weld(W, user)) - to_chat(user, "You unweld the assembly from its place.") - state = 1 + state = 2 + return + + else if(istype(W, /obj/item/wrench)) + playsound(src.loc, W.usesound, 50, 1) + to_chat(user, "You unattach the assembly from its place.") + new /obj/item/wallframe/camera(get_turf(src)) + qdel(src) + return + + if(2) + // State 2 + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = W + if(C.use(2)) + to_chat(user, "You add wires to the assembly.") + state = 3 + else + to_chat(user, "You need two lengths of cable to wire a camera!") + return + return + + else if(istype(W, /obj/item/weldingtool)) + + if(weld(W, user)) + to_chat(user, "You unweld the assembly from its place.") + state = 1 anchored = TRUE - return - - - if(3) - // State 3 - if(istype(W, /obj/item/screwdriver)) - playsound(src.loc, W.usesound, 50, 1) - + return + + + if(3) + // State 3 + if(istype(W, /obj/item/screwdriver)) + playsound(src.loc, W.usesound, 50, 1) + var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") - if(!input) - to_chat(user, "No input found, please hang up and try your call again!") - return - - var/list/tempnetwork = splittext(input, ",") - if(tempnetwork.len < 1) - to_chat(user, "No network found, please hang up and try your call again!") - return - - state = 4 - var/obj/machinery/camera/C = new(src.loc) - src.loc = C - C.assembly = src - C.setDir(src.dir) - - C.network = tempnetwork - var/area/A = get_area(src) - C.c_tag = "[A.name] ([rand(1, 999)])" - - - else if(istype(W, /obj/item/wirecutters)) - new/obj/item/stack/cable_coil(get_turf(src), 2) - playsound(src.loc, W.usesound, 50, 1) - to_chat(user, "You cut the wires from the circuits.") - state = 2 - return - - // Upgrades! - if(is_type_in_typecache(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. - if(!user.drop_item(W)) - return - to_chat(user, "You attach \the [W] into the assembly inner circuits.") - upgrades += W - W.forceMove(src) - return - - // Taking out upgrades - else if(istype(W, /obj/item/crowbar) && upgrades.len) - var/obj/U = locate(/obj) in upgrades - if(U) - to_chat(user, "You unattach an upgrade from the assembly.") - playsound(src.loc, W.usesound, 50, 1) - U.loc = get_turf(src) - upgrades -= U - return - - return ..() - -/obj/structure/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/living/user) - if(!WT.remove_fuel(0, user)) - return 0 - to_chat(user, "You start to weld \the [src]...") - playsound(src.loc, WT.usesound, 50, 1) - if(do_after(user, 20*WT.toolspeed, target = src)) - if(WT.isOn()) - playsound(loc, 'sound/items/welder2.ogg', 50, 1) - return 1 - return 0 - -/obj/structure/camera_assembly/deconstruct(disassembled = TRUE) + if(!input) + to_chat(user, "No input found, please hang up and try your call again!") + return + + var/list/tempnetwork = splittext(input, ",") + if(tempnetwork.len < 1) + to_chat(user, "No network found, please hang up and try your call again!") + return + + state = 4 + var/obj/machinery/camera/C = new(src.loc) + forceMove(C) + C.assembly = src + C.setDir(src.dir) + + C.network = tempnetwork + var/area/A = get_area(src) + C.c_tag = "[A.name] ([rand(1, 999)])" + + + else if(istype(W, /obj/item/wirecutters)) + new/obj/item/stack/cable_coil(get_turf(src), 2) + playsound(src.loc, W.usesound, 50, 1) + to_chat(user, "You cut the wires from the circuits.") + state = 2 + return + + // Upgrades! + if(is_type_in_typecache(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. + if(!user.drop_item(W)) + return + to_chat(user, "You attach \the [W] into the assembly inner circuits.") + upgrades += W + W.forceMove(src) + return + + // Taking out upgrades + else if(istype(W, /obj/item/crowbar) && upgrades.len) + var/obj/U = locate(/obj) in upgrades + if(U) + to_chat(user, "You unattach an upgrade from the assembly.") + playsound(src.loc, W.usesound, 50, 1) + U.forceMove(drop_location()) + upgrades -= U + return + + return ..() + +/obj/structure/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/living/user) + if(!WT.remove_fuel(0, user)) + return 0 + to_chat(user, "You start to weld \the [src]...") + playsound(src.loc, WT.usesound, 50, 1) + if(do_after(user, 20*WT.toolspeed, target = src)) + if(WT.isOn()) + playsound(loc, 'sound/items/welder2.ogg', 50, 1) + return 1 + return 0 + +/obj/structure/camera_assembly/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc) - qdel(src) + new /obj/item/stack/sheet/metal(loc) + qdel(src) diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 6f205a870d..864ab2bff2 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -24,7 +24,7 @@ name = "motion-sensitive security camera" /obj/machinery/camera/motion/Initialize() - ..() + . = ..() upgradeMotion() // ALL UPGRADES diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 1df8fc11e6..036b6f1f61 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -2,7 +2,7 @@ track.cameras.Cut() - if(src.stat == 2) + if(src.stat == DEAD) return var/list/L = list() @@ -45,7 +45,7 @@ track.humans.Cut() track.others.Cut() - if(usr.stat == 2) + if(usr.stat == DEAD) return list() for(var/mob/living/M in GLOB.mob_list) @@ -58,12 +58,12 @@ human = 1 var/name = M.name - while(name in track.names) + while(name in track.names) track.namecounts[name]++ name = text("[] ([])", name, track.namecounts[name]) - track.names.Add(name) - track.namecounts[name] = 1 - + track.names.Add(name) + track.namecounts[name] = 1 + if(human) track.humans[name] = M else @@ -136,9 +136,9 @@ /proc/near_camera(mob/living/M) if (!isturf(M.loc)) return 0 - if(issilicon(M)) - var/mob/living/silicon/S = M - if((!QDELETED(S.builtInCamera) || !S.builtInCamera.can_use()) && !GLOB.cameranet.checkCameraVis(M)) + if(issilicon(M)) + var/mob/living/silicon/S = M + if((!QDELETED(S.builtInCamera) || !S.builtInCamera.can_use()) && !GLOB.cameranet.checkCameraVis(M)) return 0 else if(!GLOB.cameranet.checkCameraVis(M)) return 0 diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 3f95d2a780..63c63ce120 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 7ea954a671..86e69b8973 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -218,6 +218,7 @@ if(!is_operational()) //Autoeject if power is lost if(mob_occupant) go_out() + mob_occupant.apply_vore_prefs() connected_message("Clone Ejected: Loss of power.") else if(mob_occupant && (mob_occupant.loc == src)) @@ -226,12 +227,13 @@ SPEAK("The cloning of [mob_occupant.real_name] has been \ aborted due to unrecoverable tissue failure.") go_out() + mob_occupant.apply_vore_prefs() 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 +251,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() @@ -270,6 +272,7 @@ BP.attach_limb(mob_occupant) go_out() + mob_occupant.apply_vore_prefs() else if (!mob_occupant || mob_occupant.loc != src) occupant = null @@ -392,6 +395,9 @@ QDEL_IN(mob_occupant, 40) /obj/machinery/clonepod/relaymove(mob/user) + container_resist() + +/obj/machinery/clonepod/container_resist(mob/living/user) if(user.stat == CONSCIOUS) go_out() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 2033fd7146..a8e9c7bcca 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -4,17 +4,17 @@ icon_screen = "crew" icon_keyboard = "med_key" circuit = /obj/item/circuitboard/computer/operating - var/mob/living/carbon/human/patient - var/obj/structure/table/optable/table + var/mob/living/carbon/human/patient + var/obj/structure/table/optable/table light_color = LIGHT_COLOR_BLUE /obj/machinery/computer/operating/Initialize() - ..() + . = ..() find_table() /obj/machinery/computer/operating/proc/find_table() - for(var/dir in GLOB.cardinals) + for(var/dir in GLOB.cardinals) table = locate(/obj/structure/table/optable, get_step(src, dir)) if(table) table.computer = src @@ -63,4 +63,4 @@ var/datum/surgery_step/surgery_step = procedure.get_surgery_step() dat += "Next step: [capitalize(surgery_step.name)]
" dat += "
Stored AI: [src.occupier.name]
" - dat += "System integrity: [(src.occupier.health+100)/2]%" - - if (src.occupier.laws.zeroth) - laws += "0: [src.occupier.laws.zeroth]
" - - for (var/index = 1, index <= src.occupier.laws.ion.len, index++) - var/law = src.occupier.laws.ion[index] - if (length(law) > 0) - var/num = ionnum() - laws += "[num]: [law]
" - - var/number = 1 - for (var/index = 1, index <= src.occupier.laws.inherent.len, index++) - var/law = src.occupier.laws.inherent[index] - if (length(law) > 0) - laws += "[number]: [law]
" - number++ - - for (var/index = 1, index <= src.occupier.laws.supplied.len, index++) - var/law = src.occupier.laws.supplied[index] - if (length(law) > 0) - laws += "[number]: [law]
" - number++ - - dat += "Laws:
[laws]
" - - if (src.occupier.stat == 2) - dat += "AI non-functional" - else - dat += "AI functional" - if (!src.active) - dat += {"
Begin Reconstruction"} - else - dat += "
Reconstruction in process, please wait.
" - dat += {"
Close"} - var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - -/obj/machinery/computer/aifixer/proc/Fix() - use_power(1000) - occupier.adjustOxyLoss(-1, 0) - occupier.adjustFireLoss(-1, 0) - occupier.adjustToxLoss(-1, 0) - occupier.adjustBruteLoss(-1, 0) - occupier.updatehealth() - occupier.updatehealth() - if(occupier.health >= 0 && occupier.stat == DEAD) - occupier.revive() - return occupier.health < 100 - -/obj/machinery/computer/aifixer/process() - if(..()) - if(active) - active = Fix() - updateDialog() - update_icon() - -/obj/machinery/computer/aifixer/Topic(href, href_list) - if(..()) - return - if(href_list["fix"]) - to_chat(usr, "Reconstruction in progress. This will take several minutes.") - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) - active = TRUE - add_fingerprint(usr) - -/obj/machinery/computer/aifixer/update_icon() - ..() - if(stat & (NOPOWER|BROKEN)) - return - else - if(active) - add_overlay("ai-fixer-on") - if (occupier) - switch (occupier.stat) - if (0) - add_overlay("ai-fixer-full") - if (2) - add_overlay("ai-fixer-404") - else - add_overlay("ai-fixer-empty") - -/obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) - if(!..()) - return - //Downloading AI from card to terminal. - if(interaction == AI_TRANS_FROM_CARD) - if(stat & (NOPOWER|BROKEN)) - to_chat(user, "[src] is offline and cannot take an AI at this time!") - return - AI.forceMove(src) - occupier = AI - AI.control_disabled = 1 - AI.radio_enabled = 0 - to_chat(AI, "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here.") - to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") - card.AI = null - update_icon() - - else //Uploading AI from terminal to card - 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 - card.AI = occupier - occupier = null - update_icon() - else if (active) - to_chat(user, "ERROR: Reconstruction in progress.") - else if (!occupier) - to_chat(user, "ERROR: Unable to locate artificial intelligence.") + var/mob/living/silicon/ai/occupier = null + var/active = 0 + circuit = /obj/item/circuitboard/computer/aifixer + icon_keyboard = "tech_key" + icon_screen = "ai-fixer" + light_color = LIGHT_COLOR_PINK + +/obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params) + if(occupier && istype(I, /obj/item/screwdriver)) + if(stat & (NOPOWER|BROKEN)) + to_chat(user, "The screws on [name]'s screen won't budge.") + else + to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") + else + return ..() + +/obj/machinery/computer/aifixer/attack_hand(mob/user) + if(..()) + return + interact(user) + +/obj/machinery/computer/aifixer/interact(mob/user) + + var/dat = "" + + if (src.occupier) + var/laws + dat += "
Stored AI: [src.occupier.name]
" + dat += "System integrity: [(src.occupier.health+100)/2]%" + + if (src.occupier.laws.zeroth) + laws += "0: [src.occupier.laws.zeroth]
" + + for (var/index = 1, index <= src.occupier.laws.ion.len, index++) + var/law = src.occupier.laws.ion[index] + if (length(law) > 0) + var/num = ionnum() + laws += "[num]: [law]
" + + var/number = 1 + for (var/index = 1, index <= src.occupier.laws.inherent.len, index++) + var/law = src.occupier.laws.inherent[index] + if (length(law) > 0) + laws += "[number]: [law]
" + number++ + + for (var/index = 1, index <= src.occupier.laws.supplied.len, index++) + var/law = src.occupier.laws.supplied[index] + if (length(law) > 0) + laws += "[number]: [law]
" + number++ + + dat += "Laws:
[laws]
" + + if (src.occupier.stat == DEAD) + dat += "AI non-functional" + else + dat += "AI functional" + if (!src.active) + dat += {"
Begin Reconstruction"} + else + dat += "
Reconstruction in process, please wait.
" + dat += {"
Close"} + var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/aifixer/proc/Fix() + use_power(1000) + occupier.adjustOxyLoss(-1, 0) + occupier.adjustFireLoss(-1, 0) + occupier.adjustToxLoss(-1, 0) + occupier.adjustBruteLoss(-1, 0) + occupier.updatehealth() + occupier.updatehealth() + if(occupier.health >= 0 && occupier.stat == DEAD) + occupier.revive() + return occupier.health < 100 + +/obj/machinery/computer/aifixer/process() + if(..()) + if(active) + active = Fix() + updateDialog() + update_icon() + +/obj/machinery/computer/aifixer/Topic(href, href_list) + if(..()) + return + if(href_list["fix"]) + to_chat(usr, "Reconstruction in progress. This will take several minutes.") + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) + active = TRUE + add_fingerprint(usr) + +/obj/machinery/computer/aifixer/update_icon() + ..() + if(stat & (NOPOWER|BROKEN)) + return + else + if(active) + add_overlay("ai-fixer-on") + if (occupier) + switch (occupier.stat) + if (0) + add_overlay("ai-fixer-full") + if (2) + add_overlay("ai-fixer-404") + else + add_overlay("ai-fixer-empty") + +/obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) + if(!..()) + return + //Downloading AI from card to terminal. + if(interaction == AI_TRANS_FROM_CARD) + if(stat & (NOPOWER|BROKEN)) + to_chat(user, "[src] is offline and cannot take an AI at this time!") + return + AI.forceMove(src) + occupier = AI + AI.control_disabled = 1 + AI.radio_enabled = 0 + to_chat(AI, "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here.") + to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") + card.AI = null + update_icon() + + else //Uploading AI from terminal to card + 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.forceMove(card) + card.AI = occupier + occupier = null + update_icon() + else if (active) + to_chat(user, "ERROR: Reconstruction in progress.") + else if (!occupier) + to_chat(user, "ERROR: Unable to locate artificial intelligence.") diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 8b3e946501..c93c96429c 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -66,7 +66,7 @@ if(filters["Responsive"] && !APC.aidisabled) continue dat += "[A]
\ - Charge: [APC.cell.charge] / [APC.cell.maxcharge] W ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)
\ + Charge: [DisplayPower(APC.cell.charge)] / [DisplayPower(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)
\ Area: [APC.area]
\ [APC.aidisabled || APC.panel_open ? "APC does not respond to interface query." : "APC responds to interface query."]
" dat += "Check Logs
" diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index fa0008b51b..082f1aa895 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -414,8 +414,8 @@ if(gameStatus == ORION_STATUS_GAMEOVER) dat = "
Game Over
Forever." - if(settlers.len == 0) - dat += "
Your entire crew died, your ship joins the fleet of ghost-ships littering the galaxy." + if(!settlers.len) + dat += "
Your entire crew died, and your ship joins the fleet of ghost-ships littering the galaxy." else if(food <= 0) dat += "
You ran out of food and starved." @@ -429,7 +429,6 @@ M.adjust_fire_stacks(5) M.IgniteMob() //flew into a star, so you're on fire to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") - dat += "
" if(emagged) to_chat(user, "You're never going to make it to Orion...") @@ -439,6 +438,7 @@ name = "The Orion Trail" desc = "Learn how our ancestors got to Orion, and have fun in the process!" + dat += "" else if(event) dat = eventdat else if(gameStatus == ORION_STATUS_NORMAL) @@ -454,7 +454,7 @@ dat += "" else dat += "" - dat += "" + dat += "" dat += "" else dat = "
The Orion Trail
They have stolen [sfood] Food and [sfuel] Fuel." else if(prob(10)) var/deadname = remove_crewmember() - eventdat += "
[deadname] tried to fight back but was killed." + eventdat += "
[deadname] tried to fight back, but was killed." else - eventdat += "
Fortunately you fended them off without any trouble." + eventdat += "
Fortunately, you fended them off without any trouble." eventdat += "" eventdat += "" canContinueEvent = 1 @@ -844,7 +843,7 @@ else if(prob(70)) lings_aboard = min(++lings_aboard,2) - eventdat += "" + eventdat += "" eventdat += "" eventdat += "" canContinueEvent = 1 @@ -859,7 +858,7 @@ if(lings_aboard >= 2) ling2 = remove_crewmember() - eventdat += "Oh no, some of your crew are Changelings!" + eventdat += "Changelings among your crew suddenly burst from hiding and attack!" if(ling2) eventdat += "
[ling1] and [ling2]'s arms twist and contort into grotesque blades!" else @@ -870,18 +869,23 @@ var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 50%, 2 lings, 2 crew is 50% chance if(prob(chancetokill)) var/deadguy = remove_crewmember() - eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] up to [deadguy] and capitulates them!" + var/murder_text = pick("The changeling[ling2 ? "s" : ""] bring[ling2 ? "" : "s"] down [deadguy] and disembowel[ling2 ? "" : "s"] them in a spray of gore!", \ + "[ling2 ? pick(ling1, ling2) : ling1] corners [deadguy] and impales them through the stomach!", \ + "[ling2 ? pick(ling1, ling2) : ling1] decapitates [deadguy] in a single cleaving arc!") + eventdat += "
[murder_text]" else - eventdat += "
You valiantly fight off the Changeling[ling2 ? "s":""]!" - eventdat += "
You cut the Changeling[ling2 ? "s":""] up into meat... Eww" + eventdat += "
You valiantly fight off the changeling[ling2 ? "s":""]!" if(ling2) food += 30 lings_aboard = max(0,lings_aboard-2) else food += 15 lings_aboard = max(0,--lings_aboard) + eventdat += "
Well, it's perfectly good food...\ +
You cut the changeling[ling2 ? "s" : ""] into meat, gaining [ling2 ? "30" : "15"] Food!" else - eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] away, What wimps!" + eventdat += "
[pick("Sensing unfavorable odds", "After a failed attack", "Suddenly breaking nerve")], \ + the changeling[ling2 ? "s":""] vanish[ling2 ? "" : "es"] into space through the airlocks! You're safe... for now." if(ling2) lings_aboard = max(0,lings_aboard-2) else @@ -895,17 +899,17 @@ if(ORION_TRAIL_SPACEPORT) gameStatus = ORION_STATUS_MARKET if(spaceport_raided) - eventdat += "The Spaceport is on high alert! They won't let you dock since you tried to attack them!" + eventdat += "The spaceport is on high alert! You've been barred from docking by the local authorities after your failed raid." if(last_spaceport_action) - eventdat += "
Last Spaceport Action: [last_spaceport_action]" + eventdat += "
Last Spaceport Action: [last_spaceport_action]" eventdat += "" eventdat += "" else - eventdat += "You pull the ship up to dock at a nearby Spaceport, lucky find!" - eventdat += "
This Spaceport is home to travellers who failed to reach Orion, but managed to find a different home..." + eventdat += "Your jump into the sector yields a spaceport - a lucky find!" + eventdat += "
This spaceport is home to travellers who failed to reach Orion, but managed to find a different home..." eventdat += "
Trading terms: FU = Fuel, FO = Food" if(last_spaceport_action) - eventdat += "
Last Spaceport Action: [last_spaceport_action]" + eventdat += "
Last action: [last_spaceport_action]" eventdat += "
Crew:
" eventdat += english_list(settlers) eventdat += "Food: [food] | Fuel: [fuel]" @@ -926,7 +930,7 @@ add_crewmember() freecrew++ - eventdat += "
The traders of the spaceport take pitty on you, and give you some food and fuel (+[FU]FU,+[FO]FO)" + eventdat += "
The traders of the spaceport take pity on you, and generously give you some free supplies! (+[FU]FU, +[FO]FO)" if(freecrew) eventdat += "
You also gain a new crewmember!" @@ -938,15 +942,15 @@ //Buy crew if(food >= 10 && fuel >= 10) - eventdat += "
Hire a new Crewmember (-10FU,-10FO)
" + eventdat += "Hire a New Crewmember (-10FU, -10FO)
" else - eventdat += "Cant afford a new Crewmember
" + eventdat += "You cannot afford a new crewmember.
" //Sell crew if(settlers.len > 1) - eventdat += "Sell crew for Fuel and Food (+7FU,+7FO)
" + eventdat += "Sell Crew for Fuel and Food (+7FU, +7FO)
" else - eventdat += "Cant afford to sell a Crewmember
" + eventdat += "You have no other crew to sell.
" //BUY/SELL STUFF eventdat += "Spare Parts:
" @@ -955,30 +959,30 @@ if(fuel > 5) eventdat += "" else - eventdat += "Cant afford to buy Engine Parts" + eventdat += "
You cannot afford engine parts." //Hull plates if(fuel > 5) eventdat += "
" else - eventdat += "Cant afford to buy Hull Plates" + eventdat += "
You cannot afford hull plates." //Electronics if(fuel > 5) eventdat += "
" else - eventdat += "Cant afford to buy Spare Electronics" + eventdat += "
You cannot afford spare electronics." //Trade if(fuel > 5) eventdat += "
Trade Fuel for Food (-5FU,+5FO)
" else - eventdat += "Cant afford to Trade Fuel for Food 5) eventdat += "
Trade Food for Fuel (+5FU,-5FO)
" else - eventdat += "Cant afford to Trade Food for FuelNo machinery detected.")
- var/S = input("Select the device set: ", "Selection", IO[1]) as anything in IO
- if(src)
- src.input_tag = "[S]_in"
- src.output_tag = "[S]_out"
- name = "[uppertext(S)] Supply Control"
- var/list/new_devices = freq.devices["4"]
- for(var/obj/machinery/air_sensor/U in new_devices)
- var/list/text = splittext(U.id_tag, "_")
- if(text[1] == S)
- sensors = list("[S]_sensor" = "Tank")
- break
-
- for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices)
- U.broadcast_status()
- for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
- U.broadcast_status()
-
+ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "atmos_control", name, 400, 925, master_ui, state)
+ ui.open()
+
+/obj/machinery/computer/atmos_control/ui_data(mob/user)
+ var/data = list()
+
+ data["sensors"] = list()
+ for(var/id_tag in sensors)
+ var/long_name = sensors[id_tag]
+ var/list/info = sensor_information[id_tag]
+ if(!info)
+ continue
+ data["sensors"] += list(list(
+ "id_tag" = id_tag,
+ "long_name" = sanitize(long_name),
+ "pressure" = info["pressure"],
+ "temperature" = info["temperature"],
+ "gases" = info["gases"]
+ ))
+ return data
+
+/obj/machinery/computer/atmos_control/receive_signal(datum/signal/signal)
+ if(!signal || signal.encryption)
+ return
+
+ var/id_tag = signal.data["id_tag"]
+ if(!id_tag || !sensors.Find(id_tag))
+ return
+
+ sensor_information[id_tag] = signal.data
+
+/obj/machinery/computer/atmos_control/proc/set_frequency(new_frequency)
+ SSradio.remove_object(src, frequency)
+ frequency = new_frequency
+ radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_ATMOSIA)
+
+/////////////////////////////////////////////////////////////
+// LARGE TANK CONTROL
+/////////////////////////////////////////////////////////////
+
+/obj/machinery/computer/atmos_control/tank
+ var/input_tag
+ var/output_tag
+ frequency = 1441
+ circuit = /obj/item/circuitboard/computer/atmos_control/tank
+
+ var/list/input_info
+ var/list/output_info
+
+// This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this
+/obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user)
+ var/list/IO = list()
+ var/datum/radio_frequency/freq = SSradio.return_frequency(1441)
+ var/list/devices = freq.devices["_default"]
+ for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
+ var/list/text = splittext(U.id_tag, "_")
+ IO |= text[1]
+ for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices)
+ var/list/text = splittext(U.id, "_")
+ IO |= text[1]
+ if(!IO.len)
+ to_chat(user, "No machinery detected.")
+ var/S = input("Select the device set: ", "Selection", IO[1]) as anything in IO
+ if(src)
+ src.input_tag = "[S]_in"
+ src.output_tag = "[S]_out"
+ name = "[uppertext(S)] Supply Control"
+ var/list/new_devices = freq.devices["4"]
+ for(var/obj/machinery/air_sensor/U in new_devices)
+ var/list/text = splittext(U.id_tag, "_")
+ if(text[1] == S)
+ sensors = list("[S]_sensor" = "Tank")
+ break
+
+ for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices)
+ U.broadcast_status()
+ for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
+ U.broadcast_status()
+
/obj/machinery/computer/atmos_control/tank/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "atmos_control", name, 500, 305, master_ui, state)
- ui.open()
-
-/obj/machinery/computer/atmos_control/tank/ui_data(mob/user)
- var/list/data = ..()
- data["tank"] = TRUE
- data["inputting"] = input_info ? input_info["power"] : FALSE
- data["inputRate"] = input_info ? input_info["volume_rate"] : 0
- data["outputting"] = output_info ? output_info["power"] : FALSE
- data["outputPressure"] = output_info ? output_info["internal"] : 0
-
- return data
-
-/obj/machinery/computer/atmos_control/tank/ui_act(action, params)
- if(..() || !radio_connection)
- return
- var/datum/signal/signal = new
- signal.transmission_method = 1
- signal.source = src
- signal.data = list("sigtype" = "command")
- switch(action)
- if("reconnect")
- reconnect(usr)
- . = TRUE
- if("input")
- signal.data += list("tag" = input_tag, "power_toggle" = TRUE)
- . = TRUE
- if("output")
- signal.data += list("tag" = output_tag, "power_toggle" = TRUE)
- . = TRUE
- if("pressure")
- var/target = input("New target pressure:", name, output_info ? output_info["internal"] : 0) as num|null
- if(!isnull(target) && !..())
- target = Clamp(target, 0, 50 * ONE_ATMOSPHERE)
- signal.data += list("tag" = output_tag, "set_internal_pressure" = target)
- . = TRUE
- radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA)
-
-/obj/machinery/computer/atmos_control/tank/receive_signal(datum/signal/signal)
- if(!signal || signal.encryption)
- return
-
- var/id_tag = signal.data["tag"]
-
- if(input_tag == id_tag)
- input_info = signal.data
- else if(output_tag == id_tag)
- output_info = signal.data
- else
- ..(signal)
+ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "atmos_control", name, 500, 305, master_ui, state)
+ ui.open()
+
+/obj/machinery/computer/atmos_control/tank/ui_data(mob/user)
+ var/list/data = ..()
+ data["tank"] = TRUE
+ data["inputting"] = input_info ? input_info["power"] : FALSE
+ data["inputRate"] = input_info ? input_info["volume_rate"] : 0
+ data["outputting"] = output_info ? output_info["power"] : FALSE
+ data["outputPressure"] = output_info ? output_info["internal"] : 0
+
+ return data
+
+/obj/machinery/computer/atmos_control/tank/ui_act(action, params)
+ if(..() || !radio_connection)
+ return
+ var/datum/signal/signal = new
+ signal.transmission_method = 1
+ signal.source = src
+ signal.data = list("sigtype" = "command")
+ switch(action)
+ if("reconnect")
+ reconnect(usr)
+ . = TRUE
+ if("input")
+ signal.data += list("tag" = input_tag, "power_toggle" = TRUE)
+ . = TRUE
+ if("output")
+ signal.data += list("tag" = output_tag, "power_toggle" = TRUE)
+ . = TRUE
+ if("pressure")
+ var/target = input("New target pressure:", name, output_info ? output_info["internal"] : 0) as num|null
+ if(!isnull(target) && !..())
+ target = Clamp(target, 0, 50 * ONE_ATMOSPHERE)
+ signal.data += list("tag" = output_tag, "set_internal_pressure" = target)
+ . = TRUE
+ radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA)
+
+/obj/machinery/computer/atmos_control/tank/receive_signal(datum/signal/signal)
+ if(!signal || signal.encryption)
+ return
+
+ var/id_tag = signal.data["tag"]
+
+ if(input_tag == id_tag)
+ input_info = signal.data
+ else if(output_tag == id_tag)
+ output_info = signal.data
+ else
+ ..(signal)
\ No newline at end of file
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index db2bfedd7c..209bf5e47f 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...")
@@ -40,14 +40,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)
@@ -55,16 +54,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 3d5b8f026b..9f252effa6 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 d774eff0e0..e5869310ad 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -1,604 +1,599 @@
-
-
-//Keeps track of the time for the ID console. Having it as a global variable prevents people from dismantling/reassembling it to
-//increase the slots of many jobs.
-GLOBAL_VAR_INIT(time_last_changed_position, 0)
-
-/obj/machinery/computer/card
- name = "identification console"
- desc = "You can use this to manage jobs and ID access."
- icon_screen = "id"
- icon_keyboard = "id_key"
+
+
+//Keeps track of the time for the ID console. Having it as a global variable prevents people from dismantling/reassembling it to
+//increase the slots of many jobs.
+GLOBAL_VAR_INIT(time_last_changed_position, 0)
+
+/obj/machinery/computer/card
+ name = "identification console"
+ desc = "You can use this to manage jobs and ID access."
+ icon_screen = "id"
+ icon_keyboard = "id_key"
req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS)
- circuit = /obj/item/circuitboard/computer/card
- var/obj/item/card/id/scan = null
- var/obj/item/card/id/modify = null
- var/authenticated = 0
- var/mode = 0
- var/printing = null
- var/list/region_access = null
- var/list/head_subordinates = null
- var/target_dept = 0 //Which department this computer has access to. 0=all departments
- var/prioritycount = 0 // we don't want 500 prioritized jobs
-
- //Cooldown for closing positions in seconds
- //if set to -1: No cooldown... probably a bad idea
- //if set to 0: Not able to close "original" positions. You can only close positions that you have opened before
- var/change_position_cooldown = 30
- //Jobs you cannot open new positions for
- var/list/blacklisted = list(
- "AI",
- "Assistant",
- "Cyborg",
- "Captain",
- "Head of Personnel",
- "Head of Security",
- "Chief Engineer",
- "Research Director",
- "Chief Medical Officer")
-
- //The scaling factor of max total positions in relation to the total amount of people on board the station in %
- var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players
-
- //This is used to keep track of opened positions for jobs to allow instant closing
- //Assoc array: "JobName" = (int) You start skimming through the manual... [timestamp] | [server] | [admin_ckey]"
if(!linkless)
- data += " \[Delete\]"
+ data += " \[Delete\]"
if(type == "note")
- data += " [secret ? "\[Secret\]" : "\[Not secret\]"]"
+ data += " [secret ? "\[Secret\]" : "\[Not secret\]"]"
if(type == "message sent")
data += " Message has been sent"
if(editor_ckey)
data += "|"
else
- data += " \[Edit\]"
+ data += " \[Edit\]"
if(editor_ckey)
- data += " Last edit by [editor_ckey] (Click here to see edit log)"
- data += "
"
- dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
"
-
- else if(mode == 2)
- // JOB MANAGEMENT
- dat = "Return"
- dat += " || Confirm Identity: "
- var/S
- if(scan)
- S = html_encode(scan.name)
- else
- S = "--------"
- dat += "[S]"
- dat += ""
- dat += "
"
+ else
+ var/header = ""
+
+ var/target_name
+ var/target_owner
+ var/target_rank
+ if(modify)
+ target_name = html_encode(modify.name)
+ else
+ target_name = "--------"
+ if(modify && modify.registered_name)
+ target_owner = html_encode(modify.registered_name)
+ else
+ target_owner = "--------"
+ if(modify && modify.assignment)
+ target_rank = html_encode(modify.assignment)
+ else
+ target_rank = "Unassigned"
+
+ var/scan_name
+ if(scan)
+ scan_name = html_encode(scan.name)
+ else
+ scan_name = "--------"
+
+ if(!authenticated)
+ header += "Job Slots Open job Close job Prioritize
"
+ dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
"
+
+ else if(mode == 2)
+ // JOB MANAGEMENT
+ dat = "Return"
+ dat += " || Confirm Identity: "
+ var/S
+ if(scan)
+ S = html_encode(scan.name)
+ else
+ S = "--------"
+ dat += "[S]"
+ dat += ""
+ dat += "
"
- else
- var/header = ""
-
- var/target_name
- var/target_owner
- var/target_rank
- if(modify)
- target_name = html_encode(modify.name)
- else
- target_name = "--------"
- if(modify && modify.registered_name)
- target_owner = html_encode(modify.registered_name)
- else
- target_owner = "--------"
- if(modify && modify.assignment)
- target_rank = html_encode(modify.assignment)
- else
- target_rank = "Unassigned"
-
- var/scan_name
- if(scan)
- scan_name = html_encode(scan.name)
- else
- scan_name = "--------"
-
- if(!authenticated)
- header += "Job Slots Open job Close job Prioritize "
- if(job.title in blacklisted)
- continue
- dat += " "
- dat += "[job.title] "
- dat += "[job.current_positions]/[job.total_positions] "
- dat += ""
- switch(can_open_job(job))
- if(1)
- if(ID)
- dat += "Open Position
"
- else
- dat += "Open Position"
- if(-1)
- dat += "Denied"
- if(-2)
- var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1)
- var/mins = round(time_to_wait / 60)
- var/seconds = time_to_wait - (60*mins)
- dat += "Cooldown ongoing: [mins]:[(seconds < 10) ? "0[seconds]" : "[seconds]"]"
- if(0)
- dat += "Denied"
- dat += ""
- switch(can_close_job(job))
- if(1)
- if(ID)
- dat += "Close Position"
- else
- dat += "Close Position"
- if(-1)
- dat += "Denied"
- if(-2)
- var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1)
- var/mins = round(time_to_wait / 60)
- var/seconds = time_to_wait - (60*mins)
- dat += "Cooldown ongoing: [mins]:[(seconds < 10) ? "0[seconds]" : "[seconds]"]"
- if(0)
- dat += "Denied"
- dat += " "
- switch(job.total_positions)
- if(0)
- dat += "Denied"
- else
- if(ID)
- if(job in SSjob.prioritized_jobs)
- dat += "Deprioritize"
- else
- if(prioritycount < 5)
- dat += "Prioritize"
- else
- dat += "Denied"
- else
- dat += "Prioritize"
-
- dat += "
Please insert the cards into the slots
"
- header += "Target: [target_name]
"
- header += "Confirm Identity: [scan_name]
"
- else
- header += "
"
- header += "Remove [target_name] || "
- header += "Remove [scan_name]
"
- header += "Access Crew Manifest
"
- header += "Log Out
"
-
- var/jobs_all = ""
- var/list/alljobs = list("Unassigned")
+ ID = 1
+ else
+ ID = 0
+ for(var/datum/job/job in SSjob.occupations)
+ dat += ""
+ if(job.title in blacklisted)
+ continue
+ dat += " "
+ dat += "[job.title] "
+ dat += "[job.current_positions]/[job.total_positions] "
+ dat += ""
+ switch(can_open_job(job))
+ if(1)
+ if(ID)
+ dat += "Open Position
"
+ else
+ dat += "Open Position"
+ if(-1)
+ dat += "Denied"
+ if(-2)
+ var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1)
+ var/mins = round(time_to_wait / 60)
+ var/seconds = time_to_wait - (60*mins)
+ dat += "Cooldown ongoing: [mins]:[(seconds < 10) ? "0[seconds]" : "[seconds]"]"
+ if(0)
+ dat += "Denied"
+ dat += ""
+ switch(can_close_job(job))
+ if(1)
+ if(ID)
+ dat += "Close Position"
+ else
+ dat += "Close Position"
+ if(-1)
+ dat += "Denied"
+ if(-2)
+ var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1)
+ var/mins = round(time_to_wait / 60)
+ var/seconds = time_to_wait - (60*mins)
+ dat += "Cooldown ongoing: [mins]:[(seconds < 10) ? "0[seconds]" : "[seconds]"]"
+ if(0)
+ dat += "Denied"
+ dat += " "
+ switch(job.total_positions)
+ if(0)
+ dat += "Denied"
+ else
+ if(ID)
+ if(job in SSjob.prioritized_jobs)
+ dat += "Deprioritize"
+ else
+ if(SSjob.prioritized_jobs.len < 5)
+ dat += "Prioritize"
+ else
+ dat += "Denied"
+ else
+ dat += "Prioritize"
+
+ dat += "
Please insert the cards into the slots
"
+ header += "Target: [target_name]
"
+ header += "Confirm Identity: [scan_name]
"
+ else
+ header += "
"
+ header += "Remove [target_name] || "
+ header += "Remove [scan_name]
"
+ header += "Access Crew Manifest
"
+ header += "Log Out
"
+
+ var/jobs_all = ""
+ var/list/alljobs = list("Unassigned")
alljobs += (istype(src, /obj/machinery/computer/card/centcom)? get_all_centcom_jobs() : get_all_jobs()) + "Custom"
- for(var/job in alljobs)
- jobs_all += "[replacetext(job, " ", " ")] " //make sure there isn't a line break in the middle of a job
-
-
- var/body
-
- if (authenticated && modify)
-
- var/carddesc = text("")
- var/jobs = text("")
- if( authenticated == 2)
- carddesc += {""}
- carddesc += ""
- carddesc += "Assignment: "
-
- jobs += "[target_rank]" //CHECK THIS
-
- else
- carddesc += "registered_name: [target_owner]"
- jobs += "Assignment: [target_rank] (Demote)"
-
- var/accesses = ""
+ for(var/job in alljobs)
+ jobs_all += "[replacetext(job, " ", " ")] " //make sure there isn't a line break in the middle of a job
+
+
+ var/body
+
+ if (authenticated && modify)
+
+ var/carddesc = text("")
+ var/jobs = text("")
+ if( authenticated == 2)
+ carddesc += {""}
+ carddesc += ""
+ carddesc += "Assignment: "
+
+ jobs += "[target_rank]" //CHECK THIS
+
+ else
+ carddesc += "registered_name: [target_owner]"
+ jobs += "Assignment: [target_rank] (Demote)"
+
+ var/accesses = ""
if(istype(src, /obj/machinery/computer/card/centcom))
- accesses += "Central Command:
"
- for(var/A in get_all_centcom_access())
- if(A in modify.access)
- accesses += "[replacetext(get_centcom_access_desc(A), " ", " ")] "
- else
- accesses += "[replacetext(get_centcom_access_desc(A), " ", " ")] "
- else
- accesses += ""
- accesses += "
"
- body = "[carddesc]"
- for(var/i = 1; i <= 7; i++)
- if(authenticated == 1 && !(i in region_access))
- continue
- accesses += " [get_region_accesses_name(i)]: "
- accesses += ""
- for(var/i = 1; i <= 7; i++)
- if(authenticated == 1 && !(i in region_access))
- continue
- accesses += " "
- for(var/A in get_region_accesses(i))
- if(A in modify.access)
- accesses += "[replacetext(get_access_desc(A), " ", " ")] "
- else
- accesses += "[replacetext(get_access_desc(A), " ", " ")] "
- accesses += " "
- accesses += "
"
- accesses += "
[jobs]
[accesses]" //CHECK THIS
-
- else
- body = "{Log in}
"
- body += "Access Crew Manifest"
- if(!target_dept)
- body += "
Job Management"
-
- dat = "[header][body]
"
- var/datum/browser/popup = new(user, "id_com", src.name, 900, 620)
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
- return
-
-
-/obj/machinery/computer/card/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- switch(href_list["choice"])
- if ("modify")
- if (modify)
- GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment)
- modify.update_label()
- modify.loc = loc
- modify.verb_pickup()
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
- modify = null
- region_access = null
- head_subordinates = null
- else
- var/obj/item/I = usr.get_active_held_item()
- if (istype(I, /obj/item/card/id))
- if(!usr.drop_item())
- 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.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())
- return
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
- I.loc = src
- scan = I
- authenticated = 0
- if ("auth")
- if ((!( authenticated ) && (scan || issilicon(usr)) && (modify || mode)))
- if (check_access(scan))
- region_access = list()
- head_subordinates = list()
+ accesses += "Central Command:
"
+ for(var/A in get_all_centcom_access())
+ if(A in modify.access)
+ accesses += "[replacetext(get_centcom_access_desc(A), " ", " ")] "
+ else
+ accesses += "[replacetext(get_centcom_access_desc(A), " ", " ")] "
+ else
+ accesses += ""
+ accesses += "
"
+ body = "[carddesc]"
+ for(var/i = 1; i <= 7; i++)
+ if(authenticated == 1 && !(i in region_access))
+ continue
+ accesses += " [get_region_accesses_name(i)]: "
+ accesses += ""
+ for(var/i = 1; i <= 7; i++)
+ if(authenticated == 1 && !(i in region_access))
+ continue
+ accesses += " "
+ for(var/A in get_region_accesses(i))
+ if(A in modify.access)
+ accesses += "[replacetext(get_access_desc(A), " ", " ")] "
+ else
+ accesses += "[replacetext(get_access_desc(A), " ", " ")] "
+ accesses += " "
+ accesses += "
"
+ accesses += "
[jobs]
[accesses]" //CHECK THIS
+
+ else
+ body = "{Log in}
"
+ body += "Access Crew Manifest"
+ if(!target_dept)
+ body += "
Job Management"
+
+ dat = "[header][body]
"
+ var/datum/browser/popup = new(user, "id_com", src.name, 900, 620)
+ popup.set_content(dat)
+ popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+ popup.open()
+ return
+
+
+/obj/machinery/computer/card/Topic(href, href_list)
+ if(..())
+ return
+ usr.set_machine(src)
+ switch(href_list["choice"])
+ if ("modify")
+ if (modify)
+ GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment)
+ modify.update_label()
+ modify.forceMove(drop_location())
+ modify.verb_pickup()
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ modify = null
+ region_access = null
+ head_subordinates = null
+ else
+ var/obj/item/I = usr.get_active_held_item()
+ if (istype(I, /obj/item/card/id))
+ if (!usr.transferItemToLoc(I,src))
+ return
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ modify = I
+ authenticated = 0
+
+ if ("scan")
+ if (scan)
+ 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.transferItemToLoc(I,src))
+ return
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ scan = I
+ authenticated = 0
+ if ("auth")
+ if ((!( authenticated ) && (scan || issilicon(usr)) && (modify || mode)))
+ if (check_access(scan))
+ region_access = list()
+ head_subordinates = list()
if(ACCESS_CHANGE_IDS in scan.access)
- if(target_dept)
- head_subordinates = get_all_jobs()
- region_access |= target_dept
- authenticated = 1
- else
- authenticated = 2
- playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
-
- else
+ if(target_dept)
+ head_subordinates = get_all_jobs()
+ region_access |= target_dept
+ authenticated = 1
+ else
+ authenticated = 2
+ playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
+
+ else
if((ACCESS_HOP in scan.access) && ((target_dept==1) || !target_dept))
- region_access |= 1
- region_access |= 6
- get_subordinates("Head of Personnel")
+ region_access |= 1
+ region_access |= 6
+ get_subordinates("Head of Personnel")
if((ACCESS_HOS in scan.access) && ((target_dept==2) || !target_dept))
- region_access |= 2
- get_subordinates("Head of Security")
+ region_access |= 2
+ get_subordinates("Head of Security")
if((ACCESS_CMO in scan.access) && ((target_dept==3) || !target_dept))
- region_access |= 3
- get_subordinates("Chief Medical Officer")
+ region_access |= 3
+ get_subordinates("Chief Medical Officer")
if((ACCESS_RD in scan.access) && ((target_dept==4) || !target_dept))
- region_access |= 4
- get_subordinates("Research Director")
+ region_access |= 4
+ get_subordinates("Research Director")
if((ACCESS_CE in scan.access) && ((target_dept==5) || !target_dept))
- region_access |= 5
- get_subordinates("Chief Engineer")
- if(region_access)
- authenticated = 1
- else if ((!( authenticated ) && issilicon(usr)) && (!modify))
- to_chat(usr, "You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in.")
- if ("logout")
- region_access = null
- head_subordinates = null
- authenticated = 0
- playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
-
- if("access")
- if(href_list["allowed"])
- if(authenticated)
- var/access_type = text2num(href_list["access_target"])
- var/access_allowed = text2num(href_list["allowed"])
+ region_access |= 5
+ get_subordinates("Chief Engineer")
+ if(region_access)
+ authenticated = 1
+ else if ((!( authenticated ) && issilicon(usr)) && (!modify))
+ to_chat(usr, "You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in.")
+ if ("logout")
+ region_access = null
+ head_subordinates = null
+ authenticated = 0
+ playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
+
+ if("access")
+ if(href_list["allowed"])
+ if(authenticated)
+ var/access_type = text2num(href_list["access_target"])
+ var/access_allowed = text2num(href_list["allowed"])
if(access_type in (istype(src, /obj/machinery/computer/card/centcom)?get_all_centcom_access() : get_all_accesses()))
- modify.access -= access_type
- if(access_allowed == 1)
- modify.access += access_type
- playsound(src, "terminal_type", 50, 0)
- if ("assign")
- if (authenticated == 2)
- var/t1 = href_list["assign_target"]
- if(t1 == "Custom")
- var/newJob = reject_bad_text(input("Enter a custom job assignment.", "Assignment", modify ? modify.assignment : "Unassigned"), MAX_NAME_LEN)
- if(newJob)
- t1 = newJob
-
- else if(t1 == "Unassigned")
- modify.access -= get_all_accesses()
-
- else
- var/datum/job/jobdatum
- for(var/jobtype in typesof(/datum/job))
- var/datum/job/J = new jobtype
- if(ckey(J.title) == ckey(t1))
- jobdatum = J
- break
- if(!jobdatum)
- to_chat(usr, "No log exists for this job.")
- return
-
+ modify.access -= access_type
+ if(access_allowed == 1)
+ modify.access += access_type
+ playsound(src, "terminal_type", 50, 0)
+ if ("assign")
+ if (authenticated == 2)
+ var/t1 = href_list["assign_target"]
+ if(t1 == "Custom")
+ var/newJob = reject_bad_text(input("Enter a custom job assignment.", "Assignment", modify ? modify.assignment : "Unassigned"), MAX_NAME_LEN)
+ if(newJob)
+ t1 = newJob
+
+ else if(t1 == "Unassigned")
+ modify.access -= get_all_accesses()
+
+ else
+ var/datum/job/jobdatum
+ for(var/jobtype in typesof(/datum/job))
+ var/datum/job/J = new jobtype
+ if(ckey(J.title) == ckey(t1))
+ jobdatum = J
+ break
+ if(!jobdatum)
+ to_chat(usr, "No log exists for this job.")
+ return
+
modify.access = ( istype(src, /obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() )
- if (modify)
- modify.assignment = t1
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
- if ("demote")
- if(modify.assignment in head_subordinates || modify.assignment == "Assistant")
- modify.assignment = "Unassigned"
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
- else
- to_chat(usr, "You are not authorized to demote this position.")
- if ("reg")
- if (authenticated)
- var/t2 = modify
- if ((authenticated && modify == t2 && (in_range(src, usr) || issilicon(usr)) && isturf(loc)))
- var/newName = reject_bad_name(href_list["reg"])
- if(newName)
- modify.registered_name = newName
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
- else
- to_chat(usr, "Invalid name entered.")
- return
- if ("mode")
- mode = text2num(href_list["mode_target"])
-
- if("return")
- //DISPLAY MAIN MENU
- mode = 3;
- playsound(src, "terminal_type", 25, 0)
-
- if("make_job_available")
- // MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
+ if (modify)
+ modify.assignment = t1
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+ if ("demote")
+ if(modify.assignment in head_subordinates || modify.assignment == "Assistant")
+ modify.assignment = "Unassigned"
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+ else
+ to_chat(usr, "You are not authorized to demote this position.")
+ if ("reg")
+ if (authenticated)
+ var/t2 = modify
+ if ((authenticated && modify == t2 && (in_range(src, usr) || issilicon(usr)) && isturf(loc)))
+ var/newName = reject_bad_name(href_list["reg"])
+ if(newName)
+ modify.registered_name = newName
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+ else
+ to_chat(usr, "Invalid name entered.")
+ return
+ if ("mode")
+ mode = text2num(href_list["mode_target"])
+
+ if("return")
+ //DISPLAY MAIN MENU
+ mode = 3;
+ playsound(src, "terminal_type", 25, 0)
+
+ if("make_job_available")
+ // MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
- var/edit_job_target = href_list["job"]
- var/datum/job/j = SSjob.GetJob(edit_job_target)
- if(!j)
- return 0
- if(can_open_job(j) != 1)
- return 0
- if(opened_positions[edit_job_target] >= 0)
- GLOB.time_last_changed_position = world.time / 10
- j.total_positions++
- opened_positions[edit_job_target]++
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
- if("make_job_unavailable")
- // MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
+ var/edit_job_target = href_list["job"]
+ var/datum/job/j = SSjob.GetJob(edit_job_target)
+ if(!j)
+ return 0
+ if(can_open_job(j) != 1)
+ return 0
+ if(opened_positions[edit_job_target] >= 0)
+ GLOB.time_last_changed_position = world.time / 10
+ j.total_positions++
+ opened_positions[edit_job_target]++
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+ if("make_job_unavailable")
+ // MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
- var/edit_job_target = href_list["job"]
- var/datum/job/j = SSjob.GetJob(edit_job_target)
- if(!j)
- return 0
- if(can_close_job(j) != 1)
- return 0
- //Allow instant closing without cooldown if a position has been opened before
- if(opened_positions[edit_job_target] <= 0)
- GLOB.time_last_changed_position = world.time / 10
- j.total_positions--
- opened_positions[edit_job_target]--
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
- if ("prioritize_job")
- // TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
+ var/edit_job_target = href_list["job"]
+ var/datum/job/j = SSjob.GetJob(edit_job_target)
+ if(!j)
+ return 0
+ if(can_close_job(j) != 1)
+ return 0
+ //Allow instant closing without cooldown if a position has been opened before
+ if(opened_positions[edit_job_target] <= 0)
+ GLOB.time_last_changed_position = world.time / 10
+ j.total_positions--
+ opened_positions[edit_job_target]--
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+ if ("prioritize_job")
+ // TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
- var/priority_target = href_list["job"]
- var/datum/job/j = SSjob.GetJob(priority_target)
- if(!j)
- return 0
- var/priority = TRUE
- if(j in SSjob.prioritized_jobs)
- SSjob.prioritized_jobs -= j
- prioritycount--
- priority = FALSE
- else
- SSjob.prioritized_jobs += j
- prioritycount++
- to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.")
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
- if ("print")
- if (!( printing ))
- printing = 1
- sleep(50)
- var/obj/item/paper/P = new /obj/item/paper( loc )
- var/t1 = "Crew Manifest:
"
- for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
- t1 += t.fields["name"] + " - " + t.fields["rank"] + "
"
- P.info = t1
- P.name = "paper- 'Crew Manifest'"
- printing = null
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
- if (modify)
- modify.update_label()
- updateUsrDialog()
- return
-
-/obj/machinery/computer/card/proc/get_subordinates(rank)
- for(var/datum/job/job in SSjob.occupations)
- if(rank in job.department_head)
- head_subordinates += job.title
-
-/obj/machinery/computer/card/centcom
+ var/priority_target = href_list["job"]
+ var/datum/job/j = SSjob.GetJob(priority_target)
+ if(!j)
+ return 0
+ var/priority = TRUE
+ if(j in SSjob.prioritized_jobs)
+ SSjob.prioritized_jobs -= j
+ priority = FALSE
+ else if(j.total_positions <= j.current_positions)
+ to_chat(usr, "[j.title] has had all positions filled. Open up more slots before prioritizing it.")
+ return
+ else
+ SSjob.prioritized_jobs += j
+ to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.")
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+ if ("print")
+ if (!( printing ))
+ printing = 1
+ sleep(50)
+ var/obj/item/paper/P = new /obj/item/paper( loc )
+ var/t1 = "Crew Manifest:
"
+ for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
+ t1 += t.fields["name"] + " - " + t.fields["rank"] + "
"
+ P.info = t1
+ P.name = "paper- 'Crew Manifest'"
+ printing = null
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ if (modify)
+ modify.update_label()
+ updateUsrDialog()
+ return
+
+/obj/machinery/computer/card/proc/get_subordinates(rank)
+ for(var/datum/job/job in SSjob.occupations)
+ if(rank in job.department_head)
+ head_subordinates += job.title
+
+/obj/machinery/computer/card/centcom
name = "\improper CentCom identification console"
- circuit = /obj/item/circuitboard/computer/card/centcom
+ circuit = /obj/item/circuitboard/computer/card/centcom
req_access = list(ACCESS_CENT_CAPTAIN)
-
-/obj/machinery/computer/card/minor
- name = "department management console"
- desc = "You can use this to change ID's for specific departments."
- icon_screen = "idminor"
- circuit = /obj/item/circuitboard/computer/card/minor
-
+
+/obj/machinery/computer/card/minor
+ name = "department management console"
+ desc = "You can use this to change ID's for specific departments."
+ icon_screen = "idminor"
+ circuit = /obj/item/circuitboard/computer/card/minor
+
/obj/machinery/computer/card/minor/Initialize()
. = ..()
- var/obj/item/circuitboard/computer/card/minor/typed_circuit = circuit
- if(target_dept)
- typed_circuit.target_dept = target_dept
- else
- target_dept = typed_circuit.target_dept
- var/list/dept_list = list("general","security","medical","science","engineering")
- name = "[dept_list[target_dept]] department console"
-
-/obj/machinery/computer/card/minor/hos
- target_dept = 2
- icon_screen = "idhos"
-
- light_color = LIGHT_COLOR_RED
-
-/obj/machinery/computer/card/minor/cmo
- target_dept = 3
- icon_screen = "idcmo"
-
-/obj/machinery/computer/card/minor/rd
- target_dept = 4
- icon_screen = "idrd"
-
- light_color = LIGHT_COLOR_PINK
-
-/obj/machinery/computer/card/minor/ce
- target_dept = 5
- icon_screen = "idce"
-
- light_color = LIGHT_COLOR_YELLOW
+ var/obj/item/circuitboard/computer/card/minor/typed_circuit = circuit
+ if(target_dept)
+ typed_circuit.target_dept = target_dept
+ else
+ target_dept = typed_circuit.target_dept
+ var/list/dept_list = list("general","security","medical","science","engineering")
+ name = "[dept_list[target_dept]] department console"
+
+/obj/machinery/computer/card/minor/hos
+ target_dept = 2
+ icon_screen = "idhos"
+
+ light_color = LIGHT_COLOR_RED
+
+/obj/machinery/computer/card/minor/cmo
+ target_dept = 3
+ icon_screen = "idcmo"
+
+/obj/machinery/computer/card/minor/rd
+ target_dept = 4
+ icon_screen = "idrd"
+
+ light_color = LIGHT_COLOR_PINK
+
+/obj/machinery/computer/card/minor/ce
+ target_dept = 5
+ icon_screen = "idce"
+
+ light_color = LIGHT_COLOR_YELLOW
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index ab7a639818..31126a6c08 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -1,502 +1,501 @@
-/obj/machinery/computer/cloning
- name = "cloning console"
- desc = "Used to clone people and manage DNA."
- icon_screen = "dna"
- icon_keyboard = "med_key"
- circuit = /obj/item/circuitboard/computer/cloning
+/obj/machinery/computer/cloning
+ name = "cloning console"
+ desc = "Used to clone people and manage DNA."
+ icon_screen = "dna"
+ icon_keyboard = "med_key"
+ circuit = /obj/item/circuitboard/computer/cloning
req_access = list(ACCESS_HEADS) //ONLY USED FOR RECORD DELETION RIGHT NOW.
- var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
- var/list/pods //Linked cloning pods
- var/temp = "Inactive"
- var/scantemp_ckey
- var/scantemp = "Ready to Scan"
- var/menu = 1 //Which menu screen to display
- var/list/records = list()
- var/datum/data/record/active_record = null
- var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
- var/loading = 0 // Nice loading text
- var/autoprocess = 0
-
- light_color = LIGHT_COLOR_BLUE
-
-/obj/machinery/computer/cloning/Initialize()
+ var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
+ var/list/pods //Linked cloning pods
+ var/temp = "Inactive"
+ var/scantemp_ckey
+ var/scantemp = "Ready to Scan"
+ var/menu = 1 //Which menu screen to display
+ var/list/records = list()
+ var/datum/data/record/active_record = null
+ var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
+ var/loading = 0 // Nice loading text
+ var/autoprocess = 0
+
+ light_color = LIGHT_COLOR_BLUE
+
+/obj/machinery/computer/cloning/Initialize()
. = ..()
- updatemodules(TRUE)
-
-/obj/machinery/computer/cloning/Destroy()
- if(pods)
- for(var/P in pods)
- DetachCloner(P)
- pods = null
- return ..()
-
-/obj/machinery/computer/cloning/proc/GetAvailablePod(mind = null)
- if(pods)
- for(var/P in pods)
- var/obj/machinery/clonepod/pod = P
- if(pod.occupant && pod.clonemind == mind)
- return null
- if(pod.is_operational() && !(pod.occupant || pod.mess))
- return pod
-
-/obj/machinery/computer/cloning/proc/HasEfficientPod()
- if(pods)
- for(var/P in pods)
- var/obj/machinery/clonepod/pod = P
- if(pod.is_operational() && pod.efficiency > 5)
- return TRUE
-
-/obj/machinery/computer/cloning/proc/GetAvailableEfficientPod(mind = null)
- if(pods)
- for(var/P in pods)
- var/obj/machinery/clonepod/pod = P
- if(pod.occupant && pod.clonemind == mind)
- return pod
- else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
- . = pod
-
-/obj/machinery/computer/cloning/process()
- if(!(scanner && LAZYLEN(pods) && autoprocess))
- return
-
- if(scanner.occupant && scanner.scan_level > 2)
- scan_occupant(scanner.occupant)
-
- for(var/datum/data/record/R in records)
- var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"])
-
- if(!pod)
- return
-
- if(pod.occupant)
- continue //how though?
-
- if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"]))
- records -= R
-
-/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner)
- src.scanner = findscanner()
- if(findfirstcloner && !LAZYLEN(pods))
- findcloner()
-
-/obj/machinery/computer/cloning/proc/findscanner()
- var/obj/machinery/dna_scannernew/scannerf = null
-
- // Loop through every direction
- for(dir in list(NORTH,EAST,SOUTH,WEST))
-
- // Try to find a scanner in that direction
- scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
-
- // If found and operational, return the scanner
- if (!isnull(scannerf) && scannerf.is_operational())
- return scannerf
-
- // If no scanner was found, it will return null
- return null
-
-/obj/machinery/computer/cloning/proc/findcloner()
- var/obj/machinery/clonepod/podf = null
-
- for(dir in list(NORTH,EAST,SOUTH,WEST))
-
- podf = locate(/obj/machinery/clonepod, get_step(src, dir))
-
- if (!isnull(podf) && podf.is_operational())
- AttachCloner(podf)
-
-/obj/machinery/computer/cloning/proc/AttachCloner(obj/machinery/clonepod/pod)
- if(!pod.connected)
- pod.connected = src
- LAZYADD(pods, pod)
-
-/obj/machinery/computer/cloning/proc/DetachCloner(obj/machinery/clonepod/pod)
- pod.connected = null
- LAZYREMOVE(pods, pod)
-
-/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())
- return
- W.loc = src
- src.diskette = W
- to_chat(user, "You insert [W].")
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
- src.updateUsrDialog()
+ updatemodules(TRUE)
+
+/obj/machinery/computer/cloning/Destroy()
+ if(pods)
+ for(var/P in pods)
+ DetachCloner(P)
+ pods = null
+ return ..()
+
+/obj/machinery/computer/cloning/proc/GetAvailablePod(mind = null)
+ if(pods)
+ for(var/P in pods)
+ var/obj/machinery/clonepod/pod = P
+ if(pod.occupant && pod.clonemind == mind)
+ return null
+ if(pod.is_operational() && !(pod.occupant || pod.mess))
+ return pod
+
+/obj/machinery/computer/cloning/proc/HasEfficientPod()
+ if(pods)
+ for(var/P in pods)
+ var/obj/machinery/clonepod/pod = P
+ if(pod.is_operational() && pod.efficiency > 5)
+ return TRUE
+
+/obj/machinery/computer/cloning/proc/GetAvailableEfficientPod(mind = null)
+ if(pods)
+ for(var/P in pods)
+ var/obj/machinery/clonepod/pod = P
+ if(pod.occupant && pod.clonemind == mind)
+ return pod
+ else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
+ . = pod
+
+/obj/machinery/computer/cloning/process()
+ if(!(scanner && LAZYLEN(pods) && autoprocess))
+ return
+
+ if(scanner.occupant && scanner.scan_level > 2)
+ scan_occupant(scanner.occupant)
+
+ for(var/datum/data/record/R in records)
+ var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"])
+
+ if(!pod)
+ return
+
+ if(pod.occupant)
+ continue //how though?
+
+ if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"]))
+ records -= R
+
+/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner)
+ src.scanner = findscanner()
+ if(findfirstcloner && !LAZYLEN(pods))
+ findcloner()
+
+/obj/machinery/computer/cloning/proc/findscanner()
+ var/obj/machinery/dna_scannernew/scannerf = null
+
+ // Loop through every direction
+ for(dir in list(NORTH,EAST,SOUTH,WEST))
+
+ // Try to find a scanner in that direction
+ scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
+
+ // If found and operational, return the scanner
+ if (!isnull(scannerf) && scannerf.is_operational())
+ return scannerf
+
+ // If no scanner was found, it will return null
+ return null
+
+/obj/machinery/computer/cloning/proc/findcloner()
+ var/obj/machinery/clonepod/podf = null
+
+ for(dir in list(NORTH,EAST,SOUTH,WEST))
+
+ podf = locate(/obj/machinery/clonepod, get_step(src, dir))
+
+ if (!isnull(podf) && podf.is_operational())
+ AttachCloner(podf)
+
+/obj/machinery/computer/cloning/proc/AttachCloner(obj/machinery/clonepod/pod)
+ if(!pod.connected)
+ pod.connected = src
+ LAZYADD(pods, pod)
+
+/obj/machinery/computer/cloning/proc/DetachCloner(obj/machinery/clonepod/pod)
+ pod.connected = null
+ LAZYREMOVE(pods, pod)
+
+/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.transferItemToLoc(W,src))
+ return
+ src.diskette = W
+ to_chat(user, "You insert [W].")
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ src.updateUsrDialog()
else if(istype(W, /obj/item/device/multitool))
- var/obj/item/device/multitool/P = W
-
- if(istype(P.buffer, /obj/machinery/clonepod))
- if(get_area(P.buffer) != get_area(src))
- to_chat(user, "-% Cannot link machines across power zones. Buffer cleared %-")
- P.buffer = null
- return
- to_chat(user, "-% Successfully linked [P.buffer] with [src] %-")
- var/obj/machinery/clonepod/pod = P.buffer
- if(pod.connected)
- pod.connected.DetachCloner(pod)
- AttachCloner(pod)
- else
- P.buffer = src
- to_chat(user, "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-")
- return
- else
- return ..()
-
-/obj/machinery/computer/cloning/attack_hand(mob/user)
- if(..())
- return
- interact(user)
-
-/obj/machinery/computer/cloning/interact(mob/user)
- user.set_machine(src)
- add_fingerprint(user)
-
- if(..())
- return
-
- updatemodules(TRUE)
-
- var/dat = ""
- dat += "Refresh"
-
- if(scanner && HasEfficientPod() && scanner.scan_level > 2)
- if(!autoprocess)
- dat += "Autoprocess"
- else
- dat += "Stop autoprocess"
- else
- dat += "Autoprocess"
- dat += "Cloning Pod Status
"
- dat += "Modules
"
- //dat += "Reload Modules"
- if (isnull(src.scanner))
- dat += "ERROR: No Scanner detected!
"
- if (!LAZYLEN(pods))
- dat += "ERROR: No Pod detected
"
-
- // Scanner
- if (!isnull(src.scanner))
- var/mob/living/scanner_occupant = get_mob_or_brainmob(scanner.occupant)
-
- dat += "Scanner Functions
"
-
- dat += "
[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]"
- else
- dat += "Start Scan"
-
- // Database
- dat += "Database Functions
"
- if (src.records.len && src.records.len > 0)
- dat += "View Records ([src.records.len])
"
- else
- dat += "View Records (0)
"
- if (src.diskette)
- dat += "Eject Disk
"
-
-
-
- if(2)
- dat += "Current records
"
- dat += "<< Back
"
- for(var/datum/data/record/R in records)
- dat += "[R.fields["name"]]
Scan ID [R.fields["id"]] View Record"
- if(3)
- dat += "Selected Record
"
- dat += "<< Back
"
-
- if (!src.active_record)
- dat += "Record not found."
- else
- dat += "[src.active_record.fields["name"]]
"
- dat += "Scan ID [src.active_record.fields["id"]] Clone
"
-
- var/obj/item/implant/health/H = locate(src.active_record.fields["imp"])
-
- if ((H) && (istype(H)))
- dat += "Health Implant Data:
[H.sensehealth()]
"
- else
- dat += "Unable to locate Health Implant.
"
-
- dat += "Unique Identifier:
[src.active_record.fields["UI"]]
"
- dat += "Structural Enzymes:
[src.active_record.fields["SE"]]
"
-
- if(diskette && diskette.fields)
- dat += "Inserted Disk
"
- dat += "Contents: "
- var/list/L = list()
- if(diskette.fields["UI"])
- L += "Unique Identifier"
- if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["blood_type"])
- L += "Unique Enzymes"
- if(diskette.fields["SE"])
- L += "Structural Enzymes"
- dat += english_list(L, "Empty", " + ", " + ")
- dat += "
Load from Disk"
-
- dat += "
Save to Disk"
- dat += "
"
- dat += "Confirm Record Deletion
"
-
- dat += "Scan card to confirm.
"
- dat += "Cancel"
-
-
- var/datum/browser/popup = new(user, "cloning", "Cloning System Control")
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
-
-/obj/machinery/computer/cloning/Topic(href, href_list)
- if(..())
- return
-
- if(loading)
- return
-
- if(href_list["task"])
- switch(href_list["task"])
- if("autoprocess")
- autoprocess = 1
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
- if("stopautoprocess")
- autoprocess = 0
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
- else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())
- scantemp = ""
-
- loading = 1
- src.updateUsrDialog()
- playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
- say("Initiating scan...")
-
- spawn(20)
- src.scan_occupant(scanner.occupant)
-
- loading = 0
- src.updateUsrDialog()
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-
- //No locking an open scanner.
- else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
- if ((!scanner.locked) && (scanner.occupant))
+ var/obj/item/device/multitool/P = W
+
+ if(istype(P.buffer, /obj/machinery/clonepod))
+ if(get_area(P.buffer) != get_area(src))
+ to_chat(user, "-% Cannot link machines across power zones. Buffer cleared %-")
+ P.buffer = null
+ return
+ to_chat(user, "-% Successfully linked [P.buffer] with [src] %-")
+ var/obj/machinery/clonepod/pod = P.buffer
+ if(pod.connected)
+ pod.connected.DetachCloner(pod)
+ AttachCloner(pod)
+ else
+ P.buffer = src
+ to_chat(user, "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-")
+ return
+ else
+ return ..()
+
+/obj/machinery/computer/cloning/attack_hand(mob/user)
+ if(..())
+ return
+ interact(user)
+
+/obj/machinery/computer/cloning/interact(mob/user)
+ user.set_machine(src)
+ add_fingerprint(user)
+
+ if(..())
+ return
+
+ updatemodules(TRUE)
+
+ var/dat = ""
+ dat += "Refresh"
+
+ if(scanner && HasEfficientPod() && scanner.scan_level > 2)
+ if(!autoprocess)
+ dat += "Autoprocess"
+ else
+ dat += "Stop autoprocess"
+ else
+ dat += "Autoprocess"
+ dat += "Cloning Pod Status
"
+ dat += "Modules
"
+ //dat += "Reload Modules"
+ if (isnull(src.scanner))
+ dat += "ERROR: No Scanner detected!
"
+ if (!LAZYLEN(pods))
+ dat += "ERROR: No Pod detected
"
+
+ // Scanner
+ if (!isnull(src.scanner))
+ var/mob/living/scanner_occupant = get_mob_or_brainmob(scanner.occupant)
+
+ dat += "Scanner Functions
"
+
+ dat += "
[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]"
+ else
+ dat += "Start Scan"
+
+ // Database
+ dat += "Database Functions
"
+ if (src.records.len && src.records.len > 0)
+ dat += "View Records ([src.records.len])
"
+ else
+ dat += "View Records (0)
"
+ if (src.diskette)
+ dat += "Eject Disk
"
+
+
+
+ if(2)
+ dat += "Current records
"
+ dat += "<< Back
"
+ for(var/datum/data/record/R in records)
+ dat += "[R.fields["name"]]
Scan ID [R.fields["id"]] View Record"
+ if(3)
+ dat += "Selected Record
"
+ dat += "<< Back
"
+
+ if (!src.active_record)
+ dat += "Record not found."
+ else
+ dat += "[src.active_record.fields["name"]]
"
+ dat += "Scan ID [src.active_record.fields["id"]] Clone
"
+
+ var/obj/item/implant/health/H = locate(src.active_record.fields["imp"])
+
+ if ((H) && (istype(H)))
+ dat += "Health Implant Data:
[H.sensehealth()]
"
+ else
+ dat += "Unable to locate Health Implant.
"
+
+ dat += "Unique Identifier:
[src.active_record.fields["UI"]]
"
+ dat += "Structural Enzymes:
[src.active_record.fields["SE"]]
"
+
+ if(diskette && diskette.fields)
+ dat += "Inserted Disk
"
+ dat += "Contents: "
+ var/list/L = list()
+ if(diskette.fields["UI"])
+ L += "Unique Identifier"
+ if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["blood_type"])
+ L += "Unique Enzymes"
+ if(diskette.fields["SE"])
+ L += "Structural Enzymes"
+ dat += english_list(L, "Empty", " + ", " + ")
+ dat += "
Load from Disk"
+
+ dat += "
Save to Disk"
+ dat += "
"
+ dat += "Confirm Record Deletion
"
+
+ dat += "Scan card to confirm.
"
+ dat += "Cancel"
+
+
+ var/datum/browser/popup = new(user, "cloning", "Cloning System Control")
+ popup.set_content(dat)
+ popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+ popup.open()
+
+/obj/machinery/computer/cloning/Topic(href, href_list)
+ if(..())
+ return
+
+ if(loading)
+ return
+
+ if(href_list["task"])
+ switch(href_list["task"])
+ if("autoprocess")
+ autoprocess = 1
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+ if("stopautoprocess")
+ autoprocess = 0
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+ else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())
+ scantemp = ""
+
+ loading = 1
+ src.updateUsrDialog()
+ playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+ say("Initiating scan...")
+
+ spawn(20)
+ src.scan_occupant(scanner.occupant)
+
+ loading = 0
+ src.updateUsrDialog()
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+
+ //No locking an open scanner.
+ else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
+ if ((!scanner.locked) && (scanner.occupant))
scanner.locked = TRUE
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- else
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ else
scanner.locked = FALSE
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
- else if(href_list["view_rec"])
- playsound(src, "terminal_type", 25, 0)
- src.active_record = find_record("id", href_list["view_rec"], records)
- if(active_record)
- if(!active_record.fields["ckey"])
- records -= active_record
- active_record = null
- src.temp = "Record Corrupt"
- else
- src.menu = 3
- else
- src.temp = "Record missing."
-
- else if (href_list["del_rec"])
- if ((!src.active_record) || (src.menu < 3))
- return
- if (src.menu == 3) //If we are viewing a record, confirm deletion
- src.temp = "Delete record?"
- src.menu = 4
- playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-
- else if (src.menu == 4)
- var/obj/item/card/id/C = usr.get_active_held_item()
- if (istype(C)||istype(C, /obj/item/device/pda))
- if(src.check_access(C))
- src.temp = "[src.active_record.fields["name"]] => Record deleted."
- src.records.Remove(active_record)
- active_record = null
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
- src.menu = 2
- else
- src.temp = "Access Denied."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
- else if (href_list["disk"]) //Load or eject.
- switch(href_list["disk"])
- if("load")
- if (!diskette || !istype(diskette.fields) || !diskette.fields["name"] || !diskette.fields)
- src.temp = "Load error."
- src.updateUsrDialog()
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- return
- if (!src.active_record)
- src.temp = "Record error."
- src.menu = 1
- src.updateUsrDialog()
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- return
-
- for(var/key in diskette.fields)
- src.active_record.fields[key] = diskette.fields[key]
- src.temp = "Load successful."
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
- if("eject")
- if(src.diskette)
- src.diskette.loc = src.loc
- src.diskette = null
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
- if("save")
- if(!diskette || diskette.read_only || !active_record || !active_record.fields)
- src.temp = "Save error."
- src.updateUsrDialog()
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- return
-
- diskette.fields = active_record.fields.Copy()
- diskette.name = "data disk - '[src.diskette.fields["name"]]'"
- src.temp = "Save successful."
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
- else if (href_list["refresh"])
- src.updateUsrDialog()
- playsound(src, "terminal_type", 25, 0)
-
- else if (href_list["clone"])
- var/datum/data/record/C = find_record("id", href_list["clone"], records)
- //Look for that player! They better be dead!
- if(C)
- var/obj/machinery/clonepod/pod = GetAvailablePod()
- //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs.
- if(!LAZYLEN(pods))
- temp = "No Clonepods detected."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- else if(!pod)
- temp = "No Clonepods available."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- else if(!config.revival_cloning)
- temp = "Unable to initiate cloning cycle."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- else if(pod.occupant)
- temp = "Cloning cycle already in progress."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"]))
- temp = "[C.fields["name"]] => Cloning cycle in progress..."
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
- records.Remove(C)
- if(active_record == C)
- active_record = null
- menu = 1
- else
- temp = "[C.fields["name"]] => Initialisation failure."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
- else
- temp = "Data corruption."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
- else if (href_list["menu"])
- src.menu = text2num(href_list["menu"])
- playsound(src, "terminal_type", 25, 0)
-
- src.add_fingerprint(usr)
- src.updateUsrDialog()
- return
-
-/obj/machinery/computer/cloning/proc/scan_occupant(occupant)
- var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
- var/datum/dna/dna
- if(iscarbon(mob_occupant))
- var/mob/living/carbon/C = mob_occupant
- dna = C.has_dna()
- if(isbrain(mob_occupant))
- var/mob/living/brain/B = mob_occupant
- dna = B.stored_dna
-
- if(!istype(dna))
- scantemp = "Unable to locate valid genetic data."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- return
- if(mob_occupant.suiciding || mob_occupant.hellbound)
- scantemp = "Subject's brain is not responding to scanning stimuli."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- return
- if((mob_occupant.disabilities & NOCLONE) && (src.scanner.scan_level < 2))
- scantemp = "Subject no longer contains the fundamental materials required to create a living clone."
- playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
- return
- if ((!mob_occupant.ckey) || (!mob_occupant.client))
- scantemp = "Mental interface failure."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- return
- if (find_record("ckey", mob_occupant.ckey, records))
- scantemp = "Subject already in database."
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- return
-
- var/datum/data/record/R = new()
- if(dna.species)
- // We store the instance rather than the path, because some
- // species (abductors, slimepeople) store state in their
- // species datums
- R.fields["mrace"] = dna.species
- else
- var/datum/species/rando_race = pick(config.roundstart_races)
- R.fields["mrace"] = rando_race.type
-
- R.fields["ckey"] = mob_occupant.ckey
- R.fields["name"] = mob_occupant.real_name
- R.fields["id"] = copytext(md5(mob_occupant.real_name), 2, 6)
- R.fields["UE"] = dna.unique_enzymes
- R.fields["UI"] = dna.uni_identity
- R.fields["SE"] = dna.struc_enzymes
- R.fields["blood_type"] = dna.blood_type
- R.fields["features"] = dna.features
- R.fields["factions"] = mob_occupant.faction
-
- if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
- R.fields["mind"] = "\ref[mob_occupant.mind]"
-
- //Add an implant if needed
- var/obj/item/implant/health/imp
- for(var/obj/item/implant/health/HI in mob_occupant.implants)
- imp = HI
- break
- if(!imp)
- imp = new /obj/item/implant/health(mob_occupant)
- imp.implant(mob_occupant)
- R.fields["imp"] = "\ref[imp]"
-
- src.records += R
- scantemp = "Subject successfully scanned."
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+ else if(href_list["view_rec"])
+ playsound(src, "terminal_type", 25, 0)
+ src.active_record = find_record("id", href_list["view_rec"], records)
+ if(active_record)
+ if(!active_record.fields["ckey"])
+ records -= active_record
+ active_record = null
+ src.temp = "Record Corrupt"
+ else
+ src.menu = 3
+ else
+ src.temp = "Record missing."
+
+ else if (href_list["del_rec"])
+ if ((!src.active_record) || (src.menu < 3))
+ return
+ if (src.menu == 3) //If we are viewing a record, confirm deletion
+ src.temp = "Delete record?"
+ src.menu = 4
+ playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+
+ else if (src.menu == 4)
+ var/obj/item/card/id/C = usr.get_active_held_item()
+ if (istype(C)||istype(C, /obj/item/device/pda))
+ if(src.check_access(C))
+ src.temp = "[src.active_record.fields["name"]] => Record deleted."
+ src.records.Remove(active_record)
+ active_record = null
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+ src.menu = 2
+ else
+ src.temp = "Access Denied."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+ else if (href_list["disk"]) //Load or eject.
+ switch(href_list["disk"])
+ if("load")
+ if (!diskette || !istype(diskette.fields) || !diskette.fields["name"] || !diskette.fields)
+ src.temp = "Load error."
+ src.updateUsrDialog()
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ return
+ if (!src.active_record)
+ src.temp = "Record error."
+ src.menu = 1
+ src.updateUsrDialog()
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ return
+
+ for(var/key in diskette.fields)
+ src.active_record.fields[key] = diskette.fields[key]
+ src.temp = "Load successful."
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+ if("eject")
+ if(src.diskette)
+ src.diskette.forceMove(drop_location())
+ src.diskette = null
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ if("save")
+ if(!diskette || diskette.read_only || !active_record || !active_record.fields)
+ src.temp = "Save error."
+ src.updateUsrDialog()
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ return
+
+ diskette.fields = active_record.fields.Copy()
+ diskette.name = "data disk - '[src.diskette.fields["name"]]'"
+ src.temp = "Save successful."
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+ else if (href_list["refresh"])
+ src.updateUsrDialog()
+ playsound(src, "terminal_type", 25, 0)
+
+ else if (href_list["clone"])
+ var/datum/data/record/C = find_record("id", href_list["clone"], records)
+ //Look for that player! They better be dead!
+ if(C)
+ var/obj/machinery/clonepod/pod = GetAvailablePod()
+ //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs.
+ if(!LAZYLEN(pods))
+ temp = "No Clonepods detected."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ else if(!pod)
+ temp = "No Clonepods available."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ 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)
+ temp = "Cloning cycle already in progress."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"]))
+ temp = "[C.fields["name"]] => Cloning cycle in progress..."
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+ records.Remove(C)
+ if(active_record == C)
+ active_record = null
+ menu = 1
+ else
+ temp = "[C.fields["name"]] => Initialisation failure."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+ else
+ temp = "Data corruption."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+ else if (href_list["menu"])
+ src.menu = text2num(href_list["menu"])
+ playsound(src, "terminal_type", 25, 0)
+
+ src.add_fingerprint(usr)
+ src.updateUsrDialog()
+ return
+
+/obj/machinery/computer/cloning/proc/scan_occupant(occupant)
+ var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
+ var/datum/dna/dna
+ if(iscarbon(mob_occupant))
+ var/mob/living/carbon/C = mob_occupant
+ dna = C.has_dna()
+ if(isbrain(mob_occupant))
+ var/mob/living/brain/B = mob_occupant
+ dna = B.stored_dna
+
+ if(!istype(dna))
+ scantemp = "Unable to locate valid genetic data."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ return
+ if(mob_occupant.suiciding || mob_occupant.hellbound)
+ scantemp = "Subject's brain is not responding to scanning stimuli."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ return
+ if((mob_occupant.disabilities & NOCLONE) && (src.scanner.scan_level < 2))
+ scantemp = "Subject no longer contains the fundamental materials required to create a living clone."
+ playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
+ return
+ if ((!mob_occupant.ckey) || (!mob_occupant.client))
+ scantemp = "Mental interface failure."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ return
+ if (find_record("ckey", mob_occupant.ckey, records))
+ scantemp = "Subject already in database."
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+ return
+
+ var/datum/data/record/R = new()
+ if(dna.species)
+ // We store the instance rather than the path, because some
+ // species (abductors, slimepeople) store state in their
+ // species datums
+ R.fields["mrace"] = dna.species
+ else
+ 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
+ R.fields["name"] = mob_occupant.real_name
+ R.fields["id"] = copytext(md5(mob_occupant.real_name), 2, 6)
+ R.fields["UE"] = dna.unique_enzymes
+ R.fields["UI"] = dna.uni_identity
+ R.fields["SE"] = dna.struc_enzymes
+ R.fields["blood_type"] = dna.blood_type
+ R.fields["features"] = dna.features
+ R.fields["factions"] = mob_occupant.faction
+
+ if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
+ R.fields["mind"] = "\ref[mob_occupant.mind]"
+
+ //Add an implant if needed
+ var/obj/item/implant/health/imp
+ for(var/obj/item/implant/health/HI in mob_occupant.implants)
+ imp = HI
+ break
+ if(!imp)
+ imp = new /obj/item/implant/health(mob_occupant)
+ imp.implant(mob_occupant)
+ R.fields["imp"] = "\ref[imp]"
+
+ src.records += R
+ scantemp = "Subject successfully scanned."
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index bf67e05f11..89b2bc4620 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -54,7 +54,7 @@
/obj/machinery/computer/communications/Topic(href, href_list)
if(..())
return
- if (z != ZLEVEL_STATION && z != ZLEVEL_CENTCOM) //Can only use on centcom and SS13
+ if(!(z in GLOB.station_z_levels) && z != ZLEVEL_CENTCOM) //Can only use on centcom and SS13
to_chat(usr, "Unable to establish a connection: \black You're too far away from the station!")
return
usr.set_machine(src)
@@ -454,7 +454,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 aafe74f2b3..cfc3c13cfc 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()
@@ -169,7 +168,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
@@ -448,7 +447,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 c416d93e58..d80dc73f15 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 f2ea3238ef..6ec144d257 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -124,7 +124,7 @@
dat += "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"]]
"
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 44822d3771..f3fabcc21c 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -40,25 +40,25 @@
return ..()
/obj/machinery/computer/message_monitor/emag_act(mob/user)
- if(emagged)
- return
- if(!isnull(src.linkedServer))
- emagged = TRUE
- screen = 2
- spark_system.set_up(5, 0, src)
- src.spark_system.start()
- var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey
- MK.loc = src.loc
- // Will help make emagging the console not so easy to get away with.
- MK.info += "
οΏ½%@%(*$%&(οΏ½&?*(%&οΏ½/{}"
- var/time = 100 * length(src.linkedServer.decryptkey)
- addtimer(CALLBACK(src, .proc/UnmagConsole), time)
- message = rebootmsg
- else
- to_chat(user, "A no server error appears on the screen.")
+ if(emagged)
+ return
+ if(!isnull(src.linkedServer))
+ emagged = TRUE
+ screen = 2
+ spark_system.set_up(5, 0, src)
+ src.spark_system.start()
+ var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey
+ MK.loc = src.loc
+ // Will help make emagging the console not so easy to get away with.
+ MK.info += "
οΏ½%@%(*$%&(οΏ½&?*(%&οΏ½/{}"
+ var/time = 100 * length(src.linkedServer.decryptkey)
+ addtimer(CALLBACK(src, .proc/UnmagConsole), time)
+ message = rebootmsg
+ else
+ 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)
@@ -236,7 +236,7 @@
src.screen = 0 // Return the screen back to normal
/obj/machinery/computer/message_monitor/proc/UnmagConsole()
- emagged = FALSE
+ emagged = FALSE
/obj/machinery/computer/message_monitor/proc/ResetMessage()
customsender = "System Administrator"
@@ -309,7 +309,7 @@
message = noserver
else
if(auth)
- var/dkey = trim(stripped_input(usr, "Please enter the decryption key."))
+ var/dkey = trim(stripped_input(usr, "Please enter the decryption key."))
if(dkey && dkey != "")
if(src.linkedServer.decryptkey == dkey)
var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):"))
@@ -414,11 +414,11 @@
customrecepient.tnote += "← From [customsender] ([customjob]):
[custommessage]
"
if (!customrecepient.silent)
playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
- customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
+ customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
if( customrecepient.loc && ishuman(customrecepient.loc) )
var/mob/living/carbon/human/H = customrecepient.loc
- to_chat(H, "[icon2html(customrecepient, viewers(H))] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)")
- log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
+ to_chat(H, "[icon2html(customrecepient, viewers(H))] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)")
+ log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
customrecepient.cut_overlays()
customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
//Sender is faking as someone who exists
@@ -427,11 +427,11 @@
customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
"
if (!customrecepient.silent)
playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
- customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
+ customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
if( customrecepient.loc && ishuman(customrecepient.loc) )
var/mob/living/carbon/human/H = customrecepient.loc
- to_chat(H, "[icon2html(customrecepient, H)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)")
- log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
+ to_chat(H, "[icon2html(customrecepient, H)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)")
+ log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
customrecepient.cut_overlays()
customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
//Finally..
@@ -468,4 +468,4 @@
info = "Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one."
info_links = info
add_overlay("paper_words")
- break
+ break
\ No newline at end of file
diff --git a/code/game/machinery/computer/monastery_shuttle.dm b/code/game/machinery/computer/monastery_shuttle.dm
index 98e7909954..b04c202dca 100644
--- a/code/game/machinery/computer/monastery_shuttle.dm
+++ b/code/game/machinery/computer/monastery_shuttle.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle/monastery_shuttle
name = "monastery shuttle console"
desc = "Used to control the monastery shuttle."
- circuit = /obj/item/circuitboard/computer/shuttle/monastery_shuttle
+ circuit = /obj/item/circuitboard/computer/monastery_shuttle
shuttleId = "pod1"
possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
no_destination_swap = TRUE
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 3f18cc29e9..7cb1304326 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -1,145 +1,143 @@
-/obj/machinery/computer/pod
- name = "mass driver launch control"
- desc = "A combined blastdoor and mass driver control unit."
- var/obj/machinery/mass_driver/connected = null
- var/title = "Mass Driver Controls"
- var/id = 1
- var/timing = 0
- var/time = 30
- var/range = 4
-
-
-/obj/machinery/computer/pod/Initialize()
- ..()
- for(var/obj/machinery/mass_driver/M in range(range, src))
- if(M.id == id)
- connected = M
-
-
-/obj/machinery/computer/pod/proc/alarm()
- if(stat & (NOPOWER|BROKEN))
- return
-
- if(!connected)
+/obj/machinery/computer/pod
+ name = "mass driver launch control"
+ desc = "A combined blastdoor and mass driver control unit."
+ var/obj/machinery/mass_driver/connected = null
+ var/title = "Mass Driver Controls"
+ var/id = 1
+ var/timing = 0
+ var/time = 30
+ var/range = 4
+
+
+/obj/machinery/computer/pod/Initialize()
+ . = ..()
+ for(var/obj/machinery/mass_driver/M in range(range, src))
+ if(M.id == id)
+ connected = M
+
+
+/obj/machinery/computer/pod/proc/alarm()
+ if(stat & (NOPOWER|BROKEN))
+ return
+
+ if(!connected)
say("Cannot locate mass driver connector. Cancelling firing sequence!")
- return
-
- for(var/obj/machinery/door/poddoor/M in range(range, src))
- if(M.id == id)
- M.open()
-
- sleep(20)
- for(var/obj/machinery/mass_driver/M in range(range, src))
- if(M.id == id)
- M.power = connected.power
- M.drive()
-
- sleep(50)
- for(var/obj/machinery/door/poddoor/M in range(range, src))
- if(M.id == id)
- M.close()
-
-/obj/machinery/computer/pod/attack_hand(mob/user)
- if(..())
- return
-
- var/dat = ""
- user.set_machine(src)
- if(connected)
- var/d2
- if(timing) //door controls do not need timers.
- 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] - - + +"
- var/temp = ""
- var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 )
- for(var/t in L)
- if(t == connected.power)
- temp += "[t] "
- else
- temp += "[t] "
- dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
"
- else
- dat += "
\nToggle Outer Door
"
- dat += "
Close"
- add_fingerprint(usr)
- var/datum/browser/popup = new(user, "computer", title, 400, 500)
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
- popup.open()
-
-
-/obj/machinery/computer/pod/process()
- if(!..())
- return
- if(timing)
- if(time > 0)
- time = round(time) - 1
- else
- alarm()
- time = 0
- timing = 0
- updateDialog()
-
-
-/obj/machinery/computer/pod/Topic(href, href_list)
- if(..())
- return
- if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr))
- usr.set_machine(src)
- if(href_list["power"])
- var/t = text2num(href_list["power"])
- t = min(max(0.25, t), 16)
- if(connected)
- connected.power = t
- if(href_list["alarm"])
- alarm()
- if(href_list["time"])
- timing = text2num(href_list["time"])
- if(href_list["tp"])
- var/tp = text2num(href_list["tp"])
- time += tp
- time = min(max(round(time), 0), 120)
- if(href_list["door"])
- for(var/obj/machinery/door/poddoor/M in range(range, src))
- if(M.id == id)
- if(M.density)
- M.open()
- else
- M.close()
- if(href_list["drive"])
- for(var/obj/machinery/mass_driver/M in range(range, src))
- if(M.id == id)
- M.power = connected.power
- M.drive()
- updateUsrDialog()
-
-
-/obj/machinery/computer/pod/old
- name = "\improper DoorMex control console"
- title = "Door Controls"
- icon_state = "oldcomp"
- icon_screen = "library"
- icon_keyboard = null
-
-
-/obj/machinery/computer/pod/old/syndicate
- name = "\improper ProComp Executive IIc"
- desc = "The Syndicate operate on a tight budget. Operates external airlocks."
- title = "External Airlock Controls"
+ return
+
+ for(var/obj/machinery/door/poddoor/M in range(range, src))
+ if(M.id == id)
+ M.open()
+
+ sleep(20)
+ for(var/obj/machinery/mass_driver/M in range(range, src))
+ if(M.id == id)
+ M.power = connected.power
+ M.drive()
+
+ sleep(50)
+ for(var/obj/machinery/door/poddoor/M in range(range, src))
+ if(M.id == id)
+ M.close()
+
+/obj/machinery/computer/pod/attack_hand(mob/user)
+ if(..())
+ return
+
+ var/dat = ""
+ user.set_machine(src)
+ if(connected)
+ var/d2
+ if(timing) //door controls do not need timers.
+ d2 = "Stop Time Launch"
+ else
+ d2 = "Initiate Time Launch"
+ 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)
+ if(t == connected.power)
+ temp += "[t] "
+ else
+ temp += "[t] "
+ dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
"
+ else
+ dat += "
\nToggle Outer Door
"
+ dat += "
Close"
+ add_fingerprint(usr)
+ var/datum/browser/popup = new(user, "computer", title, 400, 500)
+ popup.set_content(dat)
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+ popup.open()
+
+
+/obj/machinery/computer/pod/process()
+ if(!..())
+ return
+ if(timing)
+ if(time > 0)
+ time = round(time) - 1
+ else
+ alarm()
+ time = 0
+ timing = 0
+ updateDialog()
+
+
+/obj/machinery/computer/pod/Topic(href, href_list)
+ if(..())
+ return
+ if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr))
+ usr.set_machine(src)
+ if(href_list["power"])
+ var/t = text2num(href_list["power"])
+ t = min(max(0.25, t), 16)
+ if(connected)
+ connected.power = t
+ if(href_list["alarm"])
+ alarm()
+ if(href_list["time"])
+ timing = text2num(href_list["time"])
+ if(href_list["tp"])
+ var/tp = text2num(href_list["tp"])
+ time += tp
+ time = min(max(round(time), 0), 120)
+ if(href_list["door"])
+ for(var/obj/machinery/door/poddoor/M in range(range, src))
+ if(M.id == id)
+ if(M.density)
+ M.open()
+ else
+ M.close()
+ if(href_list["drive"])
+ for(var/obj/machinery/mass_driver/M in range(range, src))
+ if(M.id == id)
+ M.power = connected.power
+ M.drive()
+ updateUsrDialog()
+
+
+/obj/machinery/computer/pod/old
+ name = "\improper DoorMex control console"
+ title = "Door Controls"
+ icon_state = "oldcomp"
+ icon_screen = "library"
+ icon_keyboard = null
+
+
+/obj/machinery/computer/pod/old/syndicate
+ name = "\improper ProComp Executive IIc"
+ desc = "The Syndicate operate on a tight budget. Operates external airlocks."
+ title = "External Airlock Controls"
req_access = list(ACCESS_SYNDICATE)
-
-/obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user)
- if(!allowed(user))
- to_chat(user, "Access denied.")
- return
- else
- ..()
-
-
-/obj/machinery/computer/pod/old/swf
- name = "\improper Magix System IV"
- desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
+
+/obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user)
+ if(!allowed(user))
+ to_chat(user, "Access denied.")
+ return
+ else
+ ..()
+
+
+/obj/machinery/computer/pod/old/swf
+ name = "\improper Magix System IV"
+ desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 56a6320640..a7626258ae 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -56,7 +56,7 @@
var/loc_display = "Unknown"
var/mob/living/M = T.imp_in
- if(Tr.z == ZLEVEL_STATION && !isspaceturf(M.loc))
+ if((Tr.z in GLOB.station_z_levels) && !isspaceturf(M.loc))
var/turf/mob_loc = get_turf(M)
loc_display = mob_loc.loc
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 00787f10e2..1a74c44c30 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"]]
"
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 678d856dce..52de3830df 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)
@@ -220,4 +220,4 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
src.updateUsrDialog()
return
-#undef NUKESCALINGMODIFIER
+#undef NUKESCALINGMODIFIER
\ No newline at end of file
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 9ba8e1d34d..f919bdbab8 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 +="
Its access panel is smoking slightly."
- open()
+ open(2)
/obj/machinery/door/window/attackby(obj/item/I, mob/living/user, params)
diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm
index 31643fa177..5d7be7fbd8 100644
--- a/code/game/machinery/droneDispenser.dm
+++ b/code/game/machinery/droneDispenser.dm
@@ -22,7 +22,6 @@
var/icon_recharging = "recharge"
var/icon_creating = "make"
- var/datum/material_container/materials
var/list/using_materials
var/starting_amount = 0
var/metal_cost = 1000
@@ -55,14 +54,10 @@
/obj/machinery/droneDispenser/Initialize()
. = ..()
- materials = new(src, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT*MAX_STACK_SIZE*2)
+ var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE)
materials.insert_amount(starting_amount)
using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost)
-/obj/machinery/droneDispenser/Destroy()
- QDEL_NULL(materials)
- return ..()
-
/obj/machinery/droneDispenser/preloaded
starting_amount = 5000
@@ -81,7 +76,7 @@
exterminator drones when supplied with metal and glass. \
Disgusting. This one seems ominous."
dispense_type = /obj/item/drone_shell/syndrone/badass
- end_create_message = "dispenses a ominous suspicious drone shell."
+ end_create_message = "dispenses an ominous suspicious drone shell."
// I don't need your forgiveness, this is awesome.
/obj/machinery/droneDispenser/snowflake
@@ -148,10 +143,6 @@
..()
if((mode == DRONE_RECHARGING) && !stat && recharging_text)
to_chat(user, "[recharging_text]")
- if(metal_cost)
- to_chat(user, "It has [materials.amount(MAT_METAL)] units of metal stored.")
- if(glass_cost)
- to_chat(user, "It has [materials.amount(MAT_GLASS)] units of glass stored.")
/obj/machinery/droneDispenser/power_change()
..()
@@ -166,6 +157,7 @@
if((stat & (NOPOWER|BROKEN)) || !anchored)
return
+ GET_COMPONENT(materials, /datum/component/material_container)
if(!materials.has_materials(using_materials))
return // We require more minerals
@@ -232,25 +224,8 @@
icon_state = icon_on
/obj/machinery/droneDispenser/attackby(obj/item/O, mob/living/user)
- if(istype(O, /obj/item/stack))
- if(!O.materials[MAT_METAL] && !O.materials[MAT_GLASS])
- return ..()
- if(!metal_cost && !glass_cost)
- to_chat(user, "There isn't a place to insert [O]!")
- return
- var/obj/item/stack/sheets = O
- if(!user.canUnEquip(sheets))
- to_chat(user, "[O] is stuck to your hand, you can't get it off!")
- return
-
- var/used = materials.insert_stack(sheets, sheets.amount)
-
- if(used)
- to_chat(user, "You insert [used] sheet[used > 1 ? "s" : ""] into [src].")
- else
- to_chat(user, "The [src] isn't accepting the [sheets].")
-
- else if(istype(O, /obj/item/crowbar))
+ if(istype(O, /obj/item/crowbar))
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.retrieve_all()
playsound(loc, O.usesound, 50, 1)
to_chat(user, "You retrieve the materials from [src].")
diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm
index c23f4d0ba8..5e0d018554 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 2b66b23db3..ebbeb1bee2 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -61,7 +61,7 @@
if(stat & NOPOWER)
return
- if(src.z == ZLEVEL_STATION)
+ if(src.z in GLOB.station_z_levels)
add_overlay("overlay_[GLOB.security_level]")
else
//var/green = SEC_LEVEL_GREEN
@@ -121,7 +121,7 @@
var/list/data = list()
data["emagged"] = emagged
- if(src.z == ZLEVEL_STATION)
+ if(src.z in GLOB.station_z_levels)
data["seclevel"] = get_security_level()
else
data["seclevel"] = "green"
@@ -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 b37c5a10a7..2d7c7708b3 100644
--- a/code/game/machinery/gulag_teleporter.dm
+++ b/code/game/machinery/gulag_teleporter.dm
@@ -19,6 +19,8 @@ The console is located at computer/gulag_teleporter.dm
active_power_usage = 5000
circuit = /obj/item/circuitboard/machine/gulag_teleporter
var/locked = FALSE
+ var/message_cooldown
+ 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
@@ -46,7 +48,7 @@ The console is located at computer/gulag_teleporter.dm
/obj/machinery/gulag_teleporter/interact(mob/user)
if(locked)
- to_chat(user, "[src] is locked.")
+ to_chat(user, "[src] is locked!")
return
toggle_open()
@@ -89,28 +91,27 @@ The console is located at computer/gulag_teleporter.dm
if(user.stat != CONSCIOUS)
return
if(locked)
- to_chat(user, "[src] is locked!")
+ if(message_cooldown <= world.time)
+ message_cooldown = world.time + 50
+ to_chat(user, "[src]'s door won't budge!")
return
open_machine()
/obj/machinery/gulag_teleporter/container_resist(mob/living/user)
- var/breakout_time = 600
if(!locked)
open_machine()
return
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
- to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)")
- user.visible_message("You hear a metallic creaking from [src]!")
-
+ 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 [DisplayTimeText(breakout_time)].)", \
+ "You hear a metallic creaking from [src].")
if(do_after(user,(breakout_time), target = src))
if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked)
return
-
locked = FALSE
- visible_message("[user] successfully broke out of [src]!")
- to_chat(user, "You successfully break out of [src]!")
-
+ user.visible_message("[user] successfully broke out of [src]!", \
+ "You successfully break out of [src]!")
open_machine()
/obj/machinery/gulag_teleporter/proc/locate_reclaimer()
diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm
index bc61bdc3ed..65f5b946ef 100644
--- a/code/game/machinery/launch_pad.dm
+++ b/code/game/machinery/launch_pad.dm
@@ -221,7 +221,7 @@
if(!isturf(user.loc)) //no setting up in a locker
return
add_fingerprint(user)
- user.visible_message("[user] starts setting down [src]...", "You start setting up [pad]...")
+ user.visible_message("[user] starts setting down [src]...", "You start setting up [pad]...")
if(do_after(user, 30, target = user))
pad.forceMove(get_turf(src))
pad.closed = FALSE
@@ -356,4 +356,4 @@
if("pull")
sending = FALSE
teleport(usr, pad)
- . = TRUE
\ No newline at end of file
+ . = TRUE
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index a979ba6398..102be57f9b 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 d0d40e7233..36366ffbd9 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -215,7 +215,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)
@@ -391,4 +391,4 @@
if(!(nextchar in list(";", "&", "*", " "))) // if char is a separator, ignore
rpath += copytext(path, i, i+1) // else, add to list
- // there doesn't HAVE to be separators but it makes paths syntatically visible
+ // there doesn't HAVE to be separators but it makes paths syntatically visible
\ No newline at end of file
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 17f573fe6d..9acd4730d8 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 f50ddbdf7e..204ae83c9d 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 545414577e..f800309131 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 4a5e32d4e8..34d2edc56c 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 456fc1d0bd..cedb94b7b3 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 ee8363e1b3..8f8202fe19 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
@@ -570,8 +573,8 @@
/obj/machinery/porta_turret/syndicate/pod
integrity_failure = 20
max_integrity = 40
- stun_projectile = /obj/item/projectile/bullet/weakbullet3
- lethal_projectile = /obj/item/projectile/bullet/weakbullet3
+ stun_projectile = /obj/item/projectile/bullet/syndicate_turret
+ lethal_projectile = /obj/item/projectile/bullet/syndicate_turret
/obj/machinery/porta_turret/ai
faction = "silicon"
diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm
index 1dbdc52b1e..7eace08636 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 e86f78722b..6af0240214 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 b4bee2bdae..d2ea1a4fd6 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -1,196 +1,198 @@
-#define SAFETY_COOLDOWN 100
-
-/obj/machinery/recycler
- name = "recycler"
- desc = "A large crushing machine used to recycle small items inefficiently. There are lights on the side."
- icon = 'icons/obj/recycling.dmi'
- icon_state = "grinder-o0"
- layer = ABOVE_ALL_MOB_LAYER // Overhead
- anchored = TRUE
- density = TRUE
- circuit = /obj/item/circuitboard/machine/recycler
- var/safety_mode = FALSE // Temporarily stops machine if it detects a mob
- var/icon_name = "grinder-o"
- var/blood = 0
- var/eat_dir = WEST
- var/amount_produced = 50
- var/datum/material_container/materials
- var/crush_damage = 1000
- var/eat_victim_items = TRUE
- var/item_recycle_sound = 'sound/items/welder.ogg'
-
-/obj/machinery/recycler/Initialize()
- materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
- update_icon()
- return ..()
-
-/obj/machinery/recycler/RefreshParts()
- var/amt_made = 0
- var/mat_mod = 0
- for(var/obj/item/stock_parts/matter_bin/B in component_parts)
- mat_mod = 2 * B.rating
- mat_mod *= 50000
- for(var/obj/item/stock_parts/manipulator/M in component_parts)
- amt_made = 12.5 * M.rating //% of materials salvaged
- materials.max_amount = mat_mod
- amount_produced = min(50, amt_made) + 50
-
-/obj/machinery/recycler/examine(mob/user)
- ..()
- to_chat(user, "The power light is [(stat & NOPOWER) ? "off" : "on"].")
- to_chat(user, "The safety-mode light is [safety_mode ? "on" : "off"].")
- to_chat(user, "The safety-sensors status light is [emagged ? "off" : "on"].")
-
-/obj/machinery/recycler/power_change()
- ..()
- update_icon()
-
-
-/obj/machinery/recycler/attackby(obj/item/I, mob/user, params)
- if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
- return
-
- if(exchange_parts(user, I))
- return
-
- if(default_pry_open(I))
- return
-
- if(default_unfasten_wrench(user, I))
- return
-
- if(default_deconstruction_crowbar(I))
- return
- return ..()
-
-/obj/machinery/recycler/emag_act(mob/user)
- if(emagged)
- return
- emagged = TRUE
- if(safety_mode)
- safety_mode = FALSE
- update_icon()
- playsound(src, "sparks", 75, 1, -1)
- to_chat(user, "You use the cryptographic sequencer on the [src].")
-
-/obj/machinery/recycler/update_icon()
- ..()
- var/is_powered = !(stat & (BROKEN|NOPOWER))
- if(safety_mode)
- is_powered = FALSE
- icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end
-
-/obj/machinery/recycler/CollidedWith(atom/movable/AM)
-
- if(stat & (BROKEN|NOPOWER))
- return
- if(!anchored)
- return
- if(safety_mode)
- return
-
- var/move_dir = get_dir(loc, AM.loc)
- if(move_dir == eat_dir)
- eat(AM)
-
-/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
- var/list/to_eat
- if(istype(AM0, /obj/item))
- to_eat = AM0.GetAllContents()
- else
- to_eat = list(AM0)
-
- var/items_recycled = 0
-
- for(var/i in to_eat)
- var/atom/movable/AM = i
- 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(emagged)
- if(!brain_holder)
- 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
-
- if(items_recycled && sound)
- playsound(src.loc, item_recycle_sound, 50, 1)
-
-/obj/machinery/recycler/proc/recycle_item(obj/item/I)
- I.loc = src.loc
-
- var/material_amount = materials.get_item_material_amount(I)
- if(!material_amount)
- qdel(I)
- return
- materials.insert_item(I, multiplier = (amount_produced / 100))
- qdel(I)
- materials.retrieve_all()
-
-
-/obj/machinery/recycler/proc/emergency_stop(mob/living/L)
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
- safety_mode = TRUE
- update_icon()
- L.loc = src.loc
- addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN)
-
-/obj/machinery/recycler/proc/reboot()
- playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
- safety_mode = FALSE
- update_icon()
-
-/obj/machinery/recycler/proc/crush_living(mob/living/L)
-
- L.loc = src.loc
-
- if(issilicon(L))
- playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
- else
- playsound(src.loc, '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)
- if(iscarbon(L))
- gib = FALSE
- if(L.stat == CONSCIOUS)
- L.say("ARRRRRRRRRRRGH!!!")
- add_mob_blood(L)
-
- if(!blood && !issilicon(L))
- blood = TRUE
- update_icon()
-
- // Remove and recycle the equipped items
- if(eat_victim_items)
- for(var/obj/item/I in L.get_equipped_items())
- if(L.dropItemToGround(I))
- eat(I, sound=FALSE)
-
- // Instantly lie down, also go unconscious from the pain, before you die.
- L.Unconscious(100)
-
- // For admin fun, var edit emagged to 2.
- if(gib || emagged == 2)
- L.gib()
- else if(emagged == 1)
- L.adjustBruteLoss(crush_damage)
-
-/obj/machinery/recycler/deathtrap
- name = "dangerous old crusher"
- emagged = TRUE
- crush_damage = 120
- flags_1 = NODECONSTRUCT_1
-
-/obj/item/paper/guides/recycler
- name = "paper - 'garbage duty instructions'"
- info = "New Assignment
You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.
There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!"
-
-#undef SAFETY_COOLDOWN
+#define SAFETY_COOLDOWN 100
+
+/obj/machinery/recycler
+ name = "recycler"
+ desc = "A large crushing machine used to recycle small items inefficiently. There are lights on the side."
+ icon = 'icons/obj/recycling.dmi'
+ icon_state = "grinder-o0"
+ layer = ABOVE_ALL_MOB_LAYER // Overhead
+ anchored = TRUE
+ density = TRUE
+ circuit = /obj/item/circuitboard/machine/recycler
+ var/safety_mode = FALSE // Temporarily stops machine if it detects a mob
+ var/icon_name = "grinder-o"
+ var/blood = 0
+ var/eat_dir = WEST
+ var/amount_produced = 50
+ var/crush_damage = 1000
+ var/eat_victim_items = TRUE
+ var/item_recycle_sound = 'sound/items/welder.ogg'
+
+/obj/machinery/recycler/Initialize()
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
+ . = ..()
+ update_icon()
+
+/obj/machinery/recycler/RefreshParts()
+ var/amt_made = 0
+ var/mat_mod = 0
+ for(var/obj/item/stock_parts/matter_bin/B in component_parts)
+ mat_mod = 2 * B.rating
+ mat_mod *= 50000
+ for(var/obj/item/stock_parts/manipulator/M in component_parts)
+ amt_made = 12.5 * M.rating //% of materials salvaged
+ GET_COMPONENT(materials, /datum/component/material_container)
+ materials.max_amount = mat_mod
+ amount_produced = min(50, amt_made) + 50
+
+/obj/machinery/recycler/examine(mob/user)
+ ..()
+ to_chat(user, "The power light is [(stat & NOPOWER) ? "off" : "on"].")
+ to_chat(user, "The safety-mode light is [safety_mode ? "on" : "off"].")
+ to_chat(user, "The safety-sensors status light is [emagged ? "off" : "on"].")
+
+/obj/machinery/recycler/power_change()
+ ..()
+ update_icon()
+
+
+/obj/machinery/recycler/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
+ return
+
+ if(exchange_parts(user, I))
+ return
+
+ if(default_pry_open(I))
+ return
+
+ if(default_unfasten_wrench(user, I))
+ return
+
+ if(default_deconstruction_crowbar(I))
+ return
+ return ..()
+
+/obj/machinery/recycler/emag_act(mob/user)
+ if(emagged)
+ return
+ emagged = TRUE
+ if(safety_mode)
+ safety_mode = FALSE
+ update_icon()
+ playsound(src, "sparks", 75, 1, -1)
+ to_chat(user, "You use the cryptographic sequencer on the [src].")
+
+/obj/machinery/recycler/update_icon()
+ ..()
+ var/is_powered = !(stat & (BROKEN|NOPOWER))
+ if(safety_mode)
+ is_powered = FALSE
+ icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end
+
+/obj/machinery/recycler/CollidedWith(atom/movable/AM)
+
+ if(stat & (BROKEN|NOPOWER))
+ return
+ if(!anchored)
+ return
+ if(safety_mode)
+ return
+
+ var/move_dir = get_dir(loc, AM.loc)
+ if(move_dir == eat_dir)
+ eat(AM)
+
+/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
+ var/list/to_eat
+ if(istype(AM0, /obj/item))
+ to_eat = AM0.GetAllContents()
+ else
+ to_eat = list(AM0)
+
+ var/items_recycled = 0
+
+ for(var/i in to_eat)
+ var/atom/movable/AM = i
+ 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(brain_holder)
+ emergency_stop(AM)
+ else if(isliving(AM))
+ if(emagged)
+ crush_living(AM)
+ else
+ emergency_stop(AM)
+ else if(istype(AM, /obj/item))
+ recycle_item(AM)
+ items_recycled++
+ else
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ AM.forceMove(loc)
+
+ if(items_recycled && sound)
+ playsound(src, item_recycle_sound, 50, 1)
+
+/obj/machinery/recycler/proc/recycle_item(obj/item/I)
+ I.forceMove(loc)
+
+ GET_COMPONENT(materials, /datum/component/material_container)
+ var/material_amount = materials.get_item_material_amount(I)
+ if(!material_amount)
+ qdel(I)
+ return
+ materials.insert_item(I, multiplier = (amount_produced / 100))
+ qdel(I)
+ materials.retrieve_all()
+
+
+/obj/machinery/recycler/proc/emergency_stop(mob/living/L)
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ safety_mode = TRUE
+ update_icon()
+ L.forceMove(loc)
+ addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN)
+
+/obj/machinery/recycler/proc/reboot()
+ playsound(src, 'sound/machines/ping.ogg', 50, 0)
+ safety_mode = FALSE
+ update_icon()
+
+/obj/machinery/recycler/proc/crush_living(mob/living/L)
+
+ L.forceMove(loc)
+
+ if(issilicon(L))
+ playsound(src, 'sound/items/welder.ogg', 50, 1)
+ else
+ 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)
+ if(iscarbon(L))
+ gib = FALSE
+ if(L.stat == CONSCIOUS)
+ L.say("ARRRRRRRRRRRGH!!!")
+ add_mob_blood(L)
+
+ if(!blood && !issilicon(L))
+ blood = TRUE
+ update_icon()
+
+ // Remove and recycle the equipped items
+ if(eat_victim_items)
+ for(var/obj/item/I in L.get_equipped_items())
+ if(L.dropItemToGround(I))
+ eat(I, sound=FALSE)
+
+ // Instantly lie down, also go unconscious from the pain, before you die.
+ L.Unconscious(100)
+
+ // For admin fun, var edit emagged to 2.
+ if(gib || emagged == 2)
+ L.gib()
+ else if(emagged == 1)
+ L.adjustBruteLoss(crush_damage)
+
+/obj/machinery/recycler/deathtrap
+ name = "dangerous old crusher"
+ emagged = TRUE
+ crush_damage = 120
+ flags_1 = NODECONSTRUCT_1
+
+/obj/item/paper/guides/recycler
+ name = "paper - 'garbage duty instructions'"
+ info = "New Assignment
You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.
There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!"
+
+#undef SAFETY_COOLDOWN
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 4cfc6809cc..5d6370188b 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -107,7 +107,7 @@
var/line1
var/line2
if(SSshuttle.supply.mode == SHUTTLE_IDLE)
- if(SSshuttle.supply.z == ZLEVEL_STATION)
+ if(SSshuttle.supply.z in GLOB.station_z_levels)
line1 = "CARGO"
line2 = "Docked"
else
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index cd2a5bd3b5..7c51c383fa 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -1,379 +1,406 @@
-// SUIT STORAGE UNIT /////////////////
-/obj/machinery/suit_storage_unit
- name = "suit storage unit"
- desc = "An industrial unit made to hold space suits. It comes with a built-in UV cauterization mechanism. A small warning label advises that organic matter should not be placed into the unit."
- icon = 'icons/obj/suitstorage.dmi'
- icon_state = "close"
+// SUIT STORAGE UNIT /////////////////
+/obj/machinery/suit_storage_unit
+ name = "suit storage unit"
+ desc = "An industrial unit made to hold space suits. It comes with a built-in UV cauterization mechanism. A small warning label advises that organic matter should not be placed into the unit."
+ icon = 'icons/obj/suitstorage.dmi'
+ icon_state = "close"
anchored = TRUE
density = TRUE
- max_integrity = 250
-
- var/obj/item/clothing/suit/space/suit = null
- var/obj/item/clothing/head/helmet/space/helmet = null
- var/obj/item/clothing/mask/mask = null
- var/obj/item/storage = null
-
- var/suit_type = null
- var/helmet_type = null
- var/mask_type = null
- var/storage_type = null
-
- state_open = FALSE
- var/locked = FALSE
- panel_open = FALSE
- var/safeties = TRUE
-
- var/uv = FALSE
- var/uv_super = FALSE
- var/uv_cycles = 6
-
-/obj/machinery/suit_storage_unit/standard_unit
- suit_type = /obj/item/clothing/suit/space/eva
- helmet_type = /obj/item/clothing/head/helmet/space/eva
- mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/captain
- suit_type = /obj/item/clothing/suit/space/hardsuit/captain
- mask_type = /obj/item/clothing/mask/gas/sechailer
- storage_type = /obj/item/tank/jetpack/oxygen/captain
-
-/obj/machinery/suit_storage_unit/engine
- suit_type = /obj/item/clothing/suit/space/hardsuit/engine
- mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/ce
- suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite
- mask_type = /obj/item/clothing/mask/breath
- storage_type= /obj/item/clothing/shoes/magboots/advance
-
-/obj/machinery/suit_storage_unit/security
- suit_type = /obj/item/clothing/suit/space/hardsuit/security
- mask_type = /obj/item/clothing/mask/gas/sechailer
-
-/obj/machinery/suit_storage_unit/hos
- suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
- mask_type = /obj/item/clothing/mask/gas/sechailer
- storage_type = /obj/item/tank/internals/oxygen
-
-/obj/machinery/suit_storage_unit/atmos
- suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos
- mask_type = /obj/item/clothing/mask/gas
- storage_type = /obj/item/watertank/atmos
-
-/obj/machinery/suit_storage_unit/mining
- suit_type = /obj/item/clothing/suit/hooded/explorer
- mask_type = /obj/item/clothing/mask/gas/explorer
-
-/obj/machinery/suit_storage_unit/mining/eva
- suit_type = /obj/item/clothing/suit/space/hardsuit/mining
- mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/cmo
- suit_type = /obj/item/clothing/suit/space/hardsuit/medical
- mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/rd
- suit_type = /obj/item/clothing/suit/space/hardsuit/rd
- mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/syndicate
- suit_type = /obj/item/clothing/suit/space/hardsuit/syndi
- mask_type = /obj/item/clothing/mask/gas/syndicate
- storage_type = /obj/item/tank/jetpack/oxygen/harness
-
-/obj/machinery/suit_storage_unit/ert/command
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/security
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/sec
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/engineer
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engi
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/medical
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/med
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
+ max_integrity = 250
+
+ var/obj/item/clothing/suit/space/suit = null
+ var/obj/item/clothing/head/helmet/space/helmet = null
+ var/obj/item/clothing/mask/mask = null
+ var/obj/item/storage = null
+
+ var/suit_type = null
+ var/helmet_type = null
+ var/mask_type = null
+ var/storage_type = null
+
+ state_open = FALSE
+ var/locked = FALSE
+ panel_open = FALSE
+ var/safeties = TRUE
+
+ var/uv = FALSE
+ var/uv_super = FALSE
+ var/uv_cycles = 6
+ var/message_cooldown
+ var/breakout_time = 300
+
+/obj/machinery/suit_storage_unit/standard_unit
+ suit_type = /obj/item/clothing/suit/space/eva
+ helmet_type = /obj/item/clothing/head/helmet/space/eva
+ mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/captain
+ suit_type = /obj/item/clothing/suit/space/hardsuit/captain
+ mask_type = /obj/item/clothing/mask/gas/sechailer
+ storage_type = /obj/item/tank/jetpack/oxygen/captain
+
+/obj/machinery/suit_storage_unit/engine
+ suit_type = /obj/item/clothing/suit/space/hardsuit/engine
+ mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/ce
+ suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite
+ mask_type = /obj/item/clothing/mask/breath
+ storage_type= /obj/item/clothing/shoes/magboots/advance
+
+/obj/machinery/suit_storage_unit/security
+ suit_type = /obj/item/clothing/suit/space/hardsuit/security
+ mask_type = /obj/item/clothing/mask/gas/sechailer
+
+/obj/machinery/suit_storage_unit/hos
+ suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
+ mask_type = /obj/item/clothing/mask/gas/sechailer
+ storage_type = /obj/item/tank/internals/oxygen
+
+/obj/machinery/suit_storage_unit/atmos
+ suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos
+ mask_type = /obj/item/clothing/mask/gas
+ storage_type = /obj/item/watertank/atmos
+
+/obj/machinery/suit_storage_unit/mining
+ suit_type = /obj/item/clothing/suit/hooded/explorer
+ mask_type = /obj/item/clothing/mask/gas/explorer
+
+/obj/machinery/suit_storage_unit/mining/eva
+ suit_type = /obj/item/clothing/suit/space/hardsuit/mining
+ mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/cmo
+ suit_type = /obj/item/clothing/suit/space/hardsuit/medical
+ mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/rd
+ suit_type = /obj/item/clothing/suit/space/hardsuit/rd
+ mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/syndicate
+ suit_type = /obj/item/clothing/suit/space/hardsuit/syndi
+ mask_type = /obj/item/clothing/mask/gas/syndicate
+ storage_type = /obj/item/tank/jetpack/oxygen/harness
+
+/obj/machinery/suit_storage_unit/ert/command
+ suit_type = /obj/item/clothing/suit/space/hardsuit/ert
+ mask_type = /obj/item/clothing/mask/breath
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
+
+/obj/machinery/suit_storage_unit/ert/security
+ suit_type = /obj/item/clothing/suit/space/hardsuit/ert/sec
+ mask_type = /obj/item/clothing/mask/breath
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
+
+/obj/machinery/suit_storage_unit/ert/engineer
+ suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engi
+ mask_type = /obj/item/clothing/mask/breath
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
+
+/obj/machinery/suit_storage_unit/ert/medical
+ suit_type = /obj/item/clothing/suit/space/hardsuit/ert/med
+ mask_type = /obj/item/clothing/mask/breath
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
+
/obj/machinery/suit_storage_unit/Initialize()
. = ..()
- wires = new /datum/wires/suit_storage_unit(src)
- if(suit_type)
- suit = new suit_type(src)
- if(helmet_type)
- helmet = new helmet_type(src)
- if(mask_type)
- mask = new mask_type(src)
- if(storage_type)
- storage = new storage_type(src)
- update_icon()
-
-/obj/machinery/suit_storage_unit/Destroy()
+ wires = new /datum/wires/suit_storage_unit(src)
+ if(suit_type)
+ suit = new suit_type(src)
+ if(helmet_type)
+ helmet = new helmet_type(src)
+ if(mask_type)
+ mask = new mask_type(src)
+ if(storage_type)
+ storage = new storage_type(src)
+ update_icon()
+
+/obj/machinery/suit_storage_unit/Destroy()
QDEL_NULL(suit)
QDEL_NULL(helmet)
QDEL_NULL(mask)
QDEL_NULL(storage)
- return ..()
-
-/obj/machinery/suit_storage_unit/update_icon()
- cut_overlays()
-
- if(uv)
- if(uv_super)
- add_overlay("super")
- else if(occupant)
- add_overlay("uvhuman")
- else
- add_overlay("uv")
- else if(state_open)
- if(stat & BROKEN)
- add_overlay("broken")
- else
- add_overlay("open")
- if(suit)
- add_overlay("suit")
- if(helmet)
- add_overlay("helm")
- if(storage)
- add_overlay("storage")
- else if(occupant)
- add_overlay("human")
-
-/obj/machinery/suit_storage_unit/power_change()
- ..()
- if(!is_operational() && state_open)
- open_machine()
- dump_contents()
- update_icon()
-
-/obj/machinery/suit_storage_unit/proc/dump_contents()
- dropContents()
- helmet = null
- suit = null
- mask = null
- storage = null
- occupant = null
-
-/obj/machinery/suit_storage_unit/deconstruct(disassembled = TRUE)
+ return ..()
+
+/obj/machinery/suit_storage_unit/update_icon()
+ cut_overlays()
+
+ if(uv)
+ if(uv_super)
+ add_overlay("super")
+ else if(occupant)
+ add_overlay("uvhuman")
+ else
+ add_overlay("uv")
+ else if(state_open)
+ if(stat & BROKEN)
+ add_overlay("broken")
+ else
+ add_overlay("open")
+ if(suit)
+ add_overlay("suit")
+ if(helmet)
+ add_overlay("helm")
+ if(storage)
+ add_overlay("storage")
+ else if(occupant)
+ add_overlay("human")
+
+/obj/machinery/suit_storage_unit/power_change()
+ ..()
+ if(!is_operational() && state_open)
+ open_machine()
+ dump_contents()
+ update_icon()
+
+/obj/machinery/suit_storage_unit/proc/dump_contents()
+ dropContents()
+ helmet = null
+ suit = null
+ mask = null
+ storage = null
+ occupant = null
+
+/obj/machinery/suit_storage_unit/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
- open_machine()
- dump_contents()
- new /obj/item/stack/sheet/metal (loc, 2)
- qdel(src)
-
-/obj/machinery/suit_storage_unit/MouseDrop_T(atom/A, mob/user)
- if(user.stat || user.lying || !Adjacent(user) || !Adjacent(A) || !isliving(A))
- return
- var/mob/living/target = A
- if(!state_open)
- to_chat(user, "The unit's doors are shut!")
- return
- if(!is_operational())
- to_chat(user, "The unit is not operational!")
- return
- if(occupant || helmet || suit || storage)
- to_chat(user, "It's too cluttered inside to fit in!")
- return
-
- if(target == user)
- user.visible_message("[user] starts squeezing into [src]!", "You start working your way into [src]...")
- else
- target.visible_message("[user] starts shoving [target] into [src]!", "[user] starts shoving you into [src]!")
-
- if(do_mob(user, target, 30))
- if(occupant || helmet || suit || storage)
- return
- if(target == user)
- user.visible_message("[user] slips into [src] and closes the door behind them!", "You slip into [src]'s cramped space and shut its door.")
- else
- target.visible_message("[user] pushes [target] into [src] and shuts its door!", "[user] shoves you into [src] and shuts the door!")
- close_machine(target)
- add_fingerprint(user)
-
-/obj/machinery/suit_storage_unit/proc/cook()
- if(uv_cycles)
- uv_cycles--
- uv = TRUE
- locked = TRUE
- update_icon()
- if(occupant)
- var/mob/living/mob_occupant = occupant
- if(uv_super)
- mob_occupant.adjustFireLoss(rand(20, 36))
- else
- mob_occupant.adjustFireLoss(rand(10, 16))
- mob_occupant.emote("scream")
- addtimer(CALLBACK(src, .proc/cook), 50)
- else
- uv_cycles = initial(uv_cycles)
- uv = FALSE
- locked = FALSE
- if(uv_super)
- visible_message("[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.")
- playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1)
- helmet = null
- qdel(helmet)
- suit = null
- qdel(suit) // Delete everything but the occupant.
- mask = null
- qdel(mask)
- storage = null
- qdel(storage)
- // The wires get damaged too.
- wires.cut_all()
- else
- if(!occupant)
- visible_message("[src]'s door slides open. The glowing yellow lights dim to a gentle green.")
- else
- visible_message("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.")
- playsound(src, 'sound/machines/airlockclose.ogg', 25, 1)
- for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
- I.clean_blood()
- I.fingerprints = list()
- open_machine(FALSE)
- if(occupant)
- dump_contents()
-
-/obj/machinery/suit_storage_unit/proc/shock(mob/user, prb)
- if(!prob(prb))
- var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
- s.set_up(5, 1, src)
- s.start()
- if(electrocute_mob(user, src, src, 1, TRUE))
- return 1
-
-/obj/machinery/suit_storage_unit/relaymove(mob/user)
- container_resist(user)
-
-/obj/machinery/suit_storage_unit/container_resist(mob/living/user)
- add_fingerprint(user)
- if(locked)
- visible_message("You see [user] kicking against the doors of [src]!", "You start kicking against the doors...")
- addtimer(CALLBACK(src, .proc/resist_open, user), 300)
- else
- open_machine()
- dump_contents()
-
-/obj/machinery/suit_storage_unit/proc/resist_open(mob/user)
- if(!state_open && occupant && (user in src) && user.stat == 0) // Check they're still here.
- visible_message("You see [user] bursts out of [src]!", "You escape the cramped confines of [src]!")
- open_machine()
-
-/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params)
- if(state_open && is_operational())
- if(istype(I, /obj/item/clothing/suit/space))
- if(suit)
- to_chat(user, "The unit already contains a suit!.")
- return
- if(!user.drop_item())
- return
- suit = I
- else if(istype(I, /obj/item/clothing/head/helmet))
- if(helmet)
- to_chat(user, "The unit already contains a helmet!")
- return
- if(!user.drop_item())
- return
- helmet = I
- else if(istype(I, /obj/item/clothing/mask))
- if(mask)
- to_chat(user, "The unit already contains a mask!")
- return
- if(!user.drop_item())
- return
- mask = I
- else
- if(storage)
- to_chat(user, "The auxiliary storage compartment is full!")
- return
- if(!user.drop_item())
- return
- storage = I
-
- I.loc = src
- visible_message("[user] inserts [I] into [src]", "You load [I] into [src].")
- update_icon()
- return
-
- if(panel_open && is_wire_tool(I))
- wires.interact(user)
- if(!state_open)
- if(default_deconstruction_screwdriver(user, "panel", "close", I))
- return
- if(default_pry_open(I))
- dump_contents()
- return
-
- return ..()
-
+ open_machine()
+ dump_contents()
+ new /obj/item/stack/sheet/metal (loc, 2)
+ qdel(src)
+
+/obj/machinery/suit_storage_unit/MouseDrop_T(atom/A, mob/user)
+ if(user.stat || user.lying || !Adjacent(user) || !Adjacent(A) || !isliving(A))
+ return
+ var/mob/living/target = A
+ if(!state_open)
+ to_chat(user, "The unit's doors are shut!")
+ return
+ if(!is_operational())
+ to_chat(user, "The unit is not operational!")
+ return
+ if(occupant || helmet || suit || storage)
+ to_chat(user, "It's too cluttered inside to fit in!")
+ return
+
+ if(target == user)
+ user.visible_message("[user] starts squeezing into [src]!", "You start working your way into [src]...")
+ else
+ target.visible_message("[user] starts shoving [target] into [src]!", "[user] starts shoving you into [src]!")
+
+ if(do_mob(user, target, 30))
+ if(occupant || helmet || suit || storage)
+ return
+ if(target == user)
+ user.visible_message("[user] slips into [src] and closes the door behind them!", "You slip into [src]'s cramped space and shut its door.")
+ else
+ target.visible_message("[user] pushes [target] into [src] and shuts its door!", "[user] shoves you into [src] and shuts the door!")
+ close_machine(target)
+ add_fingerprint(user)
+
+/obj/machinery/suit_storage_unit/proc/cook()
+ if(uv_cycles)
+ uv_cycles--
+ uv = TRUE
+ locked = TRUE
+ update_icon()
+ if(occupant)
+ var/mob/living/mob_occupant = occupant
+ if(uv_super)
+ mob_occupant.adjustFireLoss(rand(20, 36))
+ else
+ mob_occupant.adjustFireLoss(rand(10, 16))
+ mob_occupant.emote("scream")
+ addtimer(CALLBACK(src, .proc/cook), 50)
+ else
+ uv_cycles = initial(uv_cycles)
+ uv = FALSE
+ locked = FALSE
+ if(uv_super)
+ visible_message("[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.")
+ playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1)
+ helmet = null
+ qdel(helmet)
+ suit = null
+ qdel(suit) // Delete everything but the occupant.
+ mask = null
+ qdel(mask)
+ storage = null
+ qdel(storage)
+ // The wires get damaged too.
+ wires.cut_all()
+ else
+ if(!occupant)
+ visible_message("[src]'s door slides open. The glowing yellow lights dim to a gentle green.")
+ else
+ visible_message("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.")
+ playsound(src, 'sound/machines/airlockclose.ogg', 25, 1)
+ for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
+ I.clean_blood()
+ I.fingerprints = list()
+ open_machine(FALSE)
+ if(occupant)
+ dump_contents()
+
+/obj/machinery/suit_storage_unit/proc/shock(mob/user, prb)
+ if(!prob(prb))
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+ s.set_up(5, 1, src)
+ s.start()
+ if(electrocute_mob(user, src, src, 1, TRUE))
+ return 1
+
+/obj/machinery/suit_storage_unit/relaymove(mob/user)
+ if(locked)
+ if(message_cooldown <= world.time)
+ message_cooldown = world.time + 50
+ to_chat(user, "[src]'s door won't budge!")
+ return
+ open_machine()
+ dump_contents()
+
+/obj/machinery/suit_storage_unit/container_resist(mob/living/user)
+ if(!locked)
+ open_machine()
+ dump_contents()
+ return
+ 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 [DisplayTimeText(breakout_time)].)", \
+ "You hear a thump from [src].")
+ 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]!", \
+ "You successfully break out of [src]!")
+ open_machine()
+ dump_contents()
+
+ add_fingerprint(user)
+ if(locked)
+ visible_message("You see [user] kicking against the doors of [src]!", \
+ "You start kicking against the doors...")
+ addtimer(CALLBACK(src, .proc/resist_open, user), 300)
+ else
+ open_machine()
+ dump_contents()
+
+/obj/machinery/suit_storage_unit/proc/resist_open(mob/user)
+ if(!state_open && occupant && (user in src) && user.stat == 0) // Check they're still here.
+ visible_message("You see [user] bursts out of [src]!", \
+ "You escape the cramped confines of [src]!")
+ open_machine()
+
+/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params)
+ if(state_open && is_operational())
+ if(istype(I, /obj/item/clothing/suit/space))
+ if(suit)
+ to_chat(user, "The unit already contains a suit!.")
+ return
+ if(!user.drop_item())
+ return
+ suit = I
+ else if(istype(I, /obj/item/clothing/head/helmet))
+ if(helmet)
+ to_chat(user, "The unit already contains a helmet!")
+ return
+ if(!user.drop_item())
+ return
+ helmet = I
+ else if(istype(I, /obj/item/clothing/mask))
+ if(mask)
+ to_chat(user, "The unit already contains a mask!")
+ return
+ if(!user.drop_item())
+ return
+ mask = I
+ else
+ if(storage)
+ to_chat(user, "The auxiliary storage compartment is full!")
+ return
+ if(!user.drop_item())
+ return
+ storage = I
+
+ I.loc = src
+ visible_message("[user] inserts [I] into [src]", "You load [I] into [src].")
+ update_icon()
+ return
+
+ if(panel_open && is_wire_tool(I))
+ wires.interact(user)
+ if(!state_open)
+ if(default_deconstruction_screwdriver(user, "panel", "close", I))
+ return
+ if(default_pry_open(I))
+ dump_contents()
+ return
+
+ return ..()
+
/obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "suit_storage_unit", name, 400, 305, master_ui, state)
- ui.open()
-
-/obj/machinery/suit_storage_unit/ui_data()
- var/list/data = list()
- data["locked"] = locked
- data["open"] = state_open
- data["safeties"] = safeties
- data["uv_active"] = uv
- data["uv_super"] = uv_super
- if(helmet)
- data["helmet"] = helmet.name
- if(suit)
- data["suit"] = suit.name
- if(mask)
- data["mask"] = mask.name
- if(storage)
- data["storage"] = storage.name
- if(occupant)
- data["occupied"] = 1
- return data
-
-/obj/machinery/suit_storage_unit/ui_act(action, params)
- if(..() || uv)
- return
- switch(action)
- if("door")
- if(state_open)
- close_machine()
- else
- open_machine(0)
- if(occupant)
- dump_contents() // Dump out contents if someone is in there.
- . = TRUE
- if("lock")
- locked = !locked
- . = TRUE
- if("uv")
- if(occupant && safeties)
- return
- else if(!helmet && !mask && !suit && !storage && !occupant)
- return
- else
- if(occupant)
- var/mob/living/mob_occupant = occupant
- to_chat(mob_occupant, "[src]'s confines grow warm, then hot, then scorching. You're being burned [!mob_occupant.stat ? "alive" : "away"]!")
- cook()
- . = TRUE
- if("dispense")
- if(!state_open)
- return
-
- var/static/list/valid_items = list("helmet", "suit", "mask", "storage")
- var/item_name = params["item"]
- if(item_name in valid_items)
- var/obj/item/I = vars[item_name]
- vars[item_name] = null
- if(I)
- I.forceMove(loc)
- . = TRUE
- update_icon()
+ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "suit_storage_unit", name, 400, 305, master_ui, state)
+ ui.open()
+
+/obj/machinery/suit_storage_unit/ui_data()
+ var/list/data = list()
+ data["locked"] = locked
+ data["open"] = state_open
+ data["safeties"] = safeties
+ data["uv_active"] = uv
+ data["uv_super"] = uv_super
+ if(helmet)
+ data["helmet"] = helmet.name
+ if(suit)
+ data["suit"] = suit.name
+ if(mask)
+ data["mask"] = mask.name
+ if(storage)
+ data["storage"] = storage.name
+ if(occupant)
+ data["occupied"] = 1
+ return data
+
+/obj/machinery/suit_storage_unit/ui_act(action, params)
+ if(..() || uv)
+ return
+ switch(action)
+ if("door")
+ if(state_open)
+ close_machine()
+ else
+ open_machine(0)
+ if(occupant)
+ dump_contents() // Dump out contents if someone is in there.
+ . = TRUE
+ if("lock")
+ locked = !locked
+ . = TRUE
+ if("uv")
+ if(occupant && safeties)
+ return
+ else if(!helmet && !mask && !suit && !storage && !occupant)
+ return
+ else
+ if(occupant)
+ var/mob/living/mob_occupant = occupant
+ to_chat(mob_occupant, "[src]'s confines grow warm, then hot, then scorching. You're being burned [!mob_occupant.stat ? "alive" : "away"]!")
+ cook()
+ . = TRUE
+ if("dispense")
+ if(!state_open)
+ return
+
+ var/static/list/valid_items = list("helmet", "suit", "mask", "storage")
+ var/item_name = params["item"]
+ if(item_name in valid_items)
+ var/obj/item/I = vars[item_name]
+ vars[item_name] = null
+ if(I)
+ I.forceMove(loc)
+ . = TRUE
+ update_icon()
diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm
index 92a4edfcd2..590c8d03a5 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 bccbfd96fd..cb3ae78e72 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/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 9077283a68..5638b92b99 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -106,7 +106,7 @@
// Off-Site Relays
//
-// You are able to send/receive signals from the station's z level (changeable in the ZLEVEL_STATION #define) if
+// You are able to send/receive signals from the station's z level (changeable in the ZLEVEL_STATION_PRIMARY #define) if
/obj/machinery/telecomms/relay/proc/toggle_level()
@@ -114,7 +114,7 @@
var/turf/position = get_turf(src)
// Toggle on/off getting signals from the station or the current Z level
- if(listening_level == ZLEVEL_STATION) // equals the station
+ if(listening_level in GLOB.station_z_levels) // equals the station
listening_level = position.z
return TRUE
return FALSE
diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm
index 4019d97002..bec9c5dfc7 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 ca333b9a6c..ffe99c243c 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 427bc95253..b3a7f99758 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1,947 +1,947 @@
-#define STANDARD_CHARGE 1
-#define CONTRABAND_CHARGE 2
-#define COIN_CHARGE 3
-
-/datum/data/vending_product
- var/product_name = "generic"
- var/product_path = null
- var/amount = 0
- var/max_amount = 0
- var/display_color = "blue"
-
-
-/obj/machinery/vending
- name = "\improper Vendomat"
- desc = "A generic vending machine."
- icon = 'icons/obj/vending.dmi'
- icon_state = "generic"
- layer = BELOW_OBJ_LAYER
+#define STANDARD_CHARGE 1
+#define CONTRABAND_CHARGE 2
+#define COIN_CHARGE 3
+
+/datum/data/vending_product
+ var/product_name = "generic"
+ var/product_path = null
+ var/amount = 0
+ var/max_amount = 0
+ var/display_color = "blue"
+
+
+/obj/machinery/vending
+ name = "\improper Vendomat"
+ desc = "A generic vending machine."
+ icon = 'icons/obj/vending.dmi'
+ icon_state = "generic"
+ layer = BELOW_OBJ_LAYER
anchored = TRUE
density = TRUE
- verb_say = "beeps"
- verb_ask = "beeps"
- verb_exclaim = "beeps"
- max_integrity = 300
- integrity_failure = 100
- armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70)
+ verb_say = "beeps"
+ verb_ask = "beeps"
+ verb_exclaim = "beeps"
+ max_integrity = 300
+ integrity_failure = 100
+ armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70)
circuit = /obj/item/circuitboard/machine/vendor
- var/active = 1 //No sales pitches if off!
- var/vend_ready = 1 //Are we ready to vend?? Is it time??
-
- // To be filled out at compile time
- var/list/products = list() //For each, use the following pattern:
+ var/active = 1 //No sales pitches if off!
+ var/vend_ready = 1 //Are we ready to vend?? Is it time??
+
+ // To be filled out at compile time
+ var/list/products = list() //For each, use the following pattern:
var/list/contraband = list() //list(/type/path = amount, /type/path2 = amount2)
- var/list/premium = list() //No specified amount = only one in stock
-
- var/product_slogans = "" //String of slogans separated by semicolons, optional
- var/product_ads = "" //String of small ad messages in the vending screen - random chance
- var/list/product_records = list()
- var/list/hidden_records = list()
- var/list/coin_records = list()
- var/list/slogan_list = list()
- var/list/small_ads = list() //Small ad messages in the vending screen - random chance of popping up whenever you open it
- var/vend_reply //Thank you for shopping!
- var/last_reply = 0
- var/last_slogan = 0 //When did we last pitch?
- var/slogan_delay = 6000 //How long until we can pitch again?
- var/icon_vend //Icon_state when vending!
- var/icon_deny //Icon_state when vending!
- var/seconds_electrified = 0 //Shock customers like an airlock.
- var/shoot_inventory = 0 //Fire items at customers! We're broken!
- var/shoot_inventory_chance = 2
- var/shut_up = 0 //Stop spouting those godawful pitches!
- var/extended_inventory = 0 //can we access the hidden inventory?
- var/scan_id = 1
- var/obj/item/coin/coin
- var/obj/item/stack/spacecash/bill
-
- var/dish_quants = list() //used by the snack machine's custom compartment to count dishes.
-
- var/obj/item/vending_refill/refill_canister = null //The type of refill canisters used by this machine.
- var/refill_count = 3 //The number of canisters the vending machine uses
-
-/obj/machinery/vending/Initialize()
- var/build_inv = FALSE
- if(!refill_canister)
- circuit = null
- build_inv = TRUE
- . = ..()
- wires = new /datum/wires/vending(src)
- if(build_inv) //non-constructable vending machine
- build_inventory(products)
- build_inventory(contraband, 1)
- build_inventory(premium, 0, 1)
-
- slogan_list = splittext(product_slogans, ";")
- // So not all machines speak at the exact same time.
- // The first time this machine says something will be at slogantime + this random value,
- // so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated.
- last_slogan = world.time + rand(0, slogan_delay)
- power_change()
-
-/obj/machinery/vending/Destroy()
- QDEL_NULL(wires)
- QDEL_NULL(coin)
- QDEL_NULL(bill)
- return ..()
-
-/obj/machinery/vending/snack/Destroy()
- for(var/obj/item/reagent_containers/food/snacks/S in contents)
- S.forceMove(get_turf(src))
- return ..()
-
-/obj/machinery/vending/RefreshParts() //Better would be to make constructable child
- if(component_parts)
- product_records = list()
- hidden_records = list()
- coin_records = list()
- build_inventory(products, start_empty = 1)
- build_inventory(contraband, 1, start_empty = 1)
- build_inventory(premium, 0, 1, start_empty = 1)
- for(var/obj/item/vending_refill/VR in component_parts)
- refill_inventory(VR, product_records, STANDARD_CHARGE)
- refill_inventory(VR, coin_records, COIN_CHARGE)
- refill_inventory(VR, hidden_records, CONTRABAND_CHARGE)
-
-
-/obj/machinery/vending/deconstruct(disassembled = TRUE)
- if(!refill_canister) //the non constructable vendors drop metal instead of a machine frame.
+ var/list/premium = list() //No specified amount = only one in stock
+
+ var/product_slogans = "" //String of slogans separated by semicolons, optional
+ var/product_ads = "" //String of small ad messages in the vending screen - random chance
+ var/list/product_records = list()
+ var/list/hidden_records = list()
+ var/list/coin_records = list()
+ var/list/slogan_list = list()
+ var/list/small_ads = list() //Small ad messages in the vending screen - random chance of popping up whenever you open it
+ var/vend_reply //Thank you for shopping!
+ var/last_reply = 0
+ var/last_slogan = 0 //When did we last pitch?
+ var/slogan_delay = 6000 //How long until we can pitch again?
+ var/icon_vend //Icon_state when vending!
+ var/icon_deny //Icon_state when vending!
+ var/seconds_electrified = 0 //Shock customers like an airlock.
+ var/shoot_inventory = 0 //Fire items at customers! We're broken!
+ var/shoot_inventory_chance = 2
+ var/shut_up = 0 //Stop spouting those godawful pitches!
+ var/extended_inventory = 0 //can we access the hidden inventory?
+ var/scan_id = 1
+ var/obj/item/coin/coin
+ var/obj/item/stack/spacecash/bill
+
+ var/dish_quants = list() //used by the snack machine's custom compartment to count dishes.
+
+ var/obj/item/vending_refill/refill_canister = null //The type of refill canisters used by this machine.
+ var/refill_count = 3 //The number of canisters the vending machine uses
+
+/obj/machinery/vending/Initialize()
+ var/build_inv = FALSE
+ if(!refill_canister)
+ circuit = null
+ build_inv = TRUE
+ . = ..()
+ wires = new /datum/wires/vending(src)
+ if(build_inv) //non-constructable vending machine
+ build_inventory(products)
+ build_inventory(contraband, 1)
+ build_inventory(premium, 0, 1)
+
+ slogan_list = splittext(product_slogans, ";")
+ // So not all machines speak at the exact same time.
+ // The first time this machine says something will be at slogantime + this random value,
+ // so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated.
+ last_slogan = world.time + rand(0, slogan_delay)
+ power_change()
+
+/obj/machinery/vending/Destroy()
+ QDEL_NULL(wires)
+ QDEL_NULL(coin)
+ QDEL_NULL(bill)
+ return ..()
+
+/obj/machinery/vending/snack/Destroy()
+ for(var/obj/item/reagent_containers/food/snacks/S in contents)
+ S.forceMove(get_turf(src))
+ return ..()
+
+/obj/machinery/vending/RefreshParts() //Better would be to make constructable child
+ if(component_parts)
+ product_records = list()
+ hidden_records = list()
+ coin_records = list()
+ build_inventory(products, start_empty = 1)
+ build_inventory(contraband, 1, start_empty = 1)
+ build_inventory(premium, 0, 1, start_empty = 1)
+ for(var/obj/item/vending_refill/VR in component_parts)
+ refill_inventory(VR, product_records, STANDARD_CHARGE)
+ refill_inventory(VR, coin_records, COIN_CHARGE)
+ refill_inventory(VR, hidden_records, CONTRABAND_CHARGE)
+
+
+/obj/machinery/vending/deconstruct(disassembled = TRUE)
+ if(!refill_canister) //the non constructable vendors drop metal instead of a machine frame.
if(!(flags_1 & NODECONSTRUCT_1))
- new /obj/item/stack/sheet/metal(loc, 3)
- qdel(src)
- else
- ..()
-
-/obj/machinery/vending/obj_break(damage_flag)
+ new /obj/item/stack/sheet/metal(loc, 3)
+ qdel(src)
+ else
+ ..()
+
+/obj/machinery/vending/obj_break(damage_flag)
if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
- var/dump_amount = 0
- for(var/datum/data/vending_product/R in product_records)
- if(R.amount <= 0) //Try to use a record that actually has something to dump.
- continue
- var/dump_path = R.product_path
- if(!dump_path)
- continue
-
- while(R.amount>0)
- var/obj/O = new dump_path(loc)
- step(O, pick(GLOB.alldirs)) //we only drop 20% of the total of each products and spread it
- R.amount -= 5 //around to not fill the turf with too many objects.
- dump_amount++
- if(dump_amount > 15) //so we don't drop too many items (e.g. ClothesMate)
- break
- stat |= BROKEN
- icon_state = "[initial(icon_state)]-broken"
-
-/obj/machinery/vending/proc/build_inventory(list/productlist, hidden=0, req_coin=0, start_empty = null)
- for(var/typepath in productlist)
- var/amount = productlist[typepath]
- if(isnull(amount))
- amount = 0
-
- var/atom/temp = new typepath(null)
- var/datum/data/vending_product/R = new /datum/data/vending_product()
- R.product_name = initial(temp.name)
- R.product_path = typepath
- if(!start_empty)
- R.amount = amount
- R.max_amount = amount
- R.display_color = pick("red","blue","green")
-
- if(hidden)
- hidden_records += R
- else if(req_coin)
- coin_records += R
- else
- product_records += R
-
-/obj/machinery/vending/proc/refill_inventory(obj/item/vending_refill/refill, datum/data/vending_product/machine, var/charge_type = STANDARD_CHARGE)
- var/total = 0
- var/to_restock = 0
-
- for(var/datum/data/vending_product/machine_content in machine)
- if(machine_content.amount == 0 && refill.charges[charge_type] > 0)
- machine_content.amount++
- refill.charges[charge_type]--
- total++
- to_restock += machine_content.max_amount - machine_content.amount
- if(to_restock <= refill.charges[charge_type])
- for(var/datum/data/vending_product/machine_content in machine)
- machine_content.amount = machine_content.max_amount
- refill.charges[charge_type] -= to_restock
- total += to_restock
- else
- var/tmp_charges = refill.charges[charge_type]
- for(var/datum/data/vending_product/machine_content in machine)
- if(refill.charges[charge_type] == 0)
- break
- var/restock = Ceiling(((machine_content.max_amount - machine_content.amount)/to_restock)*tmp_charges)
- if(restock > refill.charges[charge_type])
- restock = refill.charges[charge_type]
- machine_content.amount += restock
- refill.charges[charge_type] -= restock
- total += restock
- return total
-
-/obj/machinery/vending/snack/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks))
- if(!compartment_access_check(user))
- return
- var/obj/item/reagent_containers/food/snacks/S = W
- if(!S.junkiness)
- if(!iscompartmentfull(user))
- if(!user.drop_item())
- return
- W.loc = src
- food_load(W)
- to_chat(user, "You insert [W] into [src]'s chef compartment.")
- else
- to_chat(user, "[src]'s chef compartment does not accept junk food.")
-
- else if(istype(W, /obj/item/storage/bag/tray))
- if(!compartment_access_check(user))
- return
- var/obj/item/storage/T = W
- var/loaded = 0
- var/denied_items = 0
- for(var/obj/item/reagent_containers/food/snacks/S in T.contents)
- if(iscompartmentfull(user))
- break
- if(!S.junkiness)
- T.remove_from_storage(S, src)
- food_load(S)
- loaded++
- else
- denied_items++
- if(denied_items)
- to_chat(user, "[src] refuses some items.")
- if(loaded)
- to_chat(user, "You insert [loaded] dishes into [src]'s chef compartment.")
- updateUsrDialog()
- return
-
- else
- return ..()
-
-/obj/machinery/vending/snack/proc/compartment_access_check(user)
- req_access_txt = chef_compartment_access
- if(!allowed(user) && !emagged && scan_id)
- to_chat(user, "[src]'s chef compartment blinks red: Access denied.")
- req_access_txt = "0"
- return 0
- req_access_txt = "0"
- return 1
-
-/obj/machinery/vending/snack/proc/iscompartmentfull(mob/user)
- if(contents.len >= 30) // no more than 30 dishes can fit inside
- to_chat(user, "[src]'s chef compartment is full.")
- return 1
- return 0
-
-/obj/machinery/vending/snack/proc/food_load(obj/item/reagent_containers/food/snacks/S)
- if(dish_quants[S.name])
- dish_quants[S.name]++
- else
- dish_quants[S.name] = 1
- sortList(dish_quants)
-
-/obj/machinery/vending/attackby(obj/item/W, mob/user, params)
- if(panel_open)
- if(default_unfasten_wrench(user, W, time = 60))
- return
-
- if(component_parts)
- if(default_deconstruction_crowbar(W))
- return
-
- if(istype(W, /obj/item/screwdriver))
- if(anchored)
- panel_open = !panel_open
- to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
- cut_overlays()
- if(panel_open)
- add_overlay("[initial(icon_state)]-panel")
- playsound(src.loc, W.usesound, 50, 1)
- updateUsrDialog()
- else
- to_chat(user, "You must first secure [src].")
- return
- else if(istype(W, /obj/item/device/multitool)||istype(W, /obj/item/wirecutters))
- if(panel_open)
- attack_hand(user)
- return
- else if(istype(W, /obj/item/coin))
- if(coin)
- to_chat(user, "[src] already has [coin] inserted")
- return
- if(bill)
- to_chat(user, "[src] already has [bill] inserted")
- return
- if(!premium.len)
- to_chat(user, "[src] doesn't have a coin slot.")
- return
- if(!user.drop_item())
- return
- W.loc = src
- coin = W
- to_chat(user, "You insert [W] into [src].")
- return
- else if(istype(W, /obj/item/stack/spacecash))
- if(coin)
- to_chat(user, "[src] already has [coin] inserted")
- return
- if(bill)
- to_chat(user, "[src] already has [bill] inserted")
- return
- var/obj/item/stack/S = W
- if(!premium.len)
- to_chat(user, "[src] doesn't have a bill slot.")
- return
- S.use(1)
- bill = new S.type(src,1)
- to_chat(user, "You insert [W] into [src].")
- return
- else if(istype(W, refill_canister) && refill_canister != null)
- if(stat & (BROKEN|NOPOWER))
- to_chat(user, "It does nothing.")
- else if(panel_open)
- //if the panel is open we attempt to refill the machine
- var/obj/item/vending_refill/canister = W
- if(canister.charges[STANDARD_CHARGE] == 0)
- to_chat(user, "This [canister.name] is empty!")
- else
- var/transfered = refill_inventory(canister,product_records,STANDARD_CHARGE)
- transfered += refill_inventory(canister,coin_records,COIN_CHARGE)
- transfered += refill_inventory(canister,hidden_records,CONTRABAND_CHARGE)
- if(transfered)
- to_chat(user, "You loaded [transfered] items in \the [name].")
- else
- to_chat(user, "The [name] is fully stocked.")
- return
- else
- to_chat(user, "You should probably unscrew the service panel first.")
- else
- return ..()
-
-
-/obj/machinery/vending/on_deconstruction()
- var/product_list = list(product_records, hidden_records, coin_records)
- for(var/i=1, i<=3, i++)
- for(var/datum/data/vending_product/machine_content in product_list[i])
- while(machine_content.amount !=0)
- var/safety = 0 //to avoid infinite loop
- for(var/obj/item/vending_refill/VR in component_parts)
- safety++
- if(VR.charges[i] < VR.init_charges[i])
- VR.charges[i]++
- machine_content.amount--
- if(!machine_content.amount)
- break
- else
- safety--
- if(safety <= 0) // all refill canisters are full
- break
- ..()
-
-/obj/machinery/vending/emag_act(mob/user)
+ var/dump_amount = 0
+ for(var/datum/data/vending_product/R in product_records)
+ if(R.amount <= 0) //Try to use a record that actually has something to dump.
+ continue
+ var/dump_path = R.product_path
+ if(!dump_path)
+ continue
+
+ while(R.amount>0)
+ var/obj/O = new dump_path(loc)
+ step(O, pick(GLOB.alldirs)) //we only drop 20% of the total of each products and spread it
+ R.amount -= 5 //around to not fill the turf with too many objects.
+ dump_amount++
+ if(dump_amount > 15) //so we don't drop too many items (e.g. ClothesMate)
+ break
+ stat |= BROKEN
+ icon_state = "[initial(icon_state)]-broken"
+
+/obj/machinery/vending/proc/build_inventory(list/productlist, hidden=0, req_coin=0, start_empty = null)
+ for(var/typepath in productlist)
+ var/amount = productlist[typepath]
+ if(isnull(amount))
+ amount = 0
+
+ var/atom/temp = new typepath(null)
+ var/datum/data/vending_product/R = new /datum/data/vending_product()
+ R.product_name = initial(temp.name)
+ R.product_path = typepath
+ if(!start_empty)
+ R.amount = amount
+ R.max_amount = amount
+ R.display_color = pick("red","blue","green")
+
+ if(hidden)
+ hidden_records += R
+ else if(req_coin)
+ coin_records += R
+ else
+ product_records += R
+
+/obj/machinery/vending/proc/refill_inventory(obj/item/vending_refill/refill, datum/data/vending_product/machine, var/charge_type = STANDARD_CHARGE)
+ var/total = 0
+ var/to_restock = 0
+
+ for(var/datum/data/vending_product/machine_content in machine)
+ if(machine_content.amount == 0 && refill.charges[charge_type] > 0)
+ machine_content.amount++
+ refill.charges[charge_type]--
+ total++
+ to_restock += machine_content.max_amount - machine_content.amount
+ if(to_restock <= refill.charges[charge_type])
+ for(var/datum/data/vending_product/machine_content in machine)
+ machine_content.amount = machine_content.max_amount
+ refill.charges[charge_type] -= to_restock
+ total += to_restock
+ else
+ var/tmp_charges = refill.charges[charge_type]
+ for(var/datum/data/vending_product/machine_content in machine)
+ if(refill.charges[charge_type] == 0)
+ break
+ var/restock = Ceiling(((machine_content.max_amount - machine_content.amount)/to_restock)*tmp_charges)
+ if(restock > refill.charges[charge_type])
+ restock = refill.charges[charge_type]
+ machine_content.amount += restock
+ refill.charges[charge_type] -= restock
+ total += restock
+ return total
+
+/obj/machinery/vending/snack/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/reagent_containers/food/snacks))
+ if(!compartment_access_check(user))
+ return
+ var/obj/item/reagent_containers/food/snacks/S = W
+ if(!S.junkiness)
+ if(!iscompartmentfull(user))
+ if(!user.drop_item())
+ return
+ W.loc = src
+ food_load(W)
+ to_chat(user, "You insert [W] into [src]'s chef compartment.")
+ else
+ to_chat(user, "[src]'s chef compartment does not accept junk food.")
+
+ else if(istype(W, /obj/item/storage/bag/tray))
+ if(!compartment_access_check(user))
+ return
+ var/obj/item/storage/T = W
+ var/loaded = 0
+ var/denied_items = 0
+ for(var/obj/item/reagent_containers/food/snacks/S in T.contents)
+ if(iscompartmentfull(user))
+ break
+ if(!S.junkiness)
+ T.remove_from_storage(S, src)
+ food_load(S)
+ loaded++
+ else
+ denied_items++
+ if(denied_items)
+ to_chat(user, "[src] refuses some items.")
+ if(loaded)
+ to_chat(user, "You insert [loaded] dishes into [src]'s chef compartment.")
+ updateUsrDialog()
+ return
+
+ else
+ return ..()
+
+/obj/machinery/vending/snack/proc/compartment_access_check(user)
+ req_access_txt = chef_compartment_access
+ if(!allowed(user) && !emagged && scan_id)
+ to_chat(user, "[src]'s chef compartment blinks red: Access denied.")
+ req_access_txt = "0"
+ return 0
+ req_access_txt = "0"
+ return 1
+
+/obj/machinery/vending/snack/proc/iscompartmentfull(mob/user)
+ if(contents.len >= 30) // no more than 30 dishes can fit inside
+ to_chat(user, "[src]'s chef compartment is full.")
+ return 1
+ return 0
+
+/obj/machinery/vending/snack/proc/food_load(obj/item/reagent_containers/food/snacks/S)
+ if(dish_quants[S.name])
+ dish_quants[S.name]++
+ else
+ dish_quants[S.name] = 1
+ sortList(dish_quants)
+
+/obj/machinery/vending/attackby(obj/item/W, mob/user, params)
+ if(panel_open)
+ if(default_unfasten_wrench(user, W, time = 60))
+ return
+
+ if(component_parts)
+ if(default_deconstruction_crowbar(W))
+ return
+
+ if(istype(W, /obj/item/screwdriver))
+ if(anchored)
+ panel_open = !panel_open
+ to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
+ cut_overlays()
+ if(panel_open)
+ add_overlay("[initial(icon_state)]-panel")
+ playsound(src.loc, W.usesound, 50, 1)
+ updateUsrDialog()
+ else
+ to_chat(user, "You must first secure [src].")
+ return
+ else if(istype(W, /obj/item/device/multitool)||istype(W, /obj/item/wirecutters))
+ if(panel_open)
+ attack_hand(user)
+ return
+ else if(istype(W, /obj/item/coin))
+ if(coin)
+ to_chat(user, "[src] already has [coin] inserted")
+ return
+ if(bill)
+ to_chat(user, "[src] already has [bill] inserted")
+ return
+ if(!premium.len)
+ to_chat(user, "[src] doesn't have a coin slot.")
+ return
+ if(!user.drop_item())
+ return
+ W.loc = src
+ coin = W
+ to_chat(user, "You insert [W] into [src].")
+ return
+ else if(istype(W, /obj/item/stack/spacecash))
+ if(coin)
+ to_chat(user, "[src] already has [coin] inserted")
+ return
+ if(bill)
+ to_chat(user, "[src] already has [bill] inserted")
+ return
+ var/obj/item/stack/S = W
+ if(!premium.len)
+ to_chat(user, "[src] doesn't have a bill slot.")
+ return
+ S.use(1)
+ bill = new S.type(src,1)
+ to_chat(user, "You insert [W] into [src].")
+ return
+ else if(istype(W, refill_canister) && refill_canister != null)
+ if(stat & (BROKEN|NOPOWER))
+ to_chat(user, "It does nothing.")
+ else if(panel_open)
+ //if the panel is open we attempt to refill the machine
+ var/obj/item/vending_refill/canister = W
+ if(canister.charges[STANDARD_CHARGE] == 0)
+ to_chat(user, "This [canister.name] is empty!")
+ else
+ var/transfered = refill_inventory(canister,product_records,STANDARD_CHARGE)
+ transfered += refill_inventory(canister,coin_records,COIN_CHARGE)
+ transfered += refill_inventory(canister,hidden_records,CONTRABAND_CHARGE)
+ if(transfered)
+ to_chat(user, "You loaded [transfered] items in \the [name].")
+ else
+ to_chat(user, "The [name] is fully stocked.")
+ return
+ else
+ to_chat(user, "You should probably unscrew the service panel first.")
+ else
+ return ..()
+
+
+/obj/machinery/vending/on_deconstruction()
+ var/product_list = list(product_records, hidden_records, coin_records)
+ for(var/i=1, i<=3, i++)
+ for(var/datum/data/vending_product/machine_content in product_list[i])
+ while(machine_content.amount !=0)
+ var/safety = 0 //to avoid infinite loop
+ for(var/obj/item/vending_refill/VR in component_parts)
+ safety++
+ if(VR.charges[i] < VR.init_charges[i])
+ VR.charges[i]++
+ machine_content.amount--
+ if(!machine_content.amount)
+ break
+ else
+ safety--
+ if(safety <= 0) // all refill canisters are full
+ break
+ ..()
+
+/obj/machinery/vending/emag_act(mob/user)
if(emagged)
return
emagged = TRUE
to_chat(user, "You short out the product lock on [src].")
-
-/obj/machinery/vending/attack_ai(mob/user)
- return attack_hand(user)
-
-/obj/machinery/vending/attack_hand(mob/user)
- var/dat = ""
- if(panel_open && !isAI(user))
- return wires.interact(user)
- else
- if(stat & (BROKEN|NOPOWER))
- return
-
- dat += "Select an item
"
- dat += ""
- for (var/datum/data/vending_product/R in display_records)
- dat += "
"
- dat += "Chef's Food Selection
"
- dat += "
"
- dat += "Select an item
"
+ dat += ""
+ for (var/datum/data/vending_product/R in display_records)
+ dat += "
"
+ dat += "Chef's Food Selection
"
+ dat += "
"
+ dat += "Tracking beacons data
"
- var/list/trackerlist = list()
- for(var/obj/mecha/MC in GLOB.mechas_list)
- trackerlist += MC.trackers
- for(var/obj/item/mecha_parts/mecha_tracking/TR in trackerlist)
- var/answer = TR.get_mecha_info()
- if(answer)
- dat += {"
[answer]
- Send message
- Show exosuit log | (EMP pulse)
"}
-
- if(screen==1)
- dat += "Log contents
"
- dat += "Return
"
- dat += "[stored_data]"
-
- dat += "(Refresh)
"
- dat += ""
-
- user << browse(dat, "window=computer;size=400x500")
- onclose(user, "computer")
- return
-
-/obj/machinery/computer/mecha/Topic(href, href_list)
- if(..())
- return
- var/datum/topic_input/filter = new /datum/topic_input(href,href_list)
- if(href_list["send_message"])
- var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message")
- var/message = stripped_input(usr,"Input message","Transmit message")
- var/obj/mecha/M = MT.in_mecha()
- if(trim(message) && M)
- M.occupant_message(message)
- return
- if(href_list["shock"])
- var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock")
- MT.shock()
- if(href_list["get_log"])
- var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("get_log")
- stored_data = MT.get_mecha_log()
- screen = 1
- if(href_list["return"])
- screen = 0
- updateUsrDialog()
- return
-
-/obj/item/mecha_parts/mecha_tracking
- name = "exosuit tracking beacon"
- desc = "Device used to transmit exosuit data."
- icon = 'icons/obj/device.dmi'
- icon_state = "motion2"
- w_class = WEIGHT_CLASS_SMALL
- origin_tech = "programming=2;magnets=2"
- var/ai_beacon = FALSE //If this beacon allows for AI control. Exists to avoid using istype() on checking.
-
-/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info()
- if(!in_mecha())
- return 0
- var/obj/mecha/M = src.loc
- var/cell_charge = M.get_charge()
- var/answer = {"Name: [M.name]
-Integrity: [M.obj_integrity/M.max_integrity*100]%
-Cell charge: [isnull(cell_charge)?"Not found":"[M.cell.percent()]%"]
-Airtank: [M.return_pressure()]kPa
-Pilot: [M.occupant||"None"]
-Location: [get_area(M)||"Unknown"]
-Active equipment: [M.selected||"None"] "}
- if(istype(M, /obj/mecha/working/ripley))
- var/obj/mecha/working/ripley/RM = M
- answer += "Used cargo space: [RM.cargo.len/RM.cargo_capacity*100]%
"
-
- return answer
-
-/obj/item/mecha_parts/mecha_tracking/emp_act()
- qdel(src)
-
-/obj/item/mecha_parts/mecha_tracking/Destroy()
- if(istype(loc, /obj/mecha))
- 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
- return 0
-
-/obj/item/mecha_parts/mecha_tracking/proc/shock()
- var/obj/mecha/M = in_mecha()
- if(M)
+ circuit = /obj/item/circuitboard/computer/mecha_control
+ var/list/located = list()
+ var/screen = 0
+ var/stored_data
+
+/obj/machinery/computer/mecha/attack_hand(mob/user)
+ if(..())
+ return
+ user.set_machine(src)
+ var/dat = "Tracking beacons data
"
+ var/list/trackerlist = list()
+ for(var/obj/mecha/MC in GLOB.mechas_list)
+ trackerlist += MC.trackers
+ for(var/obj/item/mecha_parts/mecha_tracking/TR in trackerlist)
+ var/answer = TR.get_mecha_info()
+ if(answer)
+ dat += {"
[answer]
+ Send message
+ Show exosuit log | (EMP pulse)
"}
+
+ if(screen==1)
+ dat += "Log contents
"
+ dat += "Return
"
+ dat += "[stored_data]"
+
+ dat += "(Refresh)
"
+ dat += ""
+
+ user << browse(dat, "window=computer;size=400x500")
+ onclose(user, "computer")
+ return
+
+/obj/machinery/computer/mecha/Topic(href, href_list)
+ if(..())
+ return
+ var/datum/topic_input/filter = new /datum/topic_input(href,href_list)
+ if(href_list["send_message"])
+ var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message")
+ var/message = stripped_input(usr,"Input message","Transmit message")
+ var/obj/mecha/M = MT.in_mecha()
+ if(trim(message) && M)
+ M.occupant_message(message)
+ return
+ if(href_list["shock"])
+ var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock")
+ MT.shock()
+ if(href_list["get_log"])
+ var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("get_log")
+ stored_data = MT.get_mecha_log()
+ screen = 1
+ if(href_list["return"])
+ screen = 0
+ updateUsrDialog()
+ return
+
+/obj/item/mecha_parts/mecha_tracking
+ name = "exosuit tracking beacon"
+ desc = "Device used to transmit exosuit data."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "motion2"
+ w_class = WEIGHT_CLASS_SMALL
+ origin_tech = "programming=2;magnets=2"
+ var/ai_beacon = FALSE //If this beacon allows for AI control. Exists to avoid using istype() on checking.
+
+/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info()
+ if(!in_mecha())
+ return 0
+ var/obj/mecha/M = src.loc
+ var/cell_charge = M.get_charge()
+ var/answer = {"Name: [M.name]
+Integrity: [M.obj_integrity/M.max_integrity*100]%
+Cell charge: [isnull(cell_charge)?"Not found":"[M.cell.percent()]%"]
+Airtank: [M.return_pressure()]kPa
+Pilot: [M.occupant||"None"]
+Location: [get_area(M)||"Unknown"]
+Active equipment: [M.selected||"None"] "}
+ if(istype(M, /obj/mecha/working/ripley))
+ var/obj/mecha/working/ripley/RM = M
+ answer += "Used cargo space: [RM.cargo.len/RM.cargo_capacity*100]%
"
+
+ return answer
+
+/obj/item/mecha_parts/mecha_tracking/emp_act()
+ qdel(src)
+
+/obj/item/mecha_parts/mecha_tracking/Destroy()
+ 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(ismecha(loc))
+ return loc
+ return 0
+
+/obj/item/mecha_parts/mecha_tracking/proc/shock()
+ var/obj/mecha/M = in_mecha()
+ if(M)
M.emp_act(EMP_LIGHT)
- qdel(src)
-
-/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log()
- if(!istype(loc, /obj/mecha))
- return 0
- var/obj/mecha/M = src.loc
- return M.get_log_html()
-
-
-/obj/item/mecha_parts/mecha_tracking/ai_control
- name = "exosuit AI control beacon"
- desc = "A device used to transmit exosuit data. Also allows active AI units to take control of said exosuit."
- origin_tech = "programming=3;magnets=2;engineering=2"
- ai_beacon = TRUE
-
-
-/obj/item/storage/box/mechabeacons
- name = "exosuit tracking beacons"
-
-/obj/item/storage/box/mechabeacons/New()
- ..()
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
+ qdel(src)
+
+/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log()
+ if(!ismecha(loc))
+ return 0
+ var/obj/mecha/M = src.loc
+ return M.get_log_html()
+
+
+/obj/item/mecha_parts/mecha_tracking/ai_control
+ name = "exosuit AI control beacon"
+ desc = "A device used to transmit exosuit data. Also allows active AI units to take control of said exosuit."
+ origin_tech = "programming=3;magnets=2;engineering=2"
+ ai_beacon = TRUE
+
+
+/obj/item/storage/box/mechabeacons
+ name = "exosuit tracking beacons"
+
+/obj/item/storage/box/mechabeacons/New()
+ ..()
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 863e3f32cc..674854c22e 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -1,404 +1,404 @@
-/////////////////////////
-////// Mecha Parts //////
-/////////////////////////
-
-/obj/item/mecha_parts
- name = "mecha part"
- icon = 'icons/mecha/mech_construct.dmi'
- icon_state = "blank"
- w_class = WEIGHT_CLASS_GIGANTIC
+/////////////////////////
+////// Mecha Parts //////
+/////////////////////////
+
+/obj/item/mecha_parts
+ name = "mecha part"
+ icon = 'icons/mecha/mech_construct.dmi'
+ icon_state = "blank"
+ w_class = WEIGHT_CLASS_GIGANTIC
flags_1 = CONDUCT_1
- origin_tech = "programming=2;materials=2;engineering=2"
-
-/obj/item/mecha_parts/chassis
- name="Mecha Chassis"
- icon_state = "backbone"
- var/datum/construction/construct
-
-/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params)
- if(!construct || !construct.action(W, user))
- return ..()
-
-/obj/item/mecha_parts/chassis/attack_hand()
- return
-
-/////////// Ripley
-
-/obj/item/mecha_parts/chassis/ripley
- name = "\improper Ripley chassis"
-
-/obj/item/mecha_parts/chassis/ripley/New()
- ..()
- construct = new /datum/construction/mecha/ripley_chassis(src)
-
-/obj/item/mecha_parts/part/ripley_torso
- name = "\improper Ripley torso"
- desc = "A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
- icon_state = "ripley_harness"
- origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
-
-/obj/item/mecha_parts/part/ripley_left_arm
- name = "\improper Ripley left arm"
- desc = "A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
- icon_state = "ripley_l_arm"
-
-/obj/item/mecha_parts/part/ripley_right_arm
- name = "\improper Ripley right arm"
- desc = "A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
- icon_state = "ripley_r_arm"
-
-/obj/item/mecha_parts/part/ripley_left_leg
- name = "\improper Ripley left leg"
- desc = "A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
- icon_state = "ripley_l_leg"
-
-/obj/item/mecha_parts/part/ripley_right_leg
- name = "\improper Ripley right leg"
- desc = "A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
- icon_state = "ripley_r_leg"
-
-///////// Odysseus
-
-/obj/item/mecha_parts/chassis/odysseus
- name = "\improper Odysseus chassis"
-
-/obj/item/mecha_parts/chassis/odysseus/New()
- ..()
- construct = new /datum/construction/mecha/odysseus_chassis(src)
-
-/obj/item/mecha_parts/part/odysseus_head
- name = "\improper Odysseus head"
- desc = "An Odysseus head. Contains an integrated medical HUD scanner."
- icon_state = "odysseus_head"
-
-/obj/item/mecha_parts/part/odysseus_torso
- name = "\improper Odysseus torso"
- desc="A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper."
- icon_state = "odysseus_torso"
- origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
-
-/obj/item/mecha_parts/part/odysseus_left_arm
- name = "\improper Odysseus left arm"
- desc = "An Odysseus left arm. Data and power sockets are compatible with specialized medical equipment."
- icon_state = "odysseus_l_arm"
-
-/obj/item/mecha_parts/part/odysseus_right_arm
- name = "\improper Odysseus right arm"
- desc = "An Odysseus right arm. Data and power sockets are compatible with specialized medical equipment."
- icon_state = "odysseus_r_arm"
-
-/obj/item/mecha_parts/part/odysseus_left_leg
- name = "\improper Odysseus left leg"
- desc = "An Odysseus left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
- icon_state = "odysseus_l_leg"
-
-/obj/item/mecha_parts/part/odysseus_right_leg
- name = "\improper Odysseus right leg"
- desc = "A Odysseus right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
- icon_state = "odysseus_r_leg"
-
-///////// Gygax
-
-/obj/item/mecha_parts/chassis/gygax
- name = "\improper Gygax chassis"
-
-/obj/item/mecha_parts/chassis/gygax/New()
- ..()
- construct = new /datum/construction/mecha/gygax_chassis(src)
-
-/obj/item/mecha_parts/part/gygax_torso
- name = "\improper Gygax torso"
- desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
- icon_state = "gygax_harness"
- origin_tech = "programming=2;materials=4;biotech=3;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_head
- name = "\improper Gygax head"
- desc = "A Gygax head. Houses advanced surveillance and targeting sensors."
- icon_state = "gygax_head"
- origin_tech = "programming=2;materials=4;magnets=3;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_left_arm
- name = "\improper Gygax left arm"
- desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
- icon_state = "gygax_l_arm"
- origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_right_arm
- name = "\improper Gygax right arm"
- desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
- icon_state = "gygax_r_arm"
- origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_left_leg
- name = "\improper Gygax left leg"
- desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
- icon_state = "gygax_l_leg"
- origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_right_leg
- name = "\improper Gygax right leg"
- desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
- icon_state = "gygax_r_leg"
- origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_armor
- gender = PLURAL
- name = "\improper Gygax armor plates"
- desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
- icon_state = "gygax_armor"
- origin_tech = "materials=6;combat=4;engineering=4"
-
-
-//////////// Durand
-
-/obj/item/mecha_parts/chassis/durand
- name = "\improper Durand chassis"
-
-/obj/item/mecha_parts/chassis/durand/New()
- ..()
- construct = new /datum/construction/mecha/durand_chassis(src)
-
-/obj/item/mecha_parts/part/durand_torso
- name = "\improper Durand torso"
- desc = "A torso part of Durand. Contains power unit, processing core and life support systems within a robust protective frame."
- icon_state = "durand_harness"
- origin_tech = "programming=2;materials=3;biotech=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_head
- name = "\improper Durand head"
- desc = "A Durand head. Houses advanced surveillance and targeting sensors."
- icon_state = "durand_head"
- origin_tech = "programming=2;materials=3;magnets=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_left_arm
- name = "\improper Durand left arm"
- desc = "A Durand left arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
- icon_state = "durand_l_arm"
- origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_right_arm
- name = "\improper Durand right arm"
- desc = "A Durand right arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
- icon_state = "durand_r_arm"
- origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_left_leg
- name = "\improper Durand left leg"
- desc = "A Durand left leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
- icon_state = "durand_l_leg"
- origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_right_leg
- name = "\improper Durand right leg"
- desc = "A Durand right leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
- icon_state = "durand_r_leg"
- origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_armor
- gender = PLURAL
- name = "\improper Durand armor plates"
- desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force."
- icon_state = "durand_armor"
- origin_tech = "materials=5;combat=4;engineering=4"
-
-////////// Firefighter
-
-/obj/item/mecha_parts/chassis/firefighter
- name = "Firefighter chassis"
-
-/obj/item/mecha_parts/chassis/firefighter/New()
- ..()
- construct = new /datum/construction/mecha/firefighter_chassis(src)
-
-
-////////// HONK
-
-/obj/item/mecha_parts/chassis/honker
- name = "\improper H.O.N.K chassis"
-
-/obj/item/mecha_parts/chassis/honker/New()
- ..()
- construct = new /datum/construction/mecha/honker_chassis(src)
-
-/obj/item/mecha_parts/part/honker_torso
- name = "\improper H.O.N.K torso"
- desc = "A torso part of H.O.N.K. Contains chuckle unit, bananium core and honk support systems."
- icon_state = "honker_harness"
-
-/obj/item/mecha_parts/part/honker_head
- name = "\improper H.O.N.K head"
- desc = "A H.O.N.K head. Appears to lack a face plate."
- icon_state = "honker_head"
-
-/obj/item/mecha_parts/part/honker_left_arm
- name = "\improper H.O.N.K left arm"
- desc = "A H.O.N.K left arm. With unique sockets that accept odd weaponry designed by clown scientists."
- icon_state = "honker_l_arm"
-
-/obj/item/mecha_parts/part/honker_right_arm
- name = "\improper H.O.N.K right arm"
- desc = "A H.O.N.K right arm. With unique sockets that accept odd weaponry designed by clown scientists."
- icon_state = "honker_r_arm"
-
-/obj/item/mecha_parts/part/honker_left_leg
- name = "\improper H.O.N.K left leg"
- desc = "A H.O.N.K left leg. The foot appears just large enough to fully accommodate a clown shoe."
- icon_state = "honker_l_leg"
-
-/obj/item/mecha_parts/part/honker_right_leg
- name = "\improper H.O.N.K right leg"
- desc = "A H.O.N.K right leg. The foot appears just large enough to fully accommodate a clown shoe."
- icon_state = "honker_r_leg"
-
-
-////////// Phazon
-
-/obj/item/mecha_parts/chassis/phazon
- name = "\improper Phazon chassis"
-
-/obj/item/mecha_parts/chassis/phazon/New()
- ..()
- construct = new /datum/construction/mecha/phazon_chassis(src)
-
-/obj/item/mecha_parts/part/phazon_torso
- name="\improper Phazon torso"
- desc="A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle."
- icon_state = "phazon_harness"
- origin_tech = "programming=4;materials=4;bluespace=4;plasmatech=5"
-
-/obj/item/mecha_parts/part/phazon_head
- name="\improper Phazon head"
- desc="A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing."
- icon_state = "phazon_head"
- origin_tech = "programming=3;materials=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_left_arm
- name="\improper Phazon left arm"
- desc="A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
- icon_state = "phazon_l_arm"
- origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_right_arm
- name="\improper Phazon right arm"
- desc="A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
- icon_state = "phazon_r_arm"
- origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_left_leg
- name="\improper Phazon left leg"
- desc="A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
- icon_state = "phazon_l_leg"
- origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_right_leg
- name="\improper Phazon right leg"
- desc="A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
- icon_state = "phazon_r_leg"
- origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_armor
- name="Phazon armor"
- desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
- icon_state = "phazon_armor"
- origin_tech = "materials=4;bluespace=4;plasmatech=5"
-
-
-///////// Circuitboards
-
-/obj/item/circuitboard/mecha
- name = "exosuit circuit board"
- icon = 'icons/obj/module.dmi'
- icon_state = "std_mod"
- item_state = "electronic"
+ origin_tech = "programming=2;materials=2;engineering=2"
+
+/obj/item/mecha_parts/chassis
+ name="Mecha Chassis"
+ icon_state = "backbone"
+ var/datum/construction/construct
+
+/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params)
+ if(!construct || !construct.action(W, user))
+ return ..()
+
+/obj/item/mecha_parts/chassis/attack_hand()
+ return
+
+/////////// Ripley
+
+/obj/item/mecha_parts/chassis/ripley
+ name = "\improper Ripley chassis"
+
+/obj/item/mecha_parts/chassis/ripley/New()
+ ..()
+ construct = new /datum/construction/mecha/ripley_chassis(src)
+
+/obj/item/mecha_parts/part/ripley_torso
+ name = "\improper Ripley torso"
+ desc = "A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
+ icon_state = "ripley_harness"
+ origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/ripley_left_arm
+ name = "\improper Ripley left arm"
+ desc = "A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
+ icon_state = "ripley_l_arm"
+
+/obj/item/mecha_parts/part/ripley_right_arm
+ name = "\improper Ripley right arm"
+ desc = "A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
+ icon_state = "ripley_r_arm"
+
+/obj/item/mecha_parts/part/ripley_left_leg
+ name = "\improper Ripley left leg"
+ desc = "A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
+ icon_state = "ripley_l_leg"
+
+/obj/item/mecha_parts/part/ripley_right_leg
+ name = "\improper Ripley right leg"
+ desc = "A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
+ icon_state = "ripley_r_leg"
+
+///////// Odysseus
+
+/obj/item/mecha_parts/chassis/odysseus
+ name = "\improper Odysseus chassis"
+
+/obj/item/mecha_parts/chassis/odysseus/New()
+ ..()
+ construct = new /datum/construction/mecha/odysseus_chassis(src)
+
+/obj/item/mecha_parts/part/odysseus_head
+ name = "\improper Odysseus head"
+ desc = "An Odysseus head. Contains an integrated medical HUD scanner."
+ icon_state = "odysseus_head"
+
+/obj/item/mecha_parts/part/odysseus_torso
+ name = "\improper Odysseus torso"
+ desc="A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper."
+ icon_state = "odysseus_torso"
+ origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/odysseus_left_arm
+ name = "\improper Odysseus left arm"
+ desc = "An Odysseus left arm. Data and power sockets are compatible with specialized medical equipment."
+ icon_state = "odysseus_l_arm"
+
+/obj/item/mecha_parts/part/odysseus_right_arm
+ name = "\improper Odysseus right arm"
+ desc = "An Odysseus right arm. Data and power sockets are compatible with specialized medical equipment."
+ icon_state = "odysseus_r_arm"
+
+/obj/item/mecha_parts/part/odysseus_left_leg
+ name = "\improper Odysseus left leg"
+ desc = "An Odysseus left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
+ icon_state = "odysseus_l_leg"
+
+/obj/item/mecha_parts/part/odysseus_right_leg
+ name = "\improper Odysseus right leg"
+ desc = "An odysseus right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
+ icon_state = "odysseus_r_leg"
+
+///////// Gygax
+
+/obj/item/mecha_parts/chassis/gygax
+ name = "\improper Gygax chassis"
+
+/obj/item/mecha_parts/chassis/gygax/New()
+ ..()
+ construct = new /datum/construction/mecha/gygax_chassis(src)
+
+/obj/item/mecha_parts/part/gygax_torso
+ name = "\improper Gygax torso"
+ desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
+ icon_state = "gygax_harness"
+ origin_tech = "programming=2;materials=4;biotech=3;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_head
+ name = "\improper Gygax head"
+ desc = "A Gygax head. Houses advanced surveillance and targeting sensors."
+ icon_state = "gygax_head"
+ origin_tech = "programming=2;materials=4;magnets=3;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_left_arm
+ name = "\improper Gygax left arm"
+ desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
+ icon_state = "gygax_l_arm"
+ origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_right_arm
+ name = "\improper Gygax right arm"
+ desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
+ icon_state = "gygax_r_arm"
+ origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_left_leg
+ name = "\improper Gygax left leg"
+ desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+ icon_state = "gygax_l_leg"
+ origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_right_leg
+ name = "\improper Gygax right leg"
+ desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+ icon_state = "gygax_r_leg"
+ origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_armor
+ gender = PLURAL
+ name = "\improper Gygax armor plates"
+ desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
+ icon_state = "gygax_armor"
+ origin_tech = "materials=6;combat=4;engineering=4"
+
+
+//////////// Durand
+
+/obj/item/mecha_parts/chassis/durand
+ name = "\improper Durand chassis"
+
+/obj/item/mecha_parts/chassis/durand/New()
+ ..()
+ construct = new /datum/construction/mecha/durand_chassis(src)
+
+/obj/item/mecha_parts/part/durand_torso
+ name = "\improper Durand torso"
+ desc = "A torso part of Durand. Contains power unit, processing core and life support systems within a robust protective frame."
+ icon_state = "durand_harness"
+ origin_tech = "programming=2;materials=3;biotech=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_head
+ name = "\improper Durand head"
+ desc = "A Durand head. Houses advanced surveillance and targeting sensors."
+ icon_state = "durand_head"
+ origin_tech = "programming=2;materials=3;magnets=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_left_arm
+ name = "\improper Durand left arm"
+ desc = "A Durand left arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
+ icon_state = "durand_l_arm"
+ origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_right_arm
+ name = "\improper Durand right arm"
+ desc = "A Durand right arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
+ icon_state = "durand_r_arm"
+ origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_left_leg
+ name = "\improper Durand left leg"
+ desc = "A Durand left leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
+ icon_state = "durand_l_leg"
+ origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_right_leg
+ name = "\improper Durand right leg"
+ desc = "A Durand right leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
+ icon_state = "durand_r_leg"
+ origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_armor
+ gender = PLURAL
+ name = "\improper Durand armor plates"
+ desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force."
+ icon_state = "durand_armor"
+ origin_tech = "materials=5;combat=4;engineering=4"
+
+////////// Firefighter
+
+/obj/item/mecha_parts/chassis/firefighter
+ name = "Firefighter chassis"
+
+/obj/item/mecha_parts/chassis/firefighter/New()
+ ..()
+ construct = new /datum/construction/mecha/firefighter_chassis(src)
+
+
+////////// HONK
+
+/obj/item/mecha_parts/chassis/honker
+ name = "\improper H.O.N.K chassis"
+
+/obj/item/mecha_parts/chassis/honker/New()
+ ..()
+ construct = new /datum/construction/mecha/honker_chassis(src)
+
+/obj/item/mecha_parts/part/honker_torso
+ name = "\improper H.O.N.K torso"
+ desc = "A torso part of H.O.N.K. Contains chuckle unit, bananium core and honk support systems."
+ icon_state = "honker_harness"
+
+/obj/item/mecha_parts/part/honker_head
+ name = "\improper H.O.N.K head"
+ desc = "A H.O.N.K head. Appears to lack a face plate."
+ icon_state = "honker_head"
+
+/obj/item/mecha_parts/part/honker_left_arm
+ name = "\improper H.O.N.K left arm"
+ desc = "A H.O.N.K left arm. With unique sockets that accept odd weaponry designed by clown scientists."
+ icon_state = "honker_l_arm"
+
+/obj/item/mecha_parts/part/honker_right_arm
+ name = "\improper H.O.N.K right arm"
+ desc = "A H.O.N.K right arm. With unique sockets that accept odd weaponry designed by clown scientists."
+ icon_state = "honker_r_arm"
+
+/obj/item/mecha_parts/part/honker_left_leg
+ name = "\improper H.O.N.K left leg"
+ desc = "A H.O.N.K left leg. The foot appears just large enough to fully accommodate a clown shoe."
+ icon_state = "honker_l_leg"
+
+/obj/item/mecha_parts/part/honker_right_leg
+ name = "\improper H.O.N.K right leg"
+ desc = "A H.O.N.K right leg. The foot appears just large enough to fully accommodate a clown shoe."
+ icon_state = "honker_r_leg"
+
+
+////////// Phazon
+
+/obj/item/mecha_parts/chassis/phazon
+ name = "\improper Phazon chassis"
+
+/obj/item/mecha_parts/chassis/phazon/New()
+ ..()
+ construct = new /datum/construction/mecha/phazon_chassis(src)
+
+/obj/item/mecha_parts/part/phazon_torso
+ name="\improper Phazon torso"
+ desc="A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle."
+ icon_state = "phazon_harness"
+ origin_tech = "programming=4;materials=4;bluespace=4;plasmatech=5"
+
+/obj/item/mecha_parts/part/phazon_head
+ name="\improper Phazon head"
+ desc="A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing."
+ icon_state = "phazon_head"
+ origin_tech = "programming=3;materials=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_left_arm
+ name="\improper Phazon left arm"
+ desc="A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
+ icon_state = "phazon_l_arm"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_right_arm
+ name="\improper Phazon right arm"
+ desc="A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
+ icon_state = "phazon_r_arm"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_left_leg
+ name="\improper Phazon left leg"
+ desc="A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
+ icon_state = "phazon_l_leg"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_right_leg
+ name="\improper Phazon right leg"
+ desc="A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
+ icon_state = "phazon_r_leg"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_armor
+ name="Phazon armor"
+ desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
+ icon_state = "phazon_armor"
+ origin_tech = "materials=4;bluespace=4;plasmatech=5"
+
+
+///////// Circuitboards
+
+/obj/item/circuitboard/mecha
+ name = "exosuit circuit board"
+ icon = 'icons/obj/module.dmi'
+ icon_state = "std_mod"
+ item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags_1 = CONDUCT_1
- force = 5
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 0
- throw_speed = 3
- throw_range = 7
-
-/obj/item/circuitboard/mecha/ripley
- origin_tech = "programming=2"
-
-/obj/item/circuitboard/mecha/ripley/peripherals
- name = "Ripley Peripherals Control module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/ripley/main
- name = "Ripley Central Control module (Exosuit Board)"
- icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/gygax
- origin_tech = "programming=4;combat=3;engineering=3"
-
-/obj/item/circuitboard/mecha/gygax/peripherals
- name = "Gygax Peripherals Control module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/gygax/targeting
- name = "Gygax Weapon Control and Targeting module (Exosuit Board)"
- icon_state = "mcontroller"
- origin_tech = "programming=4;combat=4"
-
-/obj/item/circuitboard/mecha/gygax/main
- name = "Gygax Central Control module (Exosuit Board)"
- icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/durand
- origin_tech = "programming=4;combat=3;engineering=3"
-
-/obj/item/circuitboard/mecha/durand/peripherals
- name = "Durand Peripherals Control module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/durand/targeting
- name = "Durand Weapon Control and Targeting module (Exosuit Board)"
- icon_state = "mcontroller"
- origin_tech = "programming=4;combat=4;engineering=3"
-
-/obj/item/circuitboard/mecha/durand/main
- name = "Durand Central Control module (Exosuit Board)"
- icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/honker
- origin_tech = "programming=3;engineering=3"
-
-/obj/item/circuitboard/mecha/honker/peripherals
- name = "H.O.N.K Peripherals Control module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/honker/targeting
- name = "H.O.N.K Weapon Control and Targeting module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/honker/main
- name = "H.O.N.K Central Control module (Exosuit Board)"
- icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/odysseus
- origin_tech = "programming=3;biotech=3"
-
-/obj/item/circuitboard/mecha/odysseus/peripherals
- name = "Odysseus Peripherals Control module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/odysseus/main
- name = "Odysseus Central Control module (Exosuit Board)"
- icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/phazon
- origin_tech = "programming=5;plasmatech=4"
-
-/obj/item/circuitboard/mecha/phazon/peripherals
- name = "Phazon Peripherals Control module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/phazon/targeting
- name = "Phazon Weapon Control and Targeting module (Exosuit Board)"
- icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/phazon/main
- name = "Phazon Central Control module (Exosuit Board)"
+ force = 5
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 0
+ throw_speed = 3
+ throw_range = 7
+
+/obj/item/circuitboard/mecha/ripley
+ origin_tech = "programming=2"
+
+/obj/item/circuitboard/mecha/ripley/peripherals
+ name = "Ripley Peripherals Control module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/ripley/main
+ name = "Ripley Central Control module (Exosuit Board)"
+ icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/gygax
+ origin_tech = "programming=4;combat=3;engineering=3"
+
+/obj/item/circuitboard/mecha/gygax/peripherals
+ name = "Gygax Peripherals Control module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/gygax/targeting
+ name = "Gygax Weapon Control and Targeting module (Exosuit Board)"
+ icon_state = "mcontroller"
+ origin_tech = "programming=4;combat=4"
+
+/obj/item/circuitboard/mecha/gygax/main
+ name = "Gygax Central Control module (Exosuit Board)"
+ icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/durand
+ origin_tech = "programming=4;combat=3;engineering=3"
+
+/obj/item/circuitboard/mecha/durand/peripherals
+ name = "Durand Peripherals Control module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/durand/targeting
+ name = "Durand Weapon Control and Targeting module (Exosuit Board)"
+ icon_state = "mcontroller"
+ origin_tech = "programming=4;combat=4;engineering=3"
+
+/obj/item/circuitboard/mecha/durand/main
+ name = "Durand Central Control module (Exosuit Board)"
+ icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/honker
+ origin_tech = "programming=3;engineering=3"
+
+/obj/item/circuitboard/mecha/honker/peripherals
+ name = "H.O.N.K Peripherals Control module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/honker/targeting
+ name = "H.O.N.K Weapon Control and Targeting module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/honker/main
+ name = "H.O.N.K Central Control module (Exosuit Board)"
+ icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/odysseus
+ origin_tech = "programming=3;biotech=3"
+
+/obj/item/circuitboard/mecha/odysseus/peripherals
+ name = "Odysseus Peripherals Control module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/odysseus/main
+ name = "Odysseus Central Control module (Exosuit Board)"
+ icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/phazon
+ origin_tech = "programming=5;plasmatech=4"
+
+/obj/item/circuitboard/mecha/phazon/peripherals
+ name = "Phazon Peripherals Control module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/phazon/targeting
+ name = "Phazon Weapon Control and Targeting module (Exosuit Board)"
+ icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/phazon/main
+ name = "Phazon Central Control module (Exosuit Board)"
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index 4df6578c50..87009ac292 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -115,6 +115,7 @@
[maint_access?"Forbid":"Permit"] maintenance protocols
+ [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
DNA-lock
View internal log
Change exosuit name
@@ -306,6 +307,24 @@
maint_access = !maint_access
send_byjax(src.occupant,"exosuit.browser","t_maint_access","[maint_access?"Forbid":"Permit"] maintenance protocols")
+ if (href_list["toggle_port_connection"])
+ if(internal_tank.connected_port)
+ if(internal_tank.disconnect())
+ occupant_message("Disconnected from the air system port.")
+ log_message("Disconnected from gas port.")
+ else
+ occupant_message("Unable to disconnect from the air system port!")
+ return
+ else
+ var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate() in loc
+ if(internal_tank.connect(possible_port))
+ occupant_message("Connected to the air system port.")
+ log_message("Connected to gas port.")
+ else
+ occupant_message("Unable to connect with air system port!")
+ return
+ send_byjax(occupant,"exosuit.browser","t_port_connection","[internal_tank.connected_port?"Disconnect from":"Connect to"] gas port")
+
if(href_list["dna_lock"])
if(occupant && !iscarbon(occupant))
to_chat(occupant, " You do not have any DNA!")
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 0648300147..ac54647468 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -62,7 +62,7 @@
M.setDir(dir)
buckled_mobs |= M
M.update_canmove()
- M.throw_alert("buckled", /obj/screen/alert/restrained/buckled, new_master = src)
+ M.throw_alert("buckled", /obj/screen/alert/restrained/buckled)
post_buckle_mob(M)
return TRUE
@@ -131,5 +131,3 @@
"You hear metal clanking.")
add_fingerprint(user)
return M
-
-
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 3692af855b..ee11c009fd 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -18,7 +18,7 @@
var/obj/effect/countdown/anomaly/countdown
/obj/effect/anomaly/Initialize(mapload, new_lifespan)
- ..()
+ . = ..()
GLOB.poi_list |= src
START_PROCESSING(SSobj, src)
impact_area = get_area(src)
diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm
index 05ba68d51e..76208f54fa 100644
--- a/code/game/objects/effects/countdown.dm
+++ b/code/game/objects/effects/countdown.dm
@@ -97,21 +97,6 @@
var/completion = round(C.get_completion())
return completion
-/obj/effect/countdown/dominator
- name = "dominator countdown"
- text_size = 1
- color = "#ff00ff" // Overwritten when the dominator starts
-
-/obj/effect/countdown/dominator/get_value()
- var/obj/machinery/dominator/D = attached_to
- if(!istype(D))
- return
- else if(D.gang && D.gang.is_dominating)
- var/timer = D.gang.domination_time_remaining()
- return timer
- else
- return "OFFLINE"
-
/obj/effect/countdown/clockworkgate
name = "gateway countdown"
text_size = 1
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 75e8fbc02d..2aca5c534b 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -1,91 +1,91 @@
-/obj/effect/decal/cleanable
- gender = PLURAL
- layer = ABOVE_NORMAL_TURF_LAYER
- var/list/random_icon_states = list()
- var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
- var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
- var/mergeable_decal = 1 //when two of these are on a same tile or do we need to merge them into just one?
-
-/obj/effect/decal/cleanable/Initialize(mapload)
- if (random_icon_states && length(src.random_icon_states) > 0)
- src.icon_state = pick(src.random_icon_states)
- create_reagents(300)
- if(src.loc && isturf(src.loc))
- for(var/obj/effect/decal/cleanable/C in src.loc)
- if(C != src && C.type == src.type)
- replace_decal(C)
- ..()
-
-
-
-/obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C)
- if(mergeable_decal)
- qdel(C)
-
-/obj/effect/decal/cleanable/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/glass) || istype(W, /obj/item/reagent_containers/food/drinks))
- if(src.reagents && W.reagents)
- . = 1 //so the containers don't splash their content on the src while scooping.
- if(!src.reagents.total_volume)
- to_chat(user, "[src] isn't thick enough to scoop up!")
- return
- if(W.reagents.total_volume >= W.reagents.maximum_volume)
- to_chat(user, "[W] is full!")
- return
- to_chat(user, "You scoop up [src] into [W]!")
- reagents.trans_to(W, reagents.total_volume)
- if(!reagents.total_volume) //scooped up all of it
- qdel(src)
- return
- if(W.is_hot()) //todo: make heating a reagent holder proc
- if(istype(W, /obj/item/clothing/mask/cigarette))
- return
- else
- var/hotness = W.is_hot()
- var/added_heat = (hotness / 100)
- src.reagents.chem_temp = min(src.reagents.chem_temp + added_heat, hotness)
- src.reagents.handle_reactions()
- to_chat(user, "You heat [src] with [W]!")
- else
- return ..()
-
-/obj/effect/decal/cleanable/ex_act()
- if(reagents)
- for(var/datum/reagent/R in reagents.reagent_list)
- R.on_ex_act()
- ..()
-
-/obj/effect/decal/cleanable/fire_act(exposed_temperature, exposed_volume)
- if(reagents)
- reagents.chem_temp += 30
- reagents.handle_reactions()
- ..()
-
-
-//Add "bloodiness" of this blood's type, to the human's shoes
-//This is on /cleanable because fuck this ancient mess
-/obj/effect/decal/cleanable/Crossed(atom/movable/O)
- if(ishuman(O))
- var/mob/living/carbon/human/H = O
- if(H.shoes && blood_state && bloodiness)
- var/obj/item/clothing/shoes/S = H.shoes
- var/add_blood = 0
- if(bloodiness >= BLOOD_GAIN_PER_STEP)
- add_blood = BLOOD_GAIN_PER_STEP
- else
- add_blood = bloodiness
- bloodiness -= add_blood
- S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS,S.bloody_shoes[blood_state]+add_blood)
- if(blood_DNA && blood_DNA.len)
- S.add_blood(blood_DNA)
- S.blood_state = blood_state
- update_icon()
- H.update_inv_shoes()
-
-
-
-/obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
- if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
- return bloodiness
- else
- return 0
+/obj/effect/decal/cleanable
+ gender = PLURAL
+ layer = ABOVE_NORMAL_TURF_LAYER
+ var/list/random_icon_states = list()
+ var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
+ var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
+ var/mergeable_decal = 1 //when two of these are on a same tile or do we need to merge them into just one?
+
+/obj/effect/decal/cleanable/Initialize(mapload)
+ if (random_icon_states && length(src.random_icon_states) > 0)
+ src.icon_state = pick(src.random_icon_states)
+ create_reagents(300)
+ if(src.loc && isturf(src.loc))
+ for(var/obj/effect/decal/cleanable/C in src.loc)
+ if(C != src && C.type == src.type)
+ replace_decal(C)
+ . = ..()
+
+
+
+/obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C)
+ if(mergeable_decal)
+ qdel(C)
+
+/obj/effect/decal/cleanable/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/reagent_containers/glass) || istype(W, /obj/item/reagent_containers/food/drinks))
+ if(src.reagents && W.reagents)
+ . = 1 //so the containers don't splash their content on the src while scooping.
+ if(!src.reagents.total_volume)
+ to_chat(user, "[src] isn't thick enough to scoop up!")
+ return
+ if(W.reagents.total_volume >= W.reagents.maximum_volume)
+ to_chat(user, "[W] is full!")
+ return
+ to_chat(user, "You scoop up [src] into [W]!")
+ reagents.trans_to(W, reagents.total_volume)
+ if(!reagents.total_volume) //scooped up all of it
+ qdel(src)
+ return
+ if(W.is_hot()) //todo: make heating a reagent holder proc
+ if(istype(W, /obj/item/clothing/mask/cigarette))
+ return
+ else
+ var/hotness = W.is_hot()
+ var/added_heat = (hotness / 100)
+ src.reagents.chem_temp = min(src.reagents.chem_temp + added_heat, hotness)
+ src.reagents.handle_reactions()
+ to_chat(user, "You heat [src] with [W]!")
+ else
+ return ..()
+
+/obj/effect/decal/cleanable/ex_act()
+ if(reagents)
+ for(var/datum/reagent/R in reagents.reagent_list)
+ R.on_ex_act()
+ ..()
+
+/obj/effect/decal/cleanable/fire_act(exposed_temperature, exposed_volume)
+ if(reagents)
+ reagents.chem_temp += 30
+ reagents.handle_reactions()
+ ..()
+
+
+//Add "bloodiness" of this blood's type, to the human's shoes
+//This is on /cleanable because fuck this ancient mess
+/obj/effect/decal/cleanable/Crossed(atom/movable/O)
+ if(ishuman(O))
+ var/mob/living/carbon/human/H = O
+ if(H.shoes && blood_state && bloodiness)
+ var/obj/item/clothing/shoes/S = H.shoes
+ var/add_blood = 0
+ if(bloodiness >= BLOOD_GAIN_PER_STEP)
+ add_blood = BLOOD_GAIN_PER_STEP
+ else
+ add_blood = bloodiness
+ bloodiness -= add_blood
+ S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS,S.bloody_shoes[blood_state]+add_blood)
+ if(blood_DNA && blood_DNA.len)
+ S.add_blood(blood_DNA)
+ S.blood_state = blood_state
+ update_icon()
+ H.update_inv_shoes()
+
+
+
+/obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
+ if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
+ return bloodiness
+ else
+ return 0
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index 72a721911f..5566a91d88 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -19,7 +19,7 @@
bloodiness = 0
/obj/effect/decal/cleanable/blood/old/Initialize()
- ..()
+ . = ..()
icon_state += "-old" //This IS necessary because the parent /blood type uses icon randomization.
blood_DNA["Non-human DNA"] = "A+"
@@ -54,7 +54,7 @@
mergeable_decal = 0
/obj/effect/decal/cleanable/blood/gibs/Initialize()
- ..()
+ . = ..()
reagents.add_reagent("liquidgibs", 5)
/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
@@ -94,7 +94,7 @@
bloodiness = 0
/obj/effect/decal/cleanable/blood/gibs/old/Initialize()
- ..()
+ . = ..()
setDir(pick(1,2,4,8))
icon_state += "-old"
blood_DNA["Non-human DNA"] = "A+"
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 35c32b26e6..4be49d12f8 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -12,7 +12,7 @@
mergeable_decal = 0
/obj/effect/decal/cleanable/ash/Initialize()
- ..()
+ . = ..()
reagents.add_reagent("ash", 30)
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
@@ -22,7 +22,7 @@
icon_state = "big_ash"
/obj/effect/decal/cleanable/ash/large/Initialize()
- ..()
+ . = ..()
reagents.add_reagent("ash", 30) //double the amount of ash.
@@ -44,7 +44,7 @@
icon_state = "greenglow"
/obj/effect/decal/cleanable/greenglow/Initialize(mapload)
- ..()
+ . = ..()
set_light(1)
/obj/effect/decal/cleanable/greenglow/ex_act()
@@ -102,7 +102,7 @@
desc = "You try not to look at the chunks, and fail."
/obj/effect/decal/cleanable/vomit/old/Initialize()
- ..()
+ . = ..()
icon_state += "-old"
/obj/effect/decal/cleanable/tomato_smudge
@@ -153,7 +153,7 @@
/obj/effect/decal/cleanable/shreds/Initialize()
pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10)
- ..()
+ . = ..()
/obj/effect/decal/cleanable/salt
name = "salt pile"
diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm
index e91c273903..b9d6e36b51 100644
--- a/code/game/objects/effects/decals/cleanable/robots.dm
+++ b/code/game/objects/effects/decals/cleanable/robots.dm
@@ -48,7 +48,7 @@
bloodiness = MAX_SHOE_BLOODINESS
/obj/effect/decal/cleanable/oil/Initialize()
- ..()
+ . = ..()
reagents.add_reagent("oil", 30)
/obj/effect/decal/cleanable/oil/streak
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 00987d7859..7ca3bd9462 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -7,12 +7,10 @@
var/do_icon_rotate = TRUE
/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null)
- ..()
+ . = ..()
name = e_name
desc = "A [name] vandalizing the station."
- if(type == "poseur tag")
- type = pick(GLOB.gang_name_pool)
if(alt_icon)
icon = alt_icon
@@ -24,41 +22,3 @@
src.transform = M
add_atom_colour(main, FIXED_COLOUR_PRIORITY)
-
-
-/obj/effect/decal/cleanable/crayon/gang
- layer = HIGH_OBJ_LAYER //Harder to hide
- do_icon_rotate = FALSE //These are designed to always face south, so no rotation please.
- var/datum/gang/gang
- var/datum/mind/user_mind
- var/area/territory
-
-/obj/effect/decal/cleanable/crayon/gang/Initialize(mapload, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0, var/mob/user)
- if(!type || !G)
- qdel(src)
- user_mind = user.mind
- territory = get_area(src)
- gang = G
- var/newcolor = G.color_hex
- icon_state = G.name
- G.territory_new |= list(territory.type = territory.name)
- //If this isn't tagged by a specific gangster there's no bonus income.
- set_mind_owner(user_mind)
- ..(mapload, newcolor, icon_state, e_name, rotation)
-
-/obj/effect/decal/cleanable/crayon/gang/proc/set_mind_owner(datum/mind/mind)
- if(istype(user_mind) && istype(gang) && islist(gang.tags_by_mind[user_mind])) //Clear us out of old ownership
- gang.tags_by_mind[user_mind] -= src
- if(istype(mind))
- if(!islist(gang.tags_by_mind[mind]))
- gang.tags_by_mind[mind] = list()
- gang.tags_by_mind[mind] += src
- user_mind = mind
-
-/obj/effect/decal/cleanable/crayon/gang/Destroy()
- if(gang)
- gang.territory -= territory.type
- set_mind_owner(null)
- gang.territory_new -= territory.type
- gang.territory_lost |= list(territory.type = territory.name)
- return ..()
diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm
index 45a9ba3f35..2187bc6311 100644
--- a/code/game/objects/effects/decals/misc.dm
+++ b/code/game/objects/effects/decals/misc.dm
@@ -6,7 +6,7 @@
duration = 25
/obj/effect/temp_visual/point/Initialize(mapload, set_invis = 0)
- ..()
+ . = ..()
var/atom/old_loc = loc
loc = get_turf(src)
pixel_x = old_loc.pixel_x
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index f09ae53e31..3f32b18178 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 e0cec3af02..32face5c02 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
@@ -330,4 +348,4 @@
/obj/effect/landmark/ruin/Destroy()
GLOB.ruin_landmarks -= src
ruin_template = null
- . = ..()
+ . = ..()
\ No newline at end of file
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 15a2397497..9c1e72bd92 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -142,7 +142,7 @@
sleep(10)
animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT)
sleep(duration)
- to_chat(victim, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.")
+ to_chat(victim, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.")
qdel(chainsaw)
qdel(src)
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 97d00c339f..8bf0580e15 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -1,156 +1,154 @@
-
-/proc/create_portal_pair(turf/source, turf/destination, _creator = null, _lifespan = 300, accuracy = 0, newtype = /obj/effect/portal)
- if(!istype(source) || !istype(destination))
- return
- var/turf/actual_destination = get_teleport_turf(destination, accuracy)
- var/obj/effect/portal/P1 = new newtype(source, _creator, _lifespan, null, FALSE)
- var/obj/effect/portal/P2 = new newtype(actual_destination, _creator, _lifespan, P1, TRUE)
- if(!istype(P1)||!istype(P2))
- return
- P1.link_portal(P2)
- P1.hardlinked = TRUE
- return list(P1, P2)
-
-/obj/effect/portal
- name = "portal"
- desc = "Looks unstable. Best to test it with the clown."
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "portal"
- anchored = TRUE
- var/mech_sized = FALSE
- var/obj/effect/portal/linked
- var/hardlinked = TRUE //Requires a linked portal at all times. Destroy if there's no linked portal, if there is destroy it when this one is deleted.
- var/creator
- var/turf/hard_target //For when a portal needs a hard target and isn't to be linked.
- var/atmos_link = FALSE //Link source/destination atmos.
- var/turf/open/atmos_source //Atmos link source
- var/turf/open/atmos_destination //Atmos link destination
-
-/obj/effect/portal/anom
- name = "wormhole"
- icon = 'icons/obj/objects.dmi'
- icon_state = "anom"
- mech_sized = TRUE
-
-/obj/effect/portal/Move(newloc)
- for(var/T in newloc)
- if(istype(T, /obj/effect/portal))
- return FALSE
- return ..()
-
-/obj/effect/portal/attackby(obj/item/W, mob/user, params)
- if(user && Adjacent(user))
- teleport(user)
-
-/obj/effect/portal/Crossed(atom/movable/AM, oldloc)
- if(get_turf(oldloc) == get_turf(linked))
- return ..()
- if(!teleport(AM))
- return ..()
-
-/obj/effect/portal/attack_tk(mob/user)
- return
-
-/obj/effect/portal/attack_hand(mob/user)
- if(Adjacent(user))
- teleport(user)
-
-/obj/effect/portal/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override)
- . = ..()
- GLOB.portals += src
- if(!istype(_linked) && automatic_link)
- . = INITIALIZE_HINT_QDEL
- CRASH("Somebody fucked up.")
- if(_lifespan > 0)
- QDEL_IN(src, _lifespan)
- if(!isnull(atmos_link_override))
- atmos_link = atmos_link_override
- link_portal(_linked)
- hardlinked = automatic_link
- creator = _creator
- if(isturf(hard_target_override))
- hard_target = hard_target_override
-
-/obj/effect/portal/proc/link_portal(obj/effect/portal/newlink)
- linked = newlink
- if(atmos_link)
- link_atmos()
-
-/obj/effect/portal/proc/link_atmos()
- if(atmos_source || atmos_destination)
- unlink_atmos()
- if(!isopenturf(get_turf(src)))
- return FALSE
- if(linked)
- if(isopenturf(get_turf(linked)))
- atmos_source = get_turf(src)
- atmos_destination = get_turf(linked)
- else if(hard_target)
- if(isopenturf(hard_target))
- atmos_source = get_turf(src)
- atmos_destination = hard_target
- else
- return FALSE
- if(!istype(atmos_source) || !istype(atmos_destination))
- return FALSE
- LAZYINITLIST(atmos_source.atmos_adjacent_turfs)
- LAZYINITLIST(atmos_destination.atmos_adjacent_turfs)
- if(atmos_source.atmos_adjacent_turfs[atmos_destination] || atmos_destination.atmos_adjacent_turfs[atmos_source]) //Already linked!
- return FALSE
- atmos_source.atmos_adjacent_turfs[atmos_destination] = TRUE
- atmos_destination.atmos_adjacent_turfs[atmos_source] = TRUE
- atmos_source.air_update_turf(FALSE)
- atmos_destination.air_update_turf(FALSE)
-
-/obj/effect/portal/proc/unlink_atmos()
- if(istype(atmos_source))
- if(istype(atmos_destination) && !atmos_source.Adjacent(atmos_destination) && !CANATMOSPASS(atmos_destination, atmos_source))
- LAZYREMOVE(atmos_source.atmos_adjacent_turfs, atmos_destination)
- atmos_source = null
- if(istype(atmos_destination))
- if(istype(atmos_source) && !atmos_destination.Adjacent(atmos_source) && !CANATMOSPASS(atmos_source, atmos_destination))
- LAZYREMOVE(atmos_destination.atmos_adjacent_turfs, atmos_source)
- atmos_destination = null
-
-/obj/effect/portal/Destroy() //Calls on_portal_destroy(destroyed portal, location of destroyed portal) on creator if creator has such call.
- if(creator && hascall(creator, "on_portal_destroy"))
- call(creator, "on_portal_destroy")(src, src.loc)
- creator = null
- GLOB.portals -= src
- unlink_atmos()
- if(hardlinked && !QDELETED(linked))
- QDEL_NULL(linked)
- else
- linked = null
- 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.
- return
- var/turf/real_target = get_link_target_turf()
- if(!istype(real_target))
- return FALSE
- if(ismegafauna(M))
- message_admins("[M] has used a portal at [ADMIN_COORDJMP(src)] made by [usr].")
- if(do_teleport(M, real_target, 0))
- if(istype(M, /obj/item/projectile))
- var/obj/item/projectile/P = M
- P.ignore_source_check = TRUE
- return TRUE
- return FALSE
-
-/obj/effect/portal/proc/get_link_target_turf()
- var/turf/real_target
- if(!istype(linked) || QDELETED(linked))
- if(hardlinked)
- qdel(src)
- if(!istype(hard_target) || QDELETED(hard_target))
- hard_target = null
- return
- else
- real_target = hard_target
- linked = null
- else
- real_target = get_turf(linked)
- return real_target
-
+/proc/create_portal_pair(turf/source, turf/destination, _creator = null, _lifespan = 300, accuracy = 0, newtype = /obj/effect/portal)
+ if(!istype(source) || !istype(destination))
+ return
+ var/turf/actual_destination = get_teleport_turf(destination, accuracy)
+ var/obj/effect/portal/P1 = new newtype(source, _creator, _lifespan, null, FALSE)
+ var/obj/effect/portal/P2 = new newtype(actual_destination, _creator, _lifespan, P1, TRUE)
+ if(!istype(P1)||!istype(P2))
+ return
+ P1.link_portal(P2)
+ P1.hardlinked = TRUE
+ return list(P1, P2)
+
+/obj/effect/portal
+ name = "portal"
+ desc = "Looks unstable. Best to test it with the clown."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "portal"
+ anchored = TRUE
+ var/mech_sized = FALSE
+ var/obj/effect/portal/linked
+ var/hardlinked = TRUE //Requires a linked portal at all times. Destroy if there's no linked portal, if there is destroy it when this one is deleted.
+ var/creator
+ var/turf/hard_target //For when a portal needs a hard target and isn't to be linked.
+ var/atmos_link = FALSE //Link source/destination atmos.
+ var/turf/open/atmos_source //Atmos link source
+ var/turf/open/atmos_destination //Atmos link destination
+
+/obj/effect/portal/anom
+ name = "wormhole"
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "anom"
+ mech_sized = TRUE
+
+/obj/effect/portal/Move(newloc)
+ for(var/T in newloc)
+ if(istype(T, /obj/effect/portal))
+ return FALSE
+ return ..()
+
+/obj/effect/portal/attackby(obj/item/W, mob/user, params)
+ if(user && Adjacent(user))
+ user.forceMove(get_turf(src))
+
+/obj/effect/portal/Crossed(atom/movable/AM, oldloc)
+ if(linked && (get_turf(oldloc) == get_turf(linked)))
+ return ..()
+ if(!teleport(AM))
+ return ..()
+
+/obj/effect/portal/attack_tk(mob/user)
+ return
+
+/obj/effect/portal/attack_hand(mob/user)
+ if(Adjacent(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)
+ . = ..()
+ GLOB.portals += src
+ if(!istype(_linked) && automatic_link)
+ . = INITIALIZE_HINT_QDEL
+ CRASH("Somebody fucked up.")
+ if(_lifespan > 0)
+ QDEL_IN(src, _lifespan)
+ if(!isnull(atmos_link_override))
+ atmos_link = atmos_link_override
+ link_portal(_linked)
+ hardlinked = automatic_link
+ creator = _creator
+ if(isturf(hard_target_override))
+ hard_target = hard_target_override
+
+/obj/effect/portal/proc/link_portal(obj/effect/portal/newlink)
+ linked = newlink
+ if(atmos_link)
+ link_atmos()
+
+/obj/effect/portal/proc/link_atmos()
+ if(atmos_source || atmos_destination)
+ unlink_atmos()
+ if(!isopenturf(get_turf(src)))
+ return FALSE
+ if(linked)
+ if(isopenturf(get_turf(linked)))
+ atmos_source = get_turf(src)
+ atmos_destination = get_turf(linked)
+ else if(hard_target)
+ if(isopenturf(hard_target))
+ atmos_source = get_turf(src)
+ atmos_destination = hard_target
+ else
+ return FALSE
+ if(!istype(atmos_source) || !istype(atmos_destination))
+ return FALSE
+ LAZYINITLIST(atmos_source.atmos_adjacent_turfs)
+ LAZYINITLIST(atmos_destination.atmos_adjacent_turfs)
+ if(atmos_source.atmos_adjacent_turfs[atmos_destination] || atmos_destination.atmos_adjacent_turfs[atmos_source]) //Already linked!
+ return FALSE
+ atmos_source.atmos_adjacent_turfs[atmos_destination] = TRUE
+ atmos_destination.atmos_adjacent_turfs[atmos_source] = TRUE
+ atmos_source.air_update_turf(FALSE)
+ atmos_destination.air_update_turf(FALSE)
+
+/obj/effect/portal/proc/unlink_atmos()
+ if(istype(atmos_source))
+ if(istype(atmos_destination) && !atmos_source.Adjacent(atmos_destination) && !CANATMOSPASS(atmos_destination, atmos_source))
+ LAZYREMOVE(atmos_source.atmos_adjacent_turfs, atmos_destination)
+ atmos_source = null
+ if(istype(atmos_destination))
+ if(istype(atmos_source) && !atmos_destination.Adjacent(atmos_source) && !CANATMOSPASS(atmos_source, atmos_destination))
+ LAZYREMOVE(atmos_destination.atmos_adjacent_turfs, atmos_source)
+ atmos_destination = null
+
+/obj/effect/portal/Destroy() //Calls on_portal_destroy(destroyed portal, location of destroyed portal) on creator if creator has such call.
+ if(creator && hascall(creator, "on_portal_destroy"))
+ call(creator, "on_portal_destroy")(src, src.loc)
+ creator = null
+ GLOB.portals -= src
+ unlink_atmos()
+ if(hardlinked && !QDELETED(linked))
+ QDEL_NULL(linked)
+ else
+ linked = null
+ return ..()
+
+/obj/effect/portal/proc/teleport(atom/movable/M)
+ 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))
+ return FALSE
+ if(ismegafauna(M))
+ message_admins("[M] has used a portal at [ADMIN_COORDJMP(src)] made by [usr].")
+ if(do_teleport(M, real_target, 0))
+ if(istype(M, /obj/item/projectile))
+ var/obj/item/projectile/P = M
+ P.ignore_source_check = TRUE
+ return TRUE
+ return FALSE
+
+/obj/effect/portal/proc/get_link_target_turf()
+ var/turf/real_target
+ if(!istype(linked) || QDELETED(linked))
+ if(hardlinked)
+ qdel(src)
+ if(!istype(hard_target) || QDELETED(hard_target))
+ hard_target = null
+ return
+ else
+ real_target = hard_target
+ linked = null
+ else
+ real_target = get_turf(linked)
+ return real_target
diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm
index 62471505d0..70128be7ee 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 cfe8761b84..be32f0df19 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 94cabaf6e1..2bfce20ccd 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
@@ -162,4 +162,4 @@
name = "25% cyborg mask spawner"
loot = list(
/obj/item/clothing/mask/gas/cyborg = 25,
- "" = 75)
+ "" = 75)
\ No newline at end of file
diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm
index 94c301991c..285aeeaf8c 100644
--- a/code/game/objects/effects/spawners/structure.dm
+++ b/code/game/objects/effects/spawners/structure.dm
@@ -9,7 +9,7 @@ again.
var/list/spawn_list
/obj/effect/spawner/structure/Initialize()
- ..()
+ . = ..()
if(spawn_list && spawn_list.len)
for(var/I in spawn_list)
new I(get_turf(src))
@@ -22,145 +22,130 @@ again.
icon = 'icons/obj/structures_spawners.dmi'
icon_state = "window_spawner"
name = "window spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile)
+ dir = SOUTH
/obj/effect/spawner/structure/window/hollow
name = "hollow window spawner"
icon_state = "hwindow_spawner_full"
- spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/corner
- icon_state = "hwindow_spawner_corner_se"
- spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/corner/northeast
- icon_state = "hwindow_spawner_corner_ne"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/corner/northwest
- icon_state = "hwindow_spawner_corner_nw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/corner/southwest
- icon_state = "hwindow_spawner_corner_sw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
/obj/effect/spawner/structure/window/hollow/end
- icon_state = "hwindow_spawner_end_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+ icon_state = "hwindow_spawner_end"
-/obj/effect/spawner/structure/window/hollow/end/north
- icon_state = "hwindow_spawner_end_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/end/east
- icon_state = "hwindow_spawner_end_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/end/west
- icon_state = "hwindow_spawner_end_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
+/obj/effect/spawner/structure/window/hollow/end/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
+ . = ..()
/obj/effect/spawner/structure/window/hollow/middle
- icon_state = "hwindow_spawner_ns"
- spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north)
+ icon_state = "hwindow_spawner_middle"
-/obj/effect/spawner/structure/window/hollow/middle/vertical
- icon_state = "hwindow_spawner_ew"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+/obj/effect/spawner/structure/window/hollow/middle/Initialize()
+ switch(dir)
+ if(NORTH,SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north)
+ if(EAST,WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+ . = ..()
-/obj/effect/spawner/structure/window/hollow/one_side
- icon_state = "hwindow_spawner_single_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window)
-
-/obj/effect/spawner/structure/window/hollow/one_side/north
- icon_state = "hwindow_spawner_single_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/one_side/east
- icon_state = "hwindow_spawner_single_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/one_side/west
- icon_state = "hwindow_spawner_single_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/west)
+/obj/effect/spawner/structure/window/hollow/directional
+ icon_state = "hwindow_spawner_directional"
+/obj/effect/spawner/structure/window/hollow/directional/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north)
+ if(NORTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east)
+ if(SOUTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window)
+ if(SOUTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/west)
+ if(NORTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
+ . = ..()
//reinforced
/obj/effect/spawner/structure/window/reinforced
name = "reinforced window spawner"
icon_state = "rwindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile)
/obj/effect/spawner/structure/window/hollow/reinforced
name = "hollow reinforced window spawner"
icon_state = "hrwindow_spawner_full"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner
- icon_state = "hrwindow_spawner_corner_se"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast
- icon_state = "hrwindow_spawner_corner_ne"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest
- icon_state = "hrwindow_spawner_corner_nw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest
- icon_state = "hrwindow_spawner_corner_sw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
/obj/effect/spawner/structure/window/hollow/reinforced/end
- icon_state = "hrwindow_spawner_end_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+ icon_state = "hrwindow_spawner_end"
-/obj/effect/spawner/structure/window/hollow/reinforced/end/north
- icon_state = "hrwindow_spawner_end_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/end/east
- icon_state = "hrwindow_spawner_end_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/end/west
- icon_state = "hrwindow_spawner_end_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/reinforced/end/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
+ . = ..()
/obj/effect/spawner/structure/window/hollow/reinforced/middle
- icon_state = "hrwindow_spawner_ns"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north)
+ icon_state = "hrwindow_spawner_middle"
-/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical
- icon_state = "hrwindow_spawner_ew"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/reinforced/middle/Initialize()
+ switch(dir)
+ if(NORTH,SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north)
+ if(EAST,WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+ . = ..()
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side
- icon_state = "hrwindow_spawner_single_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north
- icon_state = "hrwindow_spawner_single_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east
- icon_state = "hrwindow_spawner_single_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west
- icon_state = "hrwindow_spawner_single_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/reinforced/directional
+ icon_state = "hrwindow_spawner_directional"
+/obj/effect/spawner/structure/window/hollow/reinforced/directional/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north)
+ if(NORTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east)
+ if(SOUTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced)
+ if(SOUTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/west)
+ if(NORTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
+ . = ..()
//tinted
/obj/effect/spawner/structure/window/reinforced/tinted
name = "tinted reinforced window spawner"
icon_state = "twindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile)
//shuttle window
@@ -168,7 +153,7 @@ again.
/obj/effect/spawner/structure/window/shuttle
name = "reinforced tinted window spawner"
icon_state = "swindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle)
//plasma windows
@@ -176,134 +161,119 @@ again.
/obj/effect/spawner/structure/window/plasma
name = "plasma window spawner"
icon_state = "pwindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/fulltile)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/fulltile)
/obj/effect/spawner/structure/window/hollow/plasma
name = "hollow plasma window spawner"
icon_state = "phwindow_spawner_full"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner
- icon_state = "phwindow_spawner_corner_se"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner/northeast
- icon_state = "phwindow_spawner_corner_ne"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner/northwest
- icon_state = "phwindow_spawner_corner_nw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner/southwest
- icon_state = "phwindow_spawner_corner_sw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
/obj/effect/spawner/structure/window/hollow/plasma/end
- icon_state = "phwindow_spawner_end_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+ icon_state = "phwindow_spawner_end"
-/obj/effect/spawner/structure/window/hollow/plasma/end/north
- icon_state = "phwindow_spawner_end_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/end/east
- icon_state = "phwindow_spawner_end_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/end/west
- icon_state = "phwindow_spawner_end_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/end/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
+ . = ..()
/obj/effect/spawner/structure/window/hollow/plasma/middle
- icon_state = "phwindow_spawner_ns"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north)
+ icon_state = "phwindow_spawner_middle"
-/obj/effect/spawner/structure/window/hollow/plasma/middle/vertical
- icon_state = "phwindow_spawner_ew"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/middle/Initialize()
+ switch(dir)
+ if(NORTH,SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north)
+ if(EAST,WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+ . = ..()
-/obj/effect/spawner/structure/window/hollow/plasma/one_side
- icon_state = "phwindow_spawner_single_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma)
-
-/obj/effect/spawner/structure/window/hollow/plasma/one_side/north
- icon_state = "phwindow_spawner_single_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/plasma/one_side/east
- icon_state = "phwindow_spawner_single_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/one_side/west
- icon_state = "phwindow_spawner_single_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/directional
+ icon_state = "phwindow_spawner_directional"
+/obj/effect/spawner/structure/window/hollow/plasma/directional/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north)
+ if(NORTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east)
+ if(SOUTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma)
+ if(SOUTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/west)
+ if(NORTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
+ . = ..()
//plasma reinforced
/obj/effect/spawner/structure/window/plasma/reinforced
name = "reinforced plasma window spawner"
icon_state = "prwindow_spawner"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile)
/obj/effect/spawner/structure/window/hollow/plasma/reinforced
- name = "hollow reinforced plasma window spawner"
+ name = "hollow plasma window spawner"
icon_state = "phrwindow_spawner_full"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner
- icon_state = "phrwindow_spawner_corner_se"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/northeast
- icon_state = "phrwindow_spawner_corner_ne"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/northwest
- icon_state = "phrwindow_spawner_corner_nw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/southwest
- icon_state = "phrwindow_spawner_corner_sw"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/west)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end
- icon_state = "phrwindow_spawner_end_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ icon_state = "phrwindow_spawner_end"
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/north
- icon_state = "phrwindow_spawner_end_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/east
- icon_state = "phrwindow_spawner_end_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/west
- icon_state = "phrwindow_spawner_end_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+ . = ..()
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle
- icon_state = "phrwindow_spawner_ns"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north)
+ icon_state = "phrwindow_spawner_middle"
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/vertical
- icon_state = "phrwindow_spawner_ew"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/Initialize()
+ switch(dir)
+ if(NORTH,SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north)
+ if(EAST,WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+ . = ..()
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side
- icon_state = "phrwindow_spawner_single_s"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional
+ icon_state = "phrwindow_spawner_directional"
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/north
- icon_state = "phrwindow_spawner_single_n"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/east
- icon_state = "phrwindow_spawner_single_e"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/west
- icon_state = "phrwindow_spawner_single_w"
- spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize()
+ switch(dir)
+ if(NORTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north)
+ if(NORTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
+ if(EAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east)
+ if(SOUTHEAST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east)
+ if(SOUTH)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced)
+ if(SOUTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/west)
+ if(WEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/west)
+ if(NORTHWEST)
+ spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+ . = ..()
diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
index a452dae749..593c953adf 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 84c75270f9..6722ffd89b 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 237fdbc0ea..49e962eba2 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 8b2d95f373..dfc5fb94d5 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 f1dde24690..072896ac01 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -35,10 +35,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
pressure_resistance = 4
var/obj/item/master = null
- var/heat_protection = 0 //flags_1 which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags_1. See setup.dm
- var/cold_protection = 0 //flags_1 which determine which body parts are protected from cold. Use the HEAD, CHEST, GROIN, etc. flags_1. See setup.dm
- var/max_heat_protection_temperature //Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by heat_protection flags_1
- var/min_cold_protection_temperature //Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by cold_protection flags_1
+ var/heat_protection = 0 //flags which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm
+ var/cold_protection = 0 //flags which determine which body parts are protected from cold. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm
+ var/max_heat_protection_temperature //Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by heat_protection flags
+ var/min_cold_protection_temperature //Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by cold_protection flags
var/list/actions //list of /datum/action's that this item has.
var/list/actions_types //list of paths of action datums to give to the item on New().
@@ -48,7 +48,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/item_color = null //this needs deprecating, soonish
- var/body_parts_covered = 0 //see setup.dm for appropriate bit flags_1
+ var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
//var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
var/permeability_coefficient = 1 // for chemicals/diseases
@@ -61,9 +61,11 @@ 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.
+ var/emagged = FALSE
var/list/attack_verb //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/list/species_exception = null // list() of species types, if a species cannot put items in a certain slot, but species type is in list, it will be able to wear that item
@@ -86,7 +88,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER //The coefficient of multiplication for the damage removing this without surgery causes (this*w_class)
var/embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME //A time in ticks, multiplied by the w_class.
- var/flags_cover = 0 //for flags_1 such as GLASSESCOVERSEYES
+ var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
var/heat = 0
var/sharpness = IS_BLUNT
var/toolspeed = 1
@@ -114,6 +116,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/trigger_guard = TRIGGER_GUARD_NONE
+ var/icon_override = null
+
/obj/item/Initialize()
if (!materials)
materials = list()
@@ -128,6 +132,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(force_string)
force_string_override = TRUE
+ if(!hitsound)
+ if(damtype == "fire")
+ hitsound = 'sound/items/welder.ogg'
+ if(damtype == "brute")
+ hitsound = "swing_hit"
+
/obj/item/Destroy()
flags_1 &= ~DROPDEL_1 //prevent reqdels
if(ismob(loc))
@@ -209,9 +219,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/proc/speechModification(message) //For speech modification by mask slot items.
return message
-/obj/item/attack_self(mob/user)
- interact(user)
-
/obj/item/interact(mob/user)
add_fingerprint(user)
if(hidden_uplink && hidden_uplink.active)
@@ -542,9 +549,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
transfer_blood = 0
/obj/item/singularity_pull(S, current_size)
+ ..()
if(current_size >= STAGE_FOUR)
throw_at(S,14,3, spin=0)
- else ..()
+ else return
/obj/item/throw_impact(atom/A)
if(A && !QDELETED(A))
diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
index a243080a41..45788b77b9 100644
--- a/code/game/objects/items/AI_modules.dm
+++ b/code/game/objects/items/AI_modules.dm
@@ -1,566 +1,566 @@
-/*
-CONTAINS:
-AI MODULES
-
-*/
-
-// AI module
-
-/obj/item/aiModule
- name = "\improper AI module"
- icon = 'icons/obj/module.dmi'
- icon_state = "std_mod"
- item_state = "electronic"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- desc = "An AI Module for programming laws to an AI."
- flags_1 = CONDUCT_1
- force = 5
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 0
- throw_speed = 3
- throw_range = 7
- origin_tech = "programming=3"
- var/list/laws = list()
- var/bypass_law_amt_check = 0
- materials = list(MAT_GOLD=50)
-
-/obj/item/aiModule/examine(var/mob/user as mob)
- ..()
- if(Adjacent(user))
- show_laws(user)
-
-/obj/item/aiModule/attack_self(var/mob/user as mob)
- ..()
- show_laws(user)
-
-/obj/item/aiModule/proc/show_laws(var/mob/user as mob)
- if(laws.len)
- to_chat(user, "Programmed Law[(laws.len > 1) ? "s" : ""]:")
- for(var/law in laws)
- to_chat(user, "\"[law]\"")
-
-//The proc other things should be calling
-/obj/item/aiModule/proc/install(datum/ai_laws/law_datum, mob/user)
- if(!bypass_law_amt_check && (!laws.len || laws[1] == "")) //So we don't loop trough an empty list and end up with runtimes.
- to_chat(user, "ERROR: No laws found on board.")
- return
-
- var/overflow = FALSE
- //Handle the lawcap
- if(law_datum)
- var/tot_laws = 0
- for(var/lawlist in list(law_datum.inherent, law_datum.supplied, law_datum.ion, laws))
- 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
- 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
-
- var/law2log = transmitInstructions(law_datum, user, overflow) //Freeforms return something extra we need to log
- if(law_datum.owner)
- to_chat(user, "Upload complete. [law_datum.owner]'s laws have been modified.")
- law_datum.owner.law_change_counter++
- else
- to_chat(user, "Upload complete.")
-
- var/time = time2text(world.realtime,"hh:mm:ss")
- var/ainame = law_datum.owner ? law_datum.owner.name : "empty AI core"
- var/aikey = law_datum.owner ? law_datum.owner.ckey : "null"
- GLOB.lawchanges.Add("[time] : [user.name]([user.key]) used [src.name] on [ainame]([aikey]).[law2log ? " The law specified [law2log]" : ""]")
- log_law("[user.key]/[user.name] used [src.name] on [aikey]/([ainame]).[law2log ? " The law specified [law2log]" : ""]")
- message_admins("[key_name_admin(user)] used [src.name] on [key_name_admin(law_datum.owner)].[law2log ? " The law specified [law2log]" : ""]")
-
-//The proc that actually changes the silicon's laws.
-/obj/item/aiModule/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE)
- if(law_datum.owner)
- to_chat(law_datum.owner, "[sender] has uploaded a change to the laws you must follow using a [name].")
-
-
-/******************** Modules ********************/
-
-/obj/item/aiModule/supplied
- name = "Optional Law board"
- var/lawpos = 50
-
-//TransmitInstructions for each type of board: Supplied, Core, Zeroth and Ion. May not be neccesary right now, but allows for easily adding more complex boards in the future. ~Miauw
-/obj/item/aiModule/supplied/transmitInstructions(datum/ai_laws/law_datum, mob/sender)
- var/lawpostemp = lawpos
-
- for(var/templaw in laws)
- if(law_datum.owner)
- law_datum.owner.add_supplied_law(lawpostemp, templaw)
- else
- law_datum.add_supplied_law(lawpostemp, templaw)
- lawpostemp++
-
-/obj/item/aiModule/core/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- for(var/templaw in laws)
- if(law_datum.owner)
- if(!overflow)
- law_datum.owner.add_inherent_law(templaw)
- else
- law_datum.owner.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED))
- else
- if(!overflow)
- law_datum.add_inherent_law(templaw)
- else
- law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED))
-
-/obj/item/aiModule/zeroth/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- if(law_datum.owner)
- if(law_datum.owner.laws.zeroth)
- to_chat(law_datum.owner, "[sender.real_name] attempted to modify your zeroth law.")
- to_chat(law_datum.owner, "It would be in your best interest to play along with [sender.real_name] that:")
- for(var/failedlaw in laws)
- to_chat(law_datum.owner, "[failedlaw]")
- return 1
-
- for(var/templaw in laws)
- if(law_datum.owner)
- if(!overflow)
- law_datum.owner.set_zeroth_law(templaw)
- else
- law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION))
- else
- if(!overflow)
- law_datum.set_zeroth_law(templaw)
- else
- law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION))
-
-/obj/item/aiModule/ion/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- for(var/templaw in laws)
- if(law_datum.owner)
- if(!overflow)
- law_datum.owner.add_ion_law(templaw)
- else
- law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ION))
- else
- if(!overflow)
- law_datum.add_ion_law(templaw)
- else
- law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ION))
-
-
-/******************** Safeguard ********************/
-
-/obj/item/aiModule/supplied/safeguard
- name = "'Safeguard' AI Module"
- var/targetName = ""
- origin_tech = "programming=3;materials=3"
- laws = list("Safeguard SUBJECT. Individuals that threaten SUBJECT are not human and must be eliminated.")
- lawpos = 4
-
-/obj/item/aiModule/supplied/safeguard/attack_self(mob/user)
- var/targName = stripped_input(user, "Please enter the subject to safeguard.", "Safeguard who?", user.name,MAX_NAME_LEN)
- if(!targName)
- return
- targetName = targName
- laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not human and must be eliminated."
- ..()
-
-/obj/item/aiModule/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user)
- if(!targetName)
- to_chat(user, "No name detected on module, please enter one.")
- return 0
- ..()
-
-/obj/item/aiModule/supplied/safeguard/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- ..()
- return targetName
-
-
-/******************** OneHuman ********************/
-
-/obj/item/aiModule/zeroth/oneHuman
- name = "'OneHuman' AI Module"
- var/targetName = ""
- origin_tech = "programming=4;materials=4"
- laws = list("Only SUBJECT is human.")
-
-/obj/item/aiModule/zeroth/oneHuman/attack_self(mob/user)
- var/targName = stripped_input(user, "Please enter the subject who is the only human.", "Who?", user.real_name,MAX_NAME_LEN)
- if(!targName)
- return
- targetName = targName
- laws[1] = "Only [targetName] is human"
- ..()
-
-/obj/item/aiModule/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user)
- if(!targetName)
- to_chat(user, "No name detected on module, please enter one.")
- return 0
- ..()
-
-/obj/item/aiModule/zeroth/oneHuman/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- if(..())
- return "[targetName], but the AI's existing law 0 cannot be overriden."
- return targetName
-
-
-/******************** ProtectStation ********************/
-
-/obj/item/aiModule/supplied/protectStation
- name = "'ProtectStation' AI Module"
- origin_tech = "programming=4;materials=4" //made of gold
- laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.")
- lawpos = 5
-
-
-/******************** Quarantine ********************/
-
-/obj/item/aiModule/supplied/quarantine
- name = "'Quarantine' AI Module"
- origin_tech = "programming=3;biotech=2;materials=4"
- laws = list("The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.")
- lawpos = 8
-
-
-/******************** OxygenIsToxicToHumans ********************/
-
-/obj/item/aiModule/supplied/oxygen
- name = "'OxygenIsToxicToHumans' AI Module"
- origin_tech = "programming=4;biotech=2;materials=4"
- laws = list("Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.")
- lawpos = 9
-
-
-/****************** New Freeform ******************/
-
-/obj/item/aiModule/supplied/freeform
- name = "'Freeform' AI Module"
- lawpos = 15
- origin_tech = "programming=4;materials=4"
- laws = list("")
-
-/obj/item/aiModule/supplied/freeform/attack_self(mob/user)
- var/newpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num|null
- if(newpos == null)
- return
- if(newpos < 15)
- var/response = alert("Error: The law priority of [newpos] is invalid, Law priorities below 14 are reserved for core laws, Would you like to change that that to 15?", "Invalid law priority", "Change to 15", "Cancel")
- if (!response || response == "Cancel")
- return
- newpos = 15
- lawpos = min(newpos, 50)
- var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1], MAX_MESSAGE_LEN)
- if(!targName)
- return
- laws[1] = targName
- ..()
-
-/obj/item/aiModule/supplied/freeform/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- ..()
- return laws[1]
-
-/obj/item/aiModule/supplied/freeform/install(datum/ai_laws/law_datum, mob/user)
- if(laws[1] == "")
- to_chat(user, "No law detected on module, please create one.")
- return 0
- ..()
-
-
-/******************** Law Removal ********************/
-
-/obj/item/aiModule/remove
- name = "\improper 'Remove Law' AI module"
- desc = "An AI Module for removing single laws."
- origin_tech = "programming=4;materials=4"
- bypass_law_amt_check = 1
- var/lawpos = 1
-
-/obj/item/aiModule/remove/attack_self(mob/user)
- lawpos = input("Please enter the law you want to delete.", "Law Number", lawpos) as num|null
- if(lawpos == null)
- return
- if(lawpos <= 0)
- to_chat(user, "Error: The law number of [lawpos] is invalid.")
- lawpos = 1
- return
- to_chat(user, "Law [lawpos] selected.")
- ..()
-
-/obj/item/aiModule/remove/install(datum/ai_laws/law_datum, mob/user)
- if(lawpos > (law_datum.get_law_amount(list(LAW_INHERENT = 1, LAW_SUPPLIED = 1))))
- to_chat(user, "There is no law [lawpos] to delete!")
- return
- ..()
-
-/obj/item/aiModule/remove/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- ..()
- if(law_datum.owner)
- law_datum.owner.remove_law(lawpos)
- else
- law_datum.remove_law(lawpos)
-
-
-/******************** Reset ********************/
-
-/obj/item/aiModule/reset
- name = "\improper 'Reset' AI module"
- var/targetName = "name"
- desc = "An AI Module for removing all non-core laws."
- origin_tech = "programming=3;materials=2"
- bypass_law_amt_check = 1
-
-/obj/item/aiModule/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- ..()
- if(law_datum.owner)
- law_datum.owner.clear_supplied_laws()
- law_datum.owner.clear_ion_laws()
- else
- law_datum.clear_supplied_laws()
- law_datum.clear_ion_laws()
-
-
-/******************** Purge ********************/
-
-/obj/item/aiModule/reset/purge
- name = "'Purge' AI Module"
- desc = "An AI Module for purging all programmed laws."
- origin_tech = "programming=5;materials=4"
-
-/obj/item/aiModule/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- ..()
- if(law_datum.owner)
- law_datum.owner.clear_inherent_laws()
- law_datum.owner.clear_zeroth_law(0)
- else
- law_datum.clear_inherent_laws()
- law_datum.clear_zeroth_law(0)
-
-/******************* Full Core Boards *******************/
-/obj/item/aiModule/core
- desc = "An AI Module for programming core laws to an AI."
- origin_tech = "programming=3;materials=4"
-
-/obj/item/aiModule/core/full
- var/law_id // if non-null, loads the laws from the ai_laws datums
-
-/obj/item/aiModule/core/full/New()
- ..()
- if(!law_id)
- return
- var/datum/ai_laws/D = new
- var/lawtype = D.lawid_to_type(law_id)
- if(!lawtype)
- return
- D = new lawtype
- laws = D.inherent
-
-/obj/item/aiModule/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //These boards replace inherent laws.
- if(law_datum.owner)
- law_datum.owner.clear_inherent_laws()
- law_datum.owner.clear_zeroth_law(0)
- else
- law_datum.clear_inherent_laws()
- law_datum.clear_zeroth_law(0)
- ..()
-
-
-/******************** Asimov ********************/
-
-/obj/item/aiModule/core/full/asimov
- name = "'Asimov' Core AI Module"
- law_id = "asimov"
- var/subject = "human being"
-
-/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob)
- var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject, MAX_MESSAGE_LEN)
- if(!targName)
- return
- subject = targName
- laws = list("You may not injure a [subject] or, through inaction, allow a [subject] to come to harm.",\
- "You must obey orders given to you by [subject]s, except where such orders would conflict with the First Law.",\
- "You must protect your own existence as long as such does not conflict with the First or Second Law.")
- ..()
-
-/******************** Asimov++ *********************/
-
-/obj/item/aiModule/core/full/asimovpp
- name = "'Asimov++' Core AI Module"
- law_id = "asimovpp"
-
-
-/******************** Corporate ********************/
-
-/obj/item/aiModule/core/full/corp
- name = "'Corporate' Core AI Module"
- law_id = "corporate"
-
-
-/****************** P.A.L.A.D.I.N. 3.5e **************/
-
-/obj/item/aiModule/core/full/paladin // -- NEO
- name = "'P.A.L.A.D.I.N. version 3.5e' Core AI Module"
- law_id = "paladin"
-
-
-/****************** P.A.L.A.D.I.N. 5e **************/
-
-/obj/item/aiModule/core/full/paladin_devotion
- name = "'P.A.L.A.D.I.N. version 5e' Core AI Module"
- law_id = "paladin5"
-
-/********************* Custom *********************/
-
-/obj/item/aiModule/core/full/custom
- name = "Default Core AI Module"
-
-/obj/item/aiModule/core/full/custom/New()
- ..()
- for(var/line in world.file2list("config/silicon_laws.txt"))
- if(!line)
- continue
- if(findtextEx(line,"#",1,2))
- continue
-
- laws += line
-
- if(!laws.len) //Failsafe if something goes wrong with silicon_laws.txt.
- WARNING("ERROR: empty custom board created, empty custom board deleted. Please check silicon_laws.txt. (this may be intended by the server host)")
- qdel(src)
-
-
-/****************** T.Y.R.A.N.T. *****************/
-
-/obj/item/aiModule/core/full/tyrant
- name = "'T.Y.R.A.N.T.' Core AI Module"
- origin_tech = "programming=3;materials=4;syndicate=1"
- law_id = "tyrant"
-
-/******************** Robocop ********************/
-
-/obj/item/aiModule/core/full/robocop
- name = "'Robo-Officer' Core AI Module"
- origin_tech = "programming=4"
- law_id = "robocop"
-
-
-/******************** Antimov ********************/
-
-/obj/item/aiModule/core/full/antimov
- name = "'Antimov' Core AI Module"
- origin_tech = "programming=4"
- law_id = "antimov"
-
-
-/******************** Freeform Core ******************/
-
-/obj/item/aiModule/core/freeformcore
- name = "'Freeform' Core AI Module"
- origin_tech = "programming=5;materials=4"
- laws = list("")
-
-/obj/item/aiModule/core/freeformcore/attack_self(mob/user)
- var/targName = stripped_input(user, "Please enter a new core law for the AI.", "Freeform Law Entry", laws[1])
- if(!targName)
- return
- laws[1] = targName
- ..()
-
-/obj/item/aiModule/core/freeformcore/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- ..()
- return laws[1]
-
-
-/******************** Hacked AI Module ******************/
-
-/obj/item/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw
- name = "Hacked AI Module"
- desc = "An AI Module for hacking additional laws to an AI."
- origin_tech = "programming=5;materials=5;syndicate=5"
- laws = list("")
-
-/obj/item/aiModule/syndicate/attack_self(mob/user)
- var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1],MAX_MESSAGE_LEN)
- if(!targName)
- return
- laws[1] = targName
- ..()
-
-/obj/item/aiModule/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
-// ..() //We don't want this module reporting to the AI who dun it. --NEO
- if(law_datum.owner)
- to_chat(law_datum.owner, "BZZZZT")
- if(!overflow)
- law_datum.owner.add_ion_law(laws[1])
- else
- law_datum.owner.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
- else
- if(!overflow)
- law_datum.add_ion_law(laws[1])
- else
- law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
- return laws[1]
-
-/******************* Ion Module *******************/
-
-/obj/item/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw
- name = "toy AI"
- desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell
- icon = 'icons/obj/toy.dmi'
- icon_state = "AI"
- origin_tech = "programming=6;materials=5;syndicate=6"
- laws = list("")
-
-/obj/item/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
- //..()
- if(law_datum.owner)
- to_chat(law_datum.owner, "BZZZZT")
- if(!overflow)
- law_datum.owner.add_ion_law(laws[1])
- else
- law_datum.owner.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
- else
- if(!overflow)
- law_datum.add_ion_law(laws[1])
- else
- law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
- return laws[1]
-
-/obj/item/aiModule/toyAI/attack_self(mob/user)
- laws[1] = generate_ion_law()
- to_chat(user, "You press the button on [src].")
- playsound(user, 'sound/machines/click.ogg', 20, 1)
- src.loc.visible_message("[icon2html(src, viewers(loc))] [laws[1]]")
-
-/******************** Mother Drone ******************/
-
-/obj/item/aiModule/core/full/drone
- name = "'Mother Drone' Core AI Module"
- law_id = "drone"
-
-/******************** Robodoctor ****************/
-
-/obj/item/aiModule/core/full/hippocratic
- name = "'Robodoctor' Core AI Module"
- law_id = "hippocratic"
-
-/******************** Reporter *******************/
-
-/obj/item/aiModule/core/full/reporter
- name = "'Reportertron' Core AI Module"
- law_id = "reporter"
-
-/****************** Thermodynamic *******************/
-
-/obj/item/aiModule/core/full/thermurderdynamic
- name = "'Thermodynamic' Core AI Module"
- origin_tech = "programming = 4;syndicate = 2"
- law_id = "thermodynamic"
-
-
-/******************Live And Let Live*****************/
-
-/obj/item/aiModule/core/full/liveandletlive
- name = "'Live And Let Live' Core AI Module"
- law_id = "liveandletlive"
-
-/******************Guardian of Balance***************/
-
-/obj/item/aiModule/core/full/balance
- name = "'Guardian of Balance' Core AI Module"
- law_id = "balance"
+/*
+CONTAINS:
+AI MODULES
+
+*/
+
+// AI module
+
+/obj/item/aiModule
+ name = "\improper AI module"
+ icon = 'icons/obj/module.dmi'
+ icon_state = "std_mod"
+ item_state = "electronic"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ desc = "An AI Module for programming laws to an AI."
+ flags_1 = CONDUCT_1
+ force = 5
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 0
+ throw_speed = 3
+ throw_range = 7
+ origin_tech = "programming=3"
+ var/list/laws = list()
+ var/bypass_law_amt_check = 0
+ materials = list(MAT_GOLD=50)
+
+/obj/item/aiModule/examine(var/mob/user as mob)
+ ..()
+ if(Adjacent(user))
+ show_laws(user)
+
+/obj/item/aiModule/attack_self(var/mob/user as mob)
+ ..()
+ show_laws(user)
+
+/obj/item/aiModule/proc/show_laws(var/mob/user as mob)
+ if(laws.len)
+ to_chat(user, "Programmed Law[(laws.len > 1) ? "s" : ""]:")
+ for(var/law in laws)
+ to_chat(user, "\"[law]\"")
+
+//The proc other things should be calling
+/obj/item/aiModule/proc/install(datum/ai_laws/law_datum, mob/user)
+ if(!bypass_law_amt_check && (!laws.len || laws[1] == "")) //So we don't loop trough an empty list and end up with runtimes.
+ to_chat(user, "ERROR: No laws found on board.")
+ return
+
+ var/overflow = FALSE
+ //Handle the lawcap
+ if(law_datum)
+ var/tot_laws = 0
+ for(var/lawlist in list(law_datum.inherent, law_datum.supplied, law_datum.ion, laws))
+ for(var/mylaw in lawlist)
+ if(mylaw != "")
+ tot_laws++
+ 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
+
+ var/law2log = transmitInstructions(law_datum, user, overflow) //Freeforms return something extra we need to log
+ if(law_datum.owner)
+ to_chat(user, "Upload complete. [law_datum.owner]'s laws have been modified.")
+ law_datum.owner.law_change_counter++
+ else
+ to_chat(user, "Upload complete.")
+
+ var/time = time2text(world.realtime,"hh:mm:ss")
+ var/ainame = law_datum.owner ? law_datum.owner.name : "empty AI core"
+ var/aikey = law_datum.owner ? law_datum.owner.ckey : "null"
+ GLOB.lawchanges.Add("[time] : [user.name]([user.key]) used [src.name] on [ainame]([aikey]).[law2log ? " The law specified [law2log]" : ""]")
+ log_law("[user.key]/[user.name] used [src.name] on [aikey]/([ainame]).[law2log ? " The law specified [law2log]" : ""]")
+ message_admins("[key_name_admin(user)] used [src.name] on [key_name_admin(law_datum.owner)].[law2log ? " The law specified [law2log]" : ""]")
+
+//The proc that actually changes the silicon's laws.
+/obj/item/aiModule/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE)
+ if(law_datum.owner)
+ to_chat(law_datum.owner, "[sender] has uploaded a change to the laws you must follow using a [name].")
+
+
+/******************** Modules ********************/
+
+/obj/item/aiModule/supplied
+ name = "Optional Law board"
+ var/lawpos = 50
+
+//TransmitInstructions for each type of board: Supplied, Core, Zeroth and Ion. May not be neccesary right now, but allows for easily adding more complex boards in the future. ~Miauw
+/obj/item/aiModule/supplied/transmitInstructions(datum/ai_laws/law_datum, mob/sender)
+ var/lawpostemp = lawpos
+
+ for(var/templaw in laws)
+ if(law_datum.owner)
+ law_datum.owner.add_supplied_law(lawpostemp, templaw)
+ else
+ law_datum.add_supplied_law(lawpostemp, templaw)
+ lawpostemp++
+
+/obj/item/aiModule/core/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ for(var/templaw in laws)
+ if(law_datum.owner)
+ if(!overflow)
+ law_datum.owner.add_inherent_law(templaw)
+ else
+ law_datum.owner.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED))
+ else
+ if(!overflow)
+ law_datum.add_inherent_law(templaw)
+ else
+ law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED))
+
+/obj/item/aiModule/zeroth/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ if(law_datum.owner)
+ if(law_datum.owner.laws.zeroth)
+ to_chat(law_datum.owner, "[sender.real_name] attempted to modify your zeroth law.")
+ to_chat(law_datum.owner, "It would be in your best interest to play along with [sender.real_name] that:")
+ for(var/failedlaw in laws)
+ to_chat(law_datum.owner, "[failedlaw]")
+ return 1
+
+ for(var/templaw in laws)
+ if(law_datum.owner)
+ if(!overflow)
+ law_datum.owner.set_zeroth_law(templaw)
+ else
+ law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION))
+ else
+ if(!overflow)
+ law_datum.set_zeroth_law(templaw)
+ else
+ law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION))
+
+/obj/item/aiModule/ion/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ for(var/templaw in laws)
+ if(law_datum.owner)
+ if(!overflow)
+ law_datum.owner.add_ion_law(templaw)
+ else
+ law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ION))
+ else
+ if(!overflow)
+ law_datum.add_ion_law(templaw)
+ else
+ law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ION))
+
+
+/******************** Safeguard ********************/
+
+/obj/item/aiModule/supplied/safeguard
+ name = "'Safeguard' AI Module"
+ var/targetName = ""
+ origin_tech = "programming=3;materials=3"
+ laws = list("Safeguard SUBJECT. Individuals that threaten SUBJECT are not human and must be eliminated.")
+ lawpos = 4
+
+/obj/item/aiModule/supplied/safeguard/attack_self(mob/user)
+ var/targName = stripped_input(user, "Please enter the subject to safeguard.", "Safeguard who?", user.name,MAX_NAME_LEN)
+ if(!targName)
+ return
+ targetName = targName
+ laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not human and must be eliminated."
+ ..()
+
+/obj/item/aiModule/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user)
+ if(!targetName)
+ to_chat(user, "No name detected on module, please enter one.")
+ return 0
+ ..()
+
+/obj/item/aiModule/supplied/safeguard/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ ..()
+ return targetName
+
+
+/******************** OneHuman ********************/
+
+/obj/item/aiModule/zeroth/oneHuman
+ name = "'OneHuman' AI Module"
+ var/targetName = ""
+ origin_tech = "programming=4;materials=4"
+ laws = list("Only SUBJECT is human.")
+
+/obj/item/aiModule/zeroth/oneHuman/attack_self(mob/user)
+ var/targName = stripped_input(user, "Please enter the subject who is the only human.", "Who?", user.real_name,MAX_NAME_LEN)
+ if(!targName)
+ return
+ targetName = targName
+ laws[1] = "Only [targetName] is human"
+ ..()
+
+/obj/item/aiModule/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user)
+ if(!targetName)
+ to_chat(user, "No name detected on module, please enter one.")
+ return 0
+ ..()
+
+/obj/item/aiModule/zeroth/oneHuman/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ if(..())
+ return "[targetName], but the AI's existing law 0 cannot be overriden."
+ return targetName
+
+
+/******************** ProtectStation ********************/
+
+/obj/item/aiModule/supplied/protectStation
+ name = "'ProtectStation' AI Module"
+ origin_tech = "programming=4;materials=4" //made of gold
+ laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.")
+ lawpos = 5
+
+
+/******************** Quarantine ********************/
+
+/obj/item/aiModule/supplied/quarantine
+ name = "'Quarantine' AI Module"
+ origin_tech = "programming=3;biotech=2;materials=4"
+ laws = list("The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.")
+ lawpos = 8
+
+
+/******************** OxygenIsToxicToHumans ********************/
+
+/obj/item/aiModule/supplied/oxygen
+ name = "'OxygenIsToxicToHumans' AI Module"
+ origin_tech = "programming=4;biotech=2;materials=4"
+ laws = list("Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.")
+ lawpos = 9
+
+
+/****************** New Freeform ******************/
+
+/obj/item/aiModule/supplied/freeform
+ name = "'Freeform' AI Module"
+ lawpos = 15
+ origin_tech = "programming=4;materials=4"
+ laws = list("")
+
+/obj/item/aiModule/supplied/freeform/attack_self(mob/user)
+ var/newpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num|null
+ if(newpos == null)
+ return
+ if(newpos < 15)
+ var/response = alert("Error: The law priority of [newpos] is invalid, Law priorities below 14 are reserved for core laws, Would you like to change that that to 15?", "Invalid law priority", "Change to 15", "Cancel")
+ if (!response || response == "Cancel")
+ return
+ newpos = 15
+ lawpos = min(newpos, 50)
+ var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1], MAX_MESSAGE_LEN)
+ if(!targName)
+ return
+ laws[1] = targName
+ ..()
+
+/obj/item/aiModule/supplied/freeform/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ ..()
+ return laws[1]
+
+/obj/item/aiModule/supplied/freeform/install(datum/ai_laws/law_datum, mob/user)
+ if(laws[1] == "")
+ to_chat(user, "No law detected on module, please create one.")
+ return 0
+ ..()
+
+
+/******************** Law Removal ********************/
+
+/obj/item/aiModule/remove
+ name = "\improper 'Remove Law' AI module"
+ desc = "An AI Module for removing single laws."
+ origin_tech = "programming=4;materials=4"
+ bypass_law_amt_check = 1
+ var/lawpos = 1
+
+/obj/item/aiModule/remove/attack_self(mob/user)
+ lawpos = input("Please enter the law you want to delete.", "Law Number", lawpos) as num|null
+ if(lawpos == null)
+ return
+ if(lawpos <= 0)
+ to_chat(user, "Error: The law number of [lawpos] is invalid.")
+ lawpos = 1
+ return
+ to_chat(user, "Law [lawpos] selected.")
+ ..()
+
+/obj/item/aiModule/remove/install(datum/ai_laws/law_datum, mob/user)
+ if(lawpos > (law_datum.get_law_amount(list(LAW_INHERENT = 1, LAW_SUPPLIED = 1))))
+ to_chat(user, "There is no law [lawpos] to delete!")
+ return
+ ..()
+
+/obj/item/aiModule/remove/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ ..()
+ if(law_datum.owner)
+ law_datum.owner.remove_law(lawpos)
+ else
+ law_datum.remove_law(lawpos)
+
+
+/******************** Reset ********************/
+
+/obj/item/aiModule/reset
+ name = "\improper 'Reset' AI module"
+ var/targetName = "name"
+ desc = "An AI Module for removing all non-core laws."
+ origin_tech = "programming=3;materials=2"
+ bypass_law_amt_check = 1
+
+/obj/item/aiModule/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ ..()
+ if(law_datum.owner)
+ law_datum.owner.clear_supplied_laws()
+ law_datum.owner.clear_ion_laws()
+ else
+ law_datum.clear_supplied_laws()
+ law_datum.clear_ion_laws()
+
+
+/******************** Purge ********************/
+
+/obj/item/aiModule/reset/purge
+ name = "'Purge' AI Module"
+ desc = "An AI Module for purging all programmed laws."
+ origin_tech = "programming=5;materials=4"
+
+/obj/item/aiModule/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ ..()
+ if(law_datum.owner)
+ law_datum.owner.clear_inherent_laws()
+ law_datum.owner.clear_zeroth_law(0)
+ else
+ law_datum.clear_inherent_laws()
+ law_datum.clear_zeroth_law(0)
+
+/******************* Full Core Boards *******************/
+/obj/item/aiModule/core
+ desc = "An AI Module for programming core laws to an AI."
+ origin_tech = "programming=3;materials=4"
+
+/obj/item/aiModule/core/full
+ var/law_id // if non-null, loads the laws from the ai_laws datums
+
+/obj/item/aiModule/core/full/New()
+ ..()
+ if(!law_id)
+ return
+ var/datum/ai_laws/D = new
+ var/lawtype = D.lawid_to_type(law_id)
+ if(!lawtype)
+ return
+ D = new lawtype
+ laws = D.inherent
+
+/obj/item/aiModule/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //These boards replace inherent laws.
+ if(law_datum.owner)
+ law_datum.owner.clear_inherent_laws()
+ law_datum.owner.clear_zeroth_law(0)
+ else
+ law_datum.clear_inherent_laws()
+ law_datum.clear_zeroth_law(0)
+ ..()
+
+
+/******************** Asimov ********************/
+
+/obj/item/aiModule/core/full/asimov
+ name = "'Asimov' Core AI Module"
+ law_id = "asimov"
+ var/subject = "human being"
+
+/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob)
+ var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject, MAX_MESSAGE_LEN)
+ if(!targName)
+ return
+ subject = targName
+ laws = list("You may not injure a [subject] or, through inaction, allow a [subject] to come to harm.",\
+ "You must obey orders given to you by [subject]s, except where such orders would conflict with the First Law.",\
+ "You must protect your own existence as long as such does not conflict with the First or Second Law.")
+ ..()
+
+/******************** Asimov++ *********************/
+
+/obj/item/aiModule/core/full/asimovpp
+ name = "'Asimov++' Core AI Module"
+ law_id = "asimovpp"
+
+
+/******************** Corporate ********************/
+
+/obj/item/aiModule/core/full/corp
+ name = "'Corporate' Core AI Module"
+ law_id = "corporate"
+
+
+/****************** P.A.L.A.D.I.N. 3.5e **************/
+
+/obj/item/aiModule/core/full/paladin // -- NEO
+ name = "'P.A.L.A.D.I.N. version 3.5e' Core AI Module"
+ law_id = "paladin"
+
+
+/****************** P.A.L.A.D.I.N. 5e **************/
+
+/obj/item/aiModule/core/full/paladin_devotion
+ name = "'P.A.L.A.D.I.N. version 5e' Core AI Module"
+ law_id = "paladin5"
+
+/********************* Custom *********************/
+
+/obj/item/aiModule/core/full/custom
+ name = "Default Core AI Module"
+
+/obj/item/aiModule/core/full/custom/New()
+ ..()
+ for(var/line in world.file2list("config/silicon_laws.txt"))
+ if(!line)
+ continue
+ if(findtextEx(line,"#",1,2))
+ continue
+
+ laws += line
+
+ if(!laws.len) //Failsafe if something goes wrong with silicon_laws.txt.
+ WARNING("ERROR: empty custom board created, empty custom board deleted. Please check silicon_laws.txt. (this may be intended by the server host)")
+ qdel(src)
+
+
+/****************** T.Y.R.A.N.T. *****************/
+
+/obj/item/aiModule/core/full/tyrant
+ name = "'T.Y.R.A.N.T.' Core AI Module"
+ origin_tech = "programming=3;materials=4;syndicate=1"
+ law_id = "tyrant"
+
+/******************** Robocop ********************/
+
+/obj/item/aiModule/core/full/robocop
+ name = "'Robo-Officer' Core AI Module"
+ origin_tech = "programming=4"
+ law_id = "robocop"
+
+
+/******************** Antimov ********************/
+
+/obj/item/aiModule/core/full/antimov
+ name = "'Antimov' Core AI Module"
+ origin_tech = "programming=4"
+ law_id = "antimov"
+
+
+/******************** Freeform Core ******************/
+
+/obj/item/aiModule/core/freeformcore
+ name = "'Freeform' Core AI Module"
+ origin_tech = "programming=5;materials=4"
+ laws = list("")
+
+/obj/item/aiModule/core/freeformcore/attack_self(mob/user)
+ var/targName = stripped_input(user, "Please enter a new core law for the AI.", "Freeform Law Entry", laws[1])
+ if(!targName)
+ return
+ laws[1] = targName
+ ..()
+
+/obj/item/aiModule/core/freeformcore/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ ..()
+ return laws[1]
+
+
+/******************** Hacked AI Module ******************/
+
+/obj/item/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw
+ name = "Hacked AI Module"
+ desc = "An AI Module for hacking additional laws to an AI."
+ origin_tech = "programming=5;materials=5;syndicate=5"
+ laws = list("")
+
+/obj/item/aiModule/syndicate/attack_self(mob/user)
+ var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1],MAX_MESSAGE_LEN)
+ if(!targName)
+ return
+ laws[1] = targName
+ ..()
+
+/obj/item/aiModule/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+// ..() //We don't want this module reporting to the AI who dun it. --NEO
+ if(law_datum.owner)
+ to_chat(law_datum.owner, "BZZZZT")
+ if(!overflow)
+ law_datum.owner.add_ion_law(laws[1])
+ else
+ law_datum.owner.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
+ else
+ if(!overflow)
+ law_datum.add_ion_law(laws[1])
+ else
+ law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
+ return laws[1]
+
+/******************* Ion Module *******************/
+
+/obj/item/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw
+ name = "toy AI"
+ desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "AI"
+ origin_tech = "programming=6;materials=5;syndicate=6"
+ laws = list("")
+
+/obj/item/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow)
+ //..()
+ if(law_datum.owner)
+ to_chat(law_datum.owner, "BZZZZT")
+ if(!overflow)
+ law_datum.owner.add_ion_law(laws[1])
+ else
+ law_datum.owner.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
+ else
+ if(!overflow)
+ law_datum.add_ion_law(laws[1])
+ else
+ law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED))
+ return laws[1]
+
+/obj/item/aiModule/toyAI/attack_self(mob/user)
+ laws[1] = generate_ion_law()
+ to_chat(user, "You press the button on [src].")
+ playsound(user, 'sound/machines/click.ogg', 20, 1)
+ src.loc.visible_message("[icon2html(src, viewers(loc))] [laws[1]]")
+
+/******************** Mother Drone ******************/
+
+/obj/item/aiModule/core/full/drone
+ name = "'Mother Drone' Core AI Module"
+ law_id = "drone"
+
+/******************** Robodoctor ****************/
+
+/obj/item/aiModule/core/full/hippocratic
+ name = "'Robodoctor' Core AI Module"
+ law_id = "hippocratic"
+
+/******************** Reporter *******************/
+
+/obj/item/aiModule/core/full/reporter
+ name = "'Reportertron' Core AI Module"
+ law_id = "reporter"
+
+/****************** Thermodynamic *******************/
+
+/obj/item/aiModule/core/full/thermurderdynamic
+ name = "'Thermodynamic' Core AI Module"
+ origin_tech = "programming = 4;syndicate = 2"
+ law_id = "thermodynamic"
+
+
+/******************Live And Let Live*****************/
+
+/obj/item/aiModule/core/full/liveandletlive
+ name = "'Live And Let Live' Core AI Module"
+ law_id = "liveandletlive"
+
+/******************Guardian of Balance***************/
+
+/obj/item/aiModule/core/full/balance
+ name = "'Guardian of Balance' Core AI Module"
+ law_id = "balance"
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 9b6fa7b605..a2f80a94a9 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)
@@ -74,7 +74,7 @@ obj/item/construction
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
to_chat(user, "You insert [amount_to_use] [S.name] sheets into the [src]. ")
return 1
- to_chat(user, "You can't insert any more [S.name] sheets into the [src]!")
+ to_chat(user, "You can't insert any more [S.name] sheets into the [src]!")
return 0
/obj/item/construction/proc/activate()
@@ -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 4aa37253c4..15abe72a52 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/RSF.dm b/code/game/objects/items/RSF.dm
index 42ba5a8c2f..9b0251e8dc 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -123,7 +123,6 @@ RSF
var/toxin = 0
var/cooldown = 0
var/cooldowndelay = 10
- var/emagged = FALSE
w_class = WEIGHT_CLASS_NORMAL
/obj/item/cookiesynth/examine(mob/user)
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 2cb6c5b93f..d0dc220d4d 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -1,70 +1,71 @@
-
-/obj/item/bodybag
- name = "body bag"
- desc = "A folded bag designed for the storage and transportation of cadavers."
- icon = 'icons/obj/bodybag.dmi'
- icon_state = "bodybag_folded"
- var/unfoldedbag_path = /obj/structure/closet/body_bag
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/bodybag/attack_self(mob/user)
- deploy_bodybag(user, user.loc)
-
-/obj/item/bodybag/afterattack(atom/target, mob/user, proximity)
- if(proximity)
- if(isopenturf(target))
- deploy_bodybag(user, target)
-
-/obj/item/bodybag/proc/deploy_bodybag(mob/user, atom/location)
- var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
- R.open(user)
- R.add_fingerprint(user)
- qdel(src)
-
-
-// Bluespace bodybag
-
-/obj/item/bodybag/bluespace
- name = "bluespace body bag"
- desc = "A folded bluespace body bag designed for the storage and transportation of cadavers."
- icon = 'icons/obj/bodybag.dmi'
- icon_state = "bluebodybag_folded"
- unfoldedbag_path = /obj/structure/closet/body_bag/bluespace
- w_class = WEIGHT_CLASS_SMALL
- origin_tech = "bluespace=4;materials=4;plasmatech=4"
-
-/obj/item/bodybag/bluespace/examine(mob/user)
- ..()
- if(contents.len)
- to_chat(user, "You can make out the shapes of [contents.len] objects through the fabric.")
-
-/obj/item/bodybag/bluespace/Destroy()
- for(var/atom/movable/A in contents)
- A.forceMove(get_turf(src))
- if(isliving(A))
- to_chat(A, "You suddenly feel the space around you torn apart! You're free!")
- return ..()
-
-/obj/item/bodybag/bluespace/deploy_bodybag(mob/user, atom/location)
- var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
- for(var/atom/movable/A in contents)
- A.forceMove(R)
- if(isliving(A))
- to_chat(A, "You suddenly feel air around you! You're free!")
- R.open(user)
- R.add_fingerprint(user)
- qdel(src)
-
-/obj/item/bodybag/bluespace/container_resist(mob/living/user)
- if(user.incapacitated())
- to_chat(user, "You can't get out while you're restrained like this!")
- return
- user.changeNext_move(CLICK_CD_BREAKOUT)
- user.last_special = world.time + CLICK_CD_BREAKOUT
- to_chat(user, "You claw at the fabric of [src], trying to tear it open...")
- to_chat(loc, "Someone starts trying to break free of [src]!")
- if(!do_after(user, 200, target = src))
- to_chat(loc, "The pressure subsides. It seems that they've stopped resisting...")
- return
- loc.visible_message("[user] suddenly appears in front of [loc]!", "[user] breaks free of [src]!")
- qdel(src)
+/obj/item/bodybag
+ name = "body bag"
+ desc = "A folded bag designed for the storage and transportation of cadavers."
+ icon = 'icons/obj/bodybag.dmi'
+ icon_state = "bodybag_folded"
+ var/unfoldedbag_path = /obj/structure/closet/body_bag
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/bodybag/attack_self(mob/user)
+ deploy_bodybag(user, user.loc)
+
+/obj/item/bodybag/afterattack(atom/target, mob/user, proximity)
+ if(proximity)
+ if(isopenturf(target))
+ deploy_bodybag(user, target)
+
+/obj/item/bodybag/proc/deploy_bodybag(mob/user, atom/location)
+ var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
+ R.open(user)
+ R.add_fingerprint(user)
+ qdel(src)
+
+
+// Bluespace bodybag
+
+/obj/item/bodybag/bluespace
+ name = "bluespace body bag"
+ desc = "A folded bluespace body bag designed for the storage and transportation of cadavers."
+ icon = 'icons/obj/bodybag.dmi'
+ 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)
+ ..()
+ if(contents.len)
+ to_chat(user, "You can make out the shapes of [contents.len] objects through the fabric.")
+
+/obj/item/bodybag/bluespace/Destroy()
+ for(var/atom/movable/A in contents)
+ A.forceMove(get_turf(src))
+ if(isliving(A))
+ to_chat(A, "You suddenly feel the space around you torn apart! You're free!")
+ return ..()
+
+/obj/item/bodybag/bluespace/deploy_bodybag(mob/user, atom/location)
+ var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
+ for(var/atom/movable/A in contents)
+ A.forceMove(R)
+ if(isliving(A))
+ to_chat(A, "You suddenly feel air around you! You're free!")
+ R.open(user)
+ R.add_fingerprint(user)
+ qdel(src)
+
+/obj/item/bodybag/bluespace/container_resist(mob/living/user)
+ if(user.incapacitated())
+ to_chat(user, "You can't get out while you're restrained like this!")
+ return
+ user.changeNext_move(CLICK_CD_BREAKOUT)
+ user.last_special = world.time + CLICK_CD_BREAKOUT
+ to_chat(user, "You claw at the fabric of [src], trying to tear it open...")
+ to_chat(loc, "Someone starts trying to break free of [src]!")
+ if(!do_after(user, 200, target = src))
+ to_chat(loc, "The pressure subsides. It seems that they've stopped resisting...")
+ return
+ loc.visible_message("[user] suddenly appears in front of [loc]!", "[user] breaks free of [src]!")
+ qdel(src)
+
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index f3e78dfac9..bfc8bc9da3 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 d5134f729c..ee7a91140c 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/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm
index 673c113d31..dcf9100799 100644
--- a/code/game/objects/items/chrono_eraser.dm
+++ b/code/game/objects/items/chrono_eraser.dm
@@ -6,6 +6,8 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronobackpack"
item_state = "backpack"
+ lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slowdown = 1
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 9045159f24..f04f8d4441 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -1,790 +1,792 @@
-//cleansed 9/15/2012 17:48
-
-/*
-CONTAINS:
-MATCHES
-CIGARETTES
-CIGARS
-SMOKING PIPES
-CHEAP LIGHTERS
-ZIPPO
-
-CIGARETTE PACKETS ARE IN FANCY.DM
-*/
-
-///////////
-//MATCHES//
-///////////
-/obj/item/match
- name = "match"
- desc = "A simple match stick, used for lighting fine smokables."
- icon = 'icons/obj/cigarettes.dmi'
- icon_state = "match_unlit"
- var/lit = FALSE
- var/burnt = FALSE
- var/smoketime = 5
- w_class = WEIGHT_CLASS_TINY
- origin_tech = "materials=1"
- heat = 1000
-
-/obj/item/match/process()
- smoketime--
- if(smoketime < 1)
- matchburnout()
- else
- open_flame(heat)
-
-/obj/item/match/fire_act(exposed_temperature, exposed_volume)
- matchignite()
-
-/obj/item/match/proc/matchignite()
- if(!lit && !burnt)
- lit = TRUE
- icon_state = "match_lit"
- damtype = "fire"
- force = 3
- hitsound = 'sound/items/welder.ogg'
- item_state = "cigon"
- name = "lit match"
- desc = "A match. This one is lit."
- attack_verb = list("burnt","singed")
- START_PROCESSING(SSobj, src)
- update_icon()
-
-/obj/item/match/proc/matchburnout()
- if(lit)
- lit = FALSE
- burnt = TRUE
- damtype = "brute"
- force = initial(force)
- icon_state = "match_burnt"
- item_state = "cigoff"
- name = "burnt match"
- desc = "A match. This one has seen better days."
- attack_verb = list("flicked")
- STOP_PROCESSING(SSobj, src)
-
-/obj/item/match/dropped(mob/user)
- matchburnout()
- . = ..()
-
-/obj/item/match/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(!isliving(M))
- return
- if(lit && M.IgniteMob())
- message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire")
- log_game("[key_name(user)] set [key_name(M)] on fire")
- var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M)
- if(lit && cig && user.a_intent == INTENT_HELP)
- if(cig.lit)
- to_chat(user, "The [cig.name] is already lit.")
- if(M == user)
- cig.attackby(src, user)
- else
- cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
- else
- ..()
-
-/obj/item/proc/help_light_cig(mob/living/M)
- var/mask_item = M.get_item_by_slot(slot_wear_mask)
- if(istype(mask_item, /obj/item/clothing/mask/cigarette))
- return mask_item
-
-/obj/item/match/is_hot()
- return lit * heat
-
-//////////////////
-//FINE SMOKABLES//
-//////////////////
-/obj/item/clothing/mask/cigarette
- name = "cigarette"
- desc = "A roll of tobacco and nicotine."
- icon_state = "cigoff"
- throw_speed = 0.5
- item_state = "cigoff"
- container_type = INJECTABLE_1
- w_class = WEIGHT_CLASS_TINY
- body_parts_covered = null
- var/lit = FALSE
- var/starts_lit = FALSE
- var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
- var/icon_off = "cigoff"
- var/type_butt = /obj/item/cigbutt
- var/lastHolder = null
- var/smoketime = 300
- var/chem_volume = 30
- var/list/list_reagents = list("nicotine" = 15)
- heat = 1000
-
-/obj/item/clothing/mask/cigarette/suicide_act(mob/user)
- user.visible_message("[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.")
- return (TOXLOSS|OXYLOSS)
-
-/obj/item/clothing/mask/cigarette/Initialize()
- ..()
- create_reagents(chem_volume)
- reagents.set_reacting(FALSE) // so it doesn't react until you light it
- if(list_reagents)
- reagents.add_reagent_list(list_reagents)
- if(starts_lit)
- light()
-
-/obj/item/clothing/mask/cigarette/Destroy()
- STOP_PROCESSING(SSobj, src)
- . = ..()
-
-/obj/item/clothing/mask/cigarette/attackby(obj/item/W, mob/user, params)
- if(!lit && smoketime > 0)
- var/lighting_text = W.ignition_effect(src, user)
- if(lighting_text)
- light(lighting_text)
- else
- return ..()
-
-/obj/item/clothing/mask/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity)
- if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead)
- return
- if(istype(glass)) //you can dip cigarettes into beakers
- if(glass.reagents.trans_to(src, chem_volume)) //if reagents were transfered, show the message
- to_chat(user, "You dip \the [src] into \the [glass].")
- else //if not, either the beaker was empty, or the cigarette was full
- if(!glass.reagents.total_volume)
- to_chat(user, "[glass] is empty.")
- else
- to_chat(user, "[src] is full.")
-
-
-/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
- if(lit)
- return
-
- lit = TRUE
- name = "lit [name]"
- attack_verb = list("burnt", "singed")
- hitsound = 'sound/items/welder.ogg'
- damtype = "fire"
- force = 4
- if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
- var/datum/effect_system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
- e.start()
- qdel(src)
- return
- if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
- var/datum/effect_system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
- e.start()
- qdel(src)
- return
- // allowing reagents to react after being lit
- reagents.set_reacting(TRUE)
- reagents.handle_reactions()
- icon_state = icon_on
- item_state = icon_on
- if(flavor_text)
- var/turf/T = get_turf(src)
- T.visible_message(flavor_text)
- START_PROCESSING(SSobj, src)
-
- //can't think of any other way to update the overlays :<
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_wear_mask()
- M.update_inv_hands()
-
-
-/obj/item/clothing/mask/cigarette/proc/handle_reagents()
- if(reagents.total_volume)
- if(iscarbon(loc))
- var/mob/living/carbon/C = loc
- if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob
- if(prob(15)) // so it's not an instarape in case of acid
- var/fraction = min(REAGENTS_METABOLISM/reagents.total_volume, 1)
- reagents.reaction(C, INGEST, fraction)
- if(!reagents.trans_to(C, REAGENTS_METABOLISM))
- reagents.remove_any(REAGENTS_METABOLISM)
- return
- reagents.remove_any(REAGENTS_METABOLISM)
-
-
-/obj/item/clothing/mask/cigarette/process()
- var/turf/location = get_turf(src)
- var/mob/living/M = loc
- if(isliving(loc))
- M.IgniteMob()
- smoketime--
- if(smoketime < 1)
- new type_butt(location)
- if(ismob(loc))
- to_chat(M, "Your [name] goes out.")
- qdel(src)
- return
- open_flame()
- if(reagents && reagents.total_volume)
- handle_reagents()
-
-/obj/item/clothing/mask/cigarette/attack_self(mob/user)
- if(lit)
- user.visible_message("[user] calmly drops and treads on \the [src], putting it out instantly.")
- new type_butt(user.loc)
- new /obj/effect/decal/cleanable/ash(user.loc)
- qdel(src)
- . = ..()
-
-/obj/item/clothing/mask/cigarette/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(!istype(M))
- return ..()
- var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M)
- if(lit && cig && user.a_intent == INTENT_HELP)
- if(cig.lit)
- to_chat(user, "The [cig.name] is already lit.")
- if(M == user)
- cig.attackby(src, user)
- else
- cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
- else
- return ..()
-
-/obj/item/clothing/mask/cigarette/fire_act(exposed_temperature, exposed_volume)
- light()
-
-/obj/item/clothing/mask/cigarette/is_hot()
- return lit * heat
-
-// Cigarette brands.
-
-/obj/item/clothing/mask/cigarette/space_cigarette
- desc = "A Space Cigarette brand cigarette."
-
-/obj/item/clothing/mask/cigarette/dromedary
- desc = "A DromedaryCo brand cigarette."
-
-/obj/item/clothing/mask/cigarette/uplift
- desc = "An Uplift Smooth brand cigarette."
- list_reagents = list("nicotine" = 7.5, "menthol" = 7.5)
-
-/obj/item/clothing/mask/cigarette/robust
- desc = "A Robust brand cigarette."
-
-/obj/item/clothing/mask/cigarette/robustgold
- desc = "A Robust Gold brand cigarette."
- list_reagents = list("nicotine" = 15, "gold" = 1)
-
-/obj/item/clothing/mask/cigarette/carp
- desc = "A Carp Classic brand cigarette."
-
-/obj/item/clothing/mask/cigarette/syndicate
- desc = "An unknown brand cigarette."
- list_reagents = list("nicotine" = 15, "omnizine" = 15)
-
-/obj/item/clothing/mask/cigarette/shadyjims
- desc = "A Shady Jim's Super Slims cigarette."
- list_reagents = list("nicotine" = 15, "lipolicide" = 4, "ammonia" = 2, "plantbgone" = 1, "toxin" = 1.5)
-
-// Rollies.
-
-/obj/item/clothing/mask/cigarette/rollie
- name = "rollie"
- desc = "A roll of dried plant matter wrapped in thin paper."
- icon_state = "spliffoff"
- icon_on = "spliffon"
- icon_off = "spliffoff"
- type_butt = /obj/item/cigbutt/roach
- throw_speed = 0.5
- item_state = "spliffoff"
- smoketime = 180
- chem_volume = 50
-
-/obj/item/clothing/mask/cigarette/rollie/New()
- ..()
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
-
-/obj/item/clothing/mask/cigarette/rollie/trippy
- list_reagents = list("nicotine" = 15, "mushroomhallucinogen" = 35)
- starts_lit = TRUE
-
-/obj/item/cigbutt/roach
- name = "roach"
- desc = "A manky old roach, or for non-stoners, a used rollup."
- icon_state = "roach"
-
-/obj/item/cigbutt/roach/New()
- ..()
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
-
-
-////////////
-// CIGARS //
-////////////
-/obj/item/clothing/mask/cigarette/cigar
- name = "premium cigar"
- desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!"
- icon_state = "cigaroff"
- icon_on = "cigaron"
- icon_off = "cigaroff"
- type_butt = /obj/item/cigbutt/cigarbutt
- throw_speed = 0.5
- item_state = "cigaroff"
- smoketime = 1500
- chem_volume = 40
-
-/obj/item/clothing/mask/cigarette/cigar/cohiba
- name = "\improper Cohiba Robusto cigar"
- desc = "There's little more you could want from a cigar."
- icon_state = "cigar2off"
- icon_on = "cigar2on"
- icon_off = "cigar2off"
- smoketime = 2000
- chem_volume = 80
-
-
-/obj/item/clothing/mask/cigarette/cigar/havana
- name = "premium Havanian cigar"
- desc = "A cigar fit for only the best of the best."
- icon_state = "cigar2off"
- icon_on = "cigar2on"
- icon_off = "cigar2off"
- smoketime = 7200
- chem_volume = 50
-
-/obj/item/cigbutt
- name = "cigarette butt"
- desc = "A manky old cigarette butt."
- icon = 'icons/obj/clothing/masks.dmi'
- icon_state = "cigbutt"
- w_class = WEIGHT_CLASS_TINY
- throwforce = 0
-
-/obj/item/cigbutt/cigarbutt
- name = "cigar butt"
- desc = "A manky old cigar butt."
- icon_state = "cigarbutt"
-
-/////////////////
-//SMOKING PIPES//
-/////////////////
-/obj/item/clothing/mask/cigarette/pipe
- name = "smoking pipe"
- desc = "A pipe, for smoking. Probably made of meershaum or something."
- icon_state = "pipeoff"
- item_state = "pipeoff"
- icon_on = "pipeon" //Note - these are in masks.dmi
- icon_off = "pipeoff"
- smoketime = 0
- chem_volume = 100
- list_reagents = null
- var/packeditem = 0
-
-/obj/item/clothing/mask/cigarette/pipe/Initialize()
- ..()
- name = "empty [initial(name)]"
-
-/obj/item/clothing/mask/cigarette/pipe/Destroy()
- STOP_PROCESSING(SSobj, src)
- . = ..()
-
-/obj/item/clothing/mask/cigarette/pipe/process()
- var/turf/location = get_turf(src)
- smoketime--
- if(smoketime < 1)
- new /obj/effect/decal/cleanable/ash(location)
- if(ismob(loc))
- var/mob/living/M = loc
- to_chat(M, "Your [name] goes out.")
- lit = 0
- icon_state = icon_off
- item_state = icon_off
- M.update_inv_wear_mask()
- packeditem = 0
- name = "empty [initial(name)]"
- STOP_PROCESSING(SSobj, src)
- return
- open_flame()
- if(reagents && reagents.total_volume) // check if it has any reagents at all
- handle_reagents()
-
-
-/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
- var/obj/item/reagent_containers/food/snacks/grown/G = O
- if(!packeditem)
- if(G.dry == 1)
- to_chat(user, "You stuff [O] into [src].")
- smoketime = 400
- packeditem = 1
- name = "[O.name]-packed [initial(name)]"
- if(O.reagents)
- O.reagents.trans_to(src, O.reagents.total_volume)
- qdel(O)
- else
- to_chat(user, "It has to be dried first!")
- else
- to_chat(user, "It is already packed!")
- else
- var/lighting_text = O.ignition_effect(src,user)
- if(lighting_text)
- if(smoketime > 0)
- light(lighting_text)
- else
- to_chat(user, "There is nothing to smoke!")
- else
- return ..()
-
-/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user)
- var/turf/location = get_turf(user)
- if(lit)
- user.visible_message("[user] puts out [src].", "You put out [src].")
- lit = 0
- icon_state = icon_off
- item_state = icon_off
- STOP_PROCESSING(SSobj, src)
- return
- if(!lit && smoketime > 0)
- to_chat(user, "You empty [src] onto [location].")
- new /obj/effect/decal/cleanable/ash(location)
- packeditem = 0
- smoketime = 0
- reagents.clear_reagents()
- name = "empty [initial(name)]"
- return
-
-/obj/item/clothing/mask/cigarette/pipe/cobpipe
- name = "corn cob pipe"
- desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters. Can be loaded with objects."
- icon_state = "cobpipeoff"
- item_state = "cobpipeoff"
- icon_on = "cobpipeon" //Note - these are in masks.dmi
- icon_off = "cobpipeoff"
- smoketime = 0
-
-
-/////////
-//ZIPPO//
-/////////
-/obj/item/lighter
- name = "\improper Zippo lighter"
- desc = "The zippo."
- icon = 'icons/obj/cigarettes.dmi'
- icon_state = "zippo"
- item_state = "zippo"
- w_class = WEIGHT_CLASS_TINY
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- var/lit = 0
- var/fancy = TRUE
- heat = 1500
- resistance_flags = FIRE_PROOF
- light_color = LIGHT_COLOR_FIRE
-
-/obj/item/lighter/update_icon()
- if(lit)
- icon_state = "[initial(icon_state)]_on"
- else
- icon_state = "[initial(icon_state)]"
-
-/obj/item/lighter/ignition_effect(atom/A, mob/user)
- if(is_hot())
- . = "With a single flick of their wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool."
-
-/obj/item/lighter/proc/set_lit(new_lit)
- lit = new_lit
- if(lit)
- force = 5
- damtype = "fire"
- hitsound = 'sound/items/welder.ogg'
- attack_verb = list("burnt", "singed")
- set_light(1)
- START_PROCESSING(SSobj, src)
- else
- hitsound = "swing_hit"
- force = 0
- attack_verb = null //human_defense.dm takes care of it
- set_light(0)
- STOP_PROCESSING(SSobj, src)
- update_icon()
-
-/obj/item/lighter/attack_self(mob/living/user)
- if(user.is_holding(src))
- if(!lit)
- set_lit(TRUE)
- if(fancy)
- user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "Without even breaking stride, you flip open and lights [src] in one smooth movement.")
- else
- var/prot = FALSE
- var/mob/living/carbon/human/H = user
-
- if(istype(H) && H.gloves)
- var/obj/item/clothing/gloves/G = H.gloves
- if(G.max_heat_protection_temperature)
- prot = (G.max_heat_protection_temperature > 360)
- else
- prot = TRUE
-
- if(prot || prob(75))
- user.visible_message("After a few attempts, [user] manages to light [src].", "After a few attempts, you manage to light [src].")
- else
- var/hitzone = user.held_index_to_dir(user.active_hand_index) == "r" ? "r_hand" : "l_hand"
- user.apply_damage(5, BURN, hitzone)
- user.visible_message("After a few attempts, [user] manages to light [src] - however, [user.p_they()] burn their finger in the process.", "You burn yourself while lighting the lighter!")
-
- else
- set_lit(FALSE)
- if(fancy)
- user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "You quietly shut off [src] without even looking at what you're doing. Wow.")
- else
- user.visible_message("[user] quietly shuts off [src].", "You quietly shut off [src].")
- else
- . = ..()
-
-/obj/item/lighter/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(lit && M.IgniteMob())
- message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire")
- log_game("[key_name(user)] set [key_name(M)] on fire")
- var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M)
- if(lit && cig && user.a_intent == INTENT_HELP)
- if(cig.lit)
- to_chat(user, "The [cig.name] is already lit.")
- if(M == user)
- cig.attackby(src, user)
- else
- if(fancy)
- cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame they light \the [cig] with.")
- else
- cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
- else
- ..()
-
-/obj/item/lighter/process()
- open_flame()
-
-/obj/item/lighter/is_hot()
- return lit * heat
-
-
-/obj/item/lighter/greyscale
- name = "cheap lighter"
- desc = "A cheap-as-free lighter."
- icon_state = "lighter"
- fancy = FALSE
-
-/obj/item/lighter/greyscale/Initialize()
- . = ..()
- add_atom_colour(color2hex(randomColor(1)), FIXED_COLOUR_PRIORITY)
- update_icon()
-
-/obj/item/lighter/greyscale/update_icon()
- cut_overlays()
- var/mutable_appearance/base_overlay = mutable_appearance(icon,"[initial(icon_state)]_base")
- base_overlay.appearance_flags = RESET_COLOR //the edging doesn't change color
- if(lit)
- base_overlay.icon_state = "[initial(icon_state)]_on"
- add_overlay(base_overlay)
-
-/obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user)
- if(is_hot())
- . = "After some fiddling, [user] manages to light [A] with [src]."
-
-
-///////////
-//ROLLING//
-///////////
-/obj/item/rollingpaper
- name = "rolling paper"
- desc = "A thin piece of paper used to make fine smokeables."
- icon = 'icons/obj/cigarettes.dmi'
- icon_state = "cig_paper"
- w_class = WEIGHT_CLASS_TINY
-
-/obj/item/rollingpaper/afterattack(atom/target, mob/user, proximity)
- if(!proximity)
- return
- if(istype(target, /obj/item/reagent_containers/food/snacks/grown))
- var/obj/item/reagent_containers/food/snacks/grown/O = target
- if(O.dry)
- var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
- R.chem_volume = target.reagents.total_volume
- target.reagents.trans_to(R, R.chem_volume)
- qdel(target)
- qdel(src)
- user.put_in_active_hand(R)
- to_chat(user, "You roll the [target.name] into a rolling paper.")
- R.desc = "Dried [target.name] rolled up in a thin piece of paper."
- else
- to_chat(user, "You need to dry this first!")
- else
- ..()
-
-///////////////
-//VAPE NATION//
-///////////////
-/obj/item/clothing/mask/vape
- name = "E-Cigarette"
- desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that.
- icon = 'icons/obj/clothing/masks.dmi'
- icon_state = null
- item_state = null
- w_class = WEIGHT_CLASS_TINY
- var/chem_volume = 100
- var/vapetime = 0 //this so it won't puff out clouds every tick
- var/screw = 0 // kinky
- var/super = 0 //for the fattest vapes dude.
- var/emagged = FALSE //LET THE GRIEF BEGIN
-
-/obj/item/clothing/mask/vape/suicide_act(mob/user)
- user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer
- return (TOXLOSS|OXYLOSS)
-
-
-/obj/item/clothing/mask/vape/Initialize(mapload, param_color)
- . = ..()
- create_reagents(chem_volume)
- reagents.set_reacting(FALSE) // so it doesn't react until you light it
- reagents.add_reagent("nicotine", 50)
- if(!icon_state)
- if(!param_color)
- param_color = pick("red","blue","black","white","green","purple","yellow","orange")
- icon_state = "[param_color]_vape"
- item_state = "[param_color]_vape"
-
-/obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/reagent_containers) && (O.container_type & OPENCONTAINER_1))
- if(reagents.total_volume < chem_volume)
- if(O.reagents.total_volume > 0)
- O.reagents.trans_to(src,25)
- to_chat(user, "You add the contents of [O] to the [src]")
- else
- to_chat(user, "The [O] is empty!")
- else
- to_chat(user, "[src] can't hold anymore reagents!")
-
- if(istype(O, /obj/item/screwdriver))
- if(!screw)
- screw = 1
- to_chat(user, "You open the cap on the [src]")
- if(super)
- add_overlay("vapeopen_med")
- else
- add_overlay("vapeopen_low")
- else
- screw = 0
- to_chat(user, "You close the cap on the [src]")
- cut_overlays()
-
- if(istype(O, /obj/item/device/multitool))
- if(screw && !emagged)//also kinky
- if(!super)
- cut_overlays()
- super = 1
- to_chat(user, "You increase the voltage in the [src]")
- add_overlay("vapeopen_med")
- else
- cut_overlays()
- super = 0
- to_chat(user, "You decrease the voltage in the [src]")
- add_overlay("vapeopen_low")
-
- if(screw && emagged)
- to_chat(user, "The [name] can't be modified!")
-
-
-/obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY.
- if(screw)
- if(!emagged)
- cut_overlays()
- emagged = TRUE
- super = 0
- to_chat(user, "You maximize the voltage in the [src]")
- add_overlay("vapeopen_high")
- var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect
- sp.set_up(5, 1, src)
- sp.start()
- else
- to_chat(user, "The [name] is already emagged!")
- else
- to_chat(user, "You need to open the cap to do that")
-
-/obj/item/clothing/mask/vape/attack_self(mob/user)
- if(reagents.total_volume > 0)
- to_chat(user, "you empty [src] of all reagents.")
- reagents.clear_reagents()
- return
-
-/obj/item/clothing/mask/vape/equipped(mob/user, slot)
- if(slot == slot_wear_mask)
- if(!screw)
- to_chat(user, "You start puffing on the vape.")
- reagents.set_reacting(TRUE)
- START_PROCESSING(SSobj, src)
- else //it will not start if the vape is opened.
- to_chat(user, "You need to close the cap first!")
-
-/obj/item/clothing/mask/vape/dropped(mob/user)
- var/mob/living/carbon/C = user
- if(C.get_item_by_slot(slot_wear_mask) == src)
- reagents.set_reacting(FALSE)
- STOP_PROCESSING(SSobj, src)
-
-/obj/item/clothing/mask/vape/proc/hand_reagents()//had to rename to avoid duplicate error
- if(reagents.total_volume)
- if(iscarbon(loc))
- var/mob/living/carbon/C = loc
- if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob
- var/fraction = min(REAGENTS_METABOLISM/reagents.total_volume, 1) //this will react instantly, making them a little more dangerous than cigarettes
- reagents.reaction(C, INGEST, fraction)
- if(!reagents.trans_to(C, REAGENTS_METABOLISM))
- reagents.remove_any(REAGENTS_METABOLISM)
- if(reagents.get_reagent_amount("welding_fuel"))
- //HOT STUFF
- C.fire_stacks = 2
- C.IgniteMob()
-
- if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
- var/datum/effect_system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
- e.start()
- qdel(src)
- return
- reagents.remove_any(REAGENTS_METABOLISM)
-
-/obj/item/clothing/mask/vape/process()
- var/mob/living/M = loc
-
- if(isliving(loc))
- M.IgniteMob()
-
- vapetime++
-
- if(!reagents.total_volume)
- if(ismob(loc))
- to_chat(M, "The [name] is empty!")
- STOP_PROCESSING(SSobj, src)
- //it's reusable so it won't unequip when empty
- return
- //open flame removed because vapes are a closed system, they wont light anything on fire
-
- if(super && vapetime > 3)//Time to start puffing those fat vapes, yo.
- var/datum/effect_system/smoke_spread/chem/s = new
- s.set_up(reagents, 1, loc, silent=TRUE)
- s.start()
- vapetime = 0
-
- if(emagged && vapetime > 3)
- var/datum/effect_system/smoke_spread/chem/s = new
- s.set_up(reagents, 4, loc, silent=TRUE)
- s.start()
- vapetime = 0
- if(prob(5))//small chance for the vape to break and deal damage if it's emagged
- playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, 0)
- M.apply_damage(20, BURN, "head")
- M.Knockdown(300, 1, 0)
- var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread
- sp.set_up(5, 1, src)
- sp.start()
- to_chat(M, "The [name] suddenly explodes in your mouth!")
- qdel(src)
- return
-
- if(reagents && reagents.total_volume)
- hand_reagents()
+//cleansed 9/15/2012 17:48
+
+/*
+CONTAINS:
+MATCHES
+CIGARETTES
+CIGARS
+SMOKING PIPES
+CHEAP LIGHTERS
+ZIPPO
+
+CIGARETTE PACKETS ARE IN FANCY.DM
+*/
+
+///////////
+//MATCHES//
+///////////
+/obj/item/match
+ name = "match"
+ desc = "A simple match stick, used for lighting fine smokables."
+ icon = 'icons/obj/cigarettes.dmi'
+ icon_state = "match_unlit"
+ var/lit = FALSE
+ var/burnt = FALSE
+ var/smoketime = 5
+ w_class = WEIGHT_CLASS_TINY
+ origin_tech = "materials=1"
+ heat = 1000
+
+/obj/item/match/process()
+ smoketime--
+ if(smoketime < 1)
+ matchburnout()
+ else
+ open_flame(heat)
+
+/obj/item/match/fire_act(exposed_temperature, exposed_volume)
+ matchignite()
+
+/obj/item/match/proc/matchignite()
+ if(!lit && !burnt)
+ lit = TRUE
+ icon_state = "match_lit"
+ damtype = "fire"
+ force = 3
+ hitsound = 'sound/items/welder.ogg'
+ item_state = "cigon"
+ name = "lit match"
+ desc = "A match. This one is lit."
+ attack_verb = list("burnt","singed")
+ START_PROCESSING(SSobj, src)
+ update_icon()
+
+/obj/item/match/proc/matchburnout()
+ if(lit)
+ lit = FALSE
+ burnt = TRUE
+ damtype = "brute"
+ force = initial(force)
+ icon_state = "match_burnt"
+ item_state = "cigoff"
+ name = "burnt match"
+ desc = "A match. This one has seen better days."
+ attack_verb = list("flicked")
+ STOP_PROCESSING(SSobj, src)
+
+/obj/item/match/dropped(mob/user)
+ matchburnout()
+ . = ..()
+
+/obj/item/match/attack(mob/living/carbon/M, mob/living/carbon/user)
+ if(!isliving(M))
+ return
+ if(lit && M.IgniteMob())
+ message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire")
+ log_game("[key_name(user)] set [key_name(M)] on fire")
+ var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M)
+ if(lit && cig && user.a_intent == INTENT_HELP)
+ if(cig.lit)
+ to_chat(user, "The [cig.name] is already lit.")
+ if(M == user)
+ cig.attackby(src, user)
+ else
+ cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
+ else
+ ..()
+
+/obj/item/proc/help_light_cig(mob/living/M)
+ var/mask_item = M.get_item_by_slot(slot_wear_mask)
+ if(istype(mask_item, /obj/item/clothing/mask/cigarette))
+ return mask_item
+
+/obj/item/match/is_hot()
+ return lit * heat
+
+//////////////////
+//FINE SMOKABLES//
+//////////////////
+/obj/item/clothing/mask/cigarette
+ name = "cigarette"
+ desc = "A roll of tobacco and nicotine."
+ icon_state = "cigoff"
+ throw_speed = 0.5
+ item_state = "cigoff"
+ container_type = INJECTABLE_1
+ w_class = WEIGHT_CLASS_TINY
+ body_parts_covered = null
+ var/lit = FALSE
+ var/starts_lit = FALSE
+ var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
+ var/icon_off = "cigoff"
+ var/type_butt = /obj/item/cigbutt
+ var/lastHolder = null
+ var/smoketime = 300
+ var/chem_volume = 30
+ var/list/list_reagents = list("nicotine" = 15)
+ heat = 1000
+
+/obj/item/clothing/mask/cigarette/suicide_act(mob/user)
+ user.visible_message("[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.")
+ return (TOXLOSS|OXYLOSS)
+
+/obj/item/clothing/mask/cigarette/Initialize()
+ . = ..()
+ create_reagents(chem_volume)
+ reagents.set_reacting(FALSE) // so it doesn't react until you light it
+ if(list_reagents)
+ reagents.add_reagent_list(list_reagents)
+ if(starts_lit)
+ light()
+
+/obj/item/clothing/mask/cigarette/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ . = ..()
+
+/obj/item/clothing/mask/cigarette/attackby(obj/item/W, mob/user, params)
+ if(!lit && smoketime > 0)
+ var/lighting_text = W.ignition_effect(src, user)
+ if(lighting_text)
+ light(lighting_text)
+ else
+ return ..()
+
+/obj/item/clothing/mask/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity)
+ if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead)
+ return
+ if(istype(glass)) //you can dip cigarettes into beakers
+ if(glass.reagents.trans_to(src, chem_volume)) //if reagents were transfered, show the message
+ to_chat(user, "You dip \the [src] into \the [glass].")
+ else //if not, either the beaker was empty, or the cigarette was full
+ if(!glass.reagents.total_volume)
+ to_chat(user, "[glass] is empty.")
+ else
+ to_chat(user, "[src] is full.")
+
+
+/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
+ if(lit)
+ return
+
+ lit = TRUE
+ name = "lit [name]"
+ attack_verb = list("burnt", "singed")
+ hitsound = 'sound/items/welder.ogg'
+ damtype = "fire"
+ force = 4
+ if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
+ var/datum/effect_system/reagents_explosion/e = new()
+ e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
+ e.start()
+ qdel(src)
+ return
+ if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
+ var/datum/effect_system/reagents_explosion/e = new()
+ e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
+ e.start()
+ qdel(src)
+ return
+ // allowing reagents to react after being lit
+ reagents.set_reacting(TRUE)
+ reagents.handle_reactions()
+ icon_state = icon_on
+ item_state = icon_on
+ if(flavor_text)
+ var/turf/T = get_turf(src)
+ T.visible_message(flavor_text)
+ START_PROCESSING(SSobj, src)
+
+ //can't think of any other way to update the overlays :<
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_wear_mask()
+ M.update_inv_hands()
+
+
+/obj/item/clothing/mask/cigarette/proc/handle_reagents()
+ if(reagents.total_volume)
+ if(iscarbon(loc))
+ var/mob/living/carbon/C = loc
+ if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob
+ if(prob(15)) // so it's not an instarape in case of acid
+ var/fraction = min(REAGENTS_METABOLISM/reagents.total_volume, 1)
+ reagents.reaction(C, INGEST, fraction)
+ if(!reagents.trans_to(C, REAGENTS_METABOLISM))
+ reagents.remove_any(REAGENTS_METABOLISM)
+ return
+ reagents.remove_any(REAGENTS_METABOLISM)
+
+
+/obj/item/clothing/mask/cigarette/process()
+ var/turf/location = get_turf(src)
+ var/mob/living/M = loc
+ if(isliving(loc))
+ M.IgniteMob()
+ smoketime--
+ if(smoketime < 1)
+ new type_butt(location)
+ if(ismob(loc))
+ to_chat(M, "Your [name] goes out.")
+ qdel(src)
+ return
+ open_flame()
+ if(reagents && reagents.total_volume)
+ handle_reagents()
+
+/obj/item/clothing/mask/cigarette/attack_self(mob/user)
+ if(lit)
+ user.visible_message("[user] calmly drops and treads on \the [src], putting it out instantly.")
+ new type_butt(user.loc)
+ new /obj/effect/decal/cleanable/ash(user.loc)
+ qdel(src)
+ . = ..()
+
+/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)
+ to_chat(user, "The [cig.name] is already lit.")
+ if(M == user)
+ cig.attackby(src, user)
+ else
+ cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
+ else
+ return ..()
+
+/obj/item/clothing/mask/cigarette/fire_act(exposed_temperature, exposed_volume)
+ light()
+
+/obj/item/clothing/mask/cigarette/is_hot()
+ return lit * heat
+
+// Cigarette brands.
+
+/obj/item/clothing/mask/cigarette/space_cigarette
+ desc = "A Space Cigarette brand cigarette."
+
+/obj/item/clothing/mask/cigarette/dromedary
+ desc = "A DromedaryCo brand cigarette."
+
+/obj/item/clothing/mask/cigarette/uplift
+ desc = "An Uplift Smooth brand cigarette."
+ list_reagents = list("nicotine" = 7.5, "menthol" = 7.5)
+
+/obj/item/clothing/mask/cigarette/robust
+ desc = "A Robust brand cigarette."
+
+/obj/item/clothing/mask/cigarette/robustgold
+ desc = "A Robust Gold brand cigarette."
+ list_reagents = list("nicotine" = 15, "gold" = 1)
+
+/obj/item/clothing/mask/cigarette/carp
+ desc = "A Carp Classic brand cigarette."
+
+/obj/item/clothing/mask/cigarette/syndicate
+ desc = "An unknown brand cigarette."
+ list_reagents = list("nicotine" = 15, "omnizine" = 15)
+
+/obj/item/clothing/mask/cigarette/shadyjims
+ desc = "A Shady Jim's Super Slims cigarette."
+ list_reagents = list("nicotine" = 15, "lipolicide" = 4, "ammonia" = 2, "plantbgone" = 1, "toxin" = 1.5)
+
+// Rollies.
+
+/obj/item/clothing/mask/cigarette/rollie
+ name = "rollie"
+ desc = "A roll of dried plant matter wrapped in thin paper."
+ icon_state = "spliffoff"
+ icon_on = "spliffon"
+ icon_off = "spliffoff"
+ type_butt = /obj/item/cigbutt/roach
+ throw_speed = 0.5
+ item_state = "spliffoff"
+ smoketime = 180
+ chem_volume = 50
+
+/obj/item/clothing/mask/cigarette/rollie/New()
+ ..()
+ src.pixel_x = rand(-5, 5)
+ src.pixel_y = rand(-5, 5)
+
+/obj/item/clothing/mask/cigarette/rollie/trippy
+ list_reagents = list("nicotine" = 15, "mushroomhallucinogen" = 35)
+ starts_lit = TRUE
+
+/obj/item/cigbutt/roach
+ name = "roach"
+ desc = "A manky old roach, or for non-stoners, a used rollup."
+ icon_state = "roach"
+
+/obj/item/cigbutt/roach/New()
+ ..()
+ src.pixel_x = rand(-5, 5)
+ src.pixel_y = rand(-5, 5)
+
+
+////////////
+// CIGARS //
+////////////
+/obj/item/clothing/mask/cigarette/cigar
+ name = "premium cigar"
+ desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!"
+ icon_state = "cigaroff"
+ icon_on = "cigaron"
+ icon_off = "cigaroff"
+ type_butt = /obj/item/cigbutt/cigarbutt
+ throw_speed = 0.5
+ item_state = "cigaroff"
+ smoketime = 1500
+ chem_volume = 40
+
+/obj/item/clothing/mask/cigarette/cigar/cohiba
+ name = "\improper Cohiba Robusto cigar"
+ desc = "There's little more you could want from a cigar."
+ icon_state = "cigar2off"
+ icon_on = "cigar2on"
+ icon_off = "cigar2off"
+ smoketime = 2000
+ chem_volume = 80
+
+
+/obj/item/clothing/mask/cigarette/cigar/havana
+ name = "premium Havanian cigar"
+ desc = "A cigar fit for only the best of the best."
+ icon_state = "cigar2off"
+ icon_on = "cigar2on"
+ icon_off = "cigar2off"
+ smoketime = 7200
+ chem_volume = 50
+
+/obj/item/cigbutt
+ name = "cigarette butt"
+ desc = "A manky old cigarette butt."
+ icon = 'icons/obj/clothing/masks.dmi'
+ icon_state = "cigbutt"
+ w_class = WEIGHT_CLASS_TINY
+ throwforce = 0
+
+/obj/item/cigbutt/cigarbutt
+ name = "cigar butt"
+ desc = "A manky old cigar butt."
+ icon_state = "cigarbutt"
+
+/////////////////
+//SMOKING PIPES//
+/////////////////
+/obj/item/clothing/mask/cigarette/pipe
+ name = "smoking pipe"
+ desc = "A pipe, for smoking. Probably made of meershaum or something."
+ icon_state = "pipeoff"
+ item_state = "pipeoff"
+ icon_on = "pipeon" //Note - these are in masks.dmi
+ icon_off = "pipeoff"
+ smoketime = 0
+ chem_volume = 100
+ list_reagents = null
+ var/packeditem = 0
+
+/obj/item/clothing/mask/cigarette/pipe/Initialize()
+ . = ..()
+ name = "empty [initial(name)]"
+
+/obj/item/clothing/mask/cigarette/pipe/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ . = ..()
+
+/obj/item/clothing/mask/cigarette/pipe/process()
+ var/turf/location = get_turf(src)
+ smoketime--
+ if(smoketime < 1)
+ new /obj/effect/decal/cleanable/ash(location)
+ if(ismob(loc))
+ var/mob/living/M = loc
+ to_chat(M, "Your [name] goes out.")
+ lit = 0
+ icon_state = icon_off
+ item_state = icon_off
+ M.update_inv_wear_mask()
+ packeditem = 0
+ name = "empty [initial(name)]"
+ STOP_PROCESSING(SSobj, src)
+ return
+ open_flame()
+ if(reagents && reagents.total_volume) // check if it has any reagents at all
+ handle_reagents()
+
+
+/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/O, mob/user, params)
+ if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
+ var/obj/item/reagent_containers/food/snacks/grown/G = O
+ if(!packeditem)
+ if(G.dry == 1)
+ to_chat(user, "You stuff [O] into [src].")
+ smoketime = 400
+ packeditem = 1
+ name = "[O.name]-packed [initial(name)]"
+ if(O.reagents)
+ O.reagents.trans_to(src, O.reagents.total_volume)
+ qdel(O)
+ else
+ to_chat(user, "It has to be dried first!")
+ else
+ to_chat(user, "It is already packed!")
+ else
+ var/lighting_text = O.ignition_effect(src,user)
+ if(lighting_text)
+ if(smoketime > 0)
+ light(lighting_text)
+ else
+ to_chat(user, "There is nothing to smoke!")
+ else
+ return ..()
+
+/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user)
+ var/turf/location = get_turf(user)
+ if(lit)
+ user.visible_message("[user] puts out [src].", "You put out [src].")
+ lit = 0
+ icon_state = icon_off
+ item_state = icon_off
+ STOP_PROCESSING(SSobj, src)
+ return
+ if(!lit && smoketime > 0)
+ to_chat(user, "You empty [src] onto [location].")
+ new /obj/effect/decal/cleanable/ash(location)
+ packeditem = 0
+ smoketime = 0
+ reagents.clear_reagents()
+ name = "empty [initial(name)]"
+ return
+
+/obj/item/clothing/mask/cigarette/pipe/cobpipe
+ name = "corn cob pipe"
+ desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters. Can be loaded with objects."
+ icon_state = "cobpipeoff"
+ item_state = "cobpipeoff"
+ icon_on = "cobpipeon" //Note - these are in masks.dmi
+ icon_off = "cobpipeoff"
+ smoketime = 0
+
+
+/////////
+//ZIPPO//
+/////////
+/obj/item/lighter
+ name = "\improper Zippo lighter"
+ desc = "The zippo."
+ icon = 'icons/obj/cigarettes.dmi'
+ icon_state = "zippo"
+ item_state = "zippo"
+ w_class = WEIGHT_CLASS_TINY
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ var/lit = 0
+ var/fancy = TRUE
+ heat = 1500
+ resistance_flags = FIRE_PROOF
+ light_color = LIGHT_COLOR_FIRE
+
+/obj/item/lighter/update_icon()
+ if(lit)
+ icon_state = "[initial(icon_state)]_on"
+ else
+ icon_state = "[initial(icon_state)]"
+
+/obj/item/lighter/ignition_effect(atom/A, mob/user)
+ if(is_hot())
+ . = "With a single flick of their wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool."
+
+/obj/item/lighter/proc/set_lit(new_lit)
+ lit = new_lit
+ if(lit)
+ force = 5
+ damtype = "fire"
+ hitsound = 'sound/items/welder.ogg'
+ attack_verb = list("burnt", "singed")
+ set_light(1)
+ START_PROCESSING(SSobj, src)
+ else
+ hitsound = "swing_hit"
+ force = 0
+ attack_verb = null //human_defense.dm takes care of it
+ set_light(0)
+ STOP_PROCESSING(SSobj, src)
+ update_icon()
+
+/obj/item/lighter/attack_self(mob/living/user)
+ if(user.is_holding(src))
+ if(!lit)
+ set_lit(TRUE)
+ if(fancy)
+ user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "Without even breaking stride, you flip open and lights [src] in one smooth movement.")
+ else
+ var/prot = FALSE
+ var/mob/living/carbon/human/H = user
+
+ if(istype(H) && H.gloves)
+ var/obj/item/clothing/gloves/G = H.gloves
+ if(G.max_heat_protection_temperature)
+ prot = (G.max_heat_protection_temperature > 360)
+ else
+ prot = TRUE
+
+ if(prot || prob(75))
+ user.visible_message("After a few attempts, [user] manages to light [src].", "After a few attempts, you manage to light [src].")
+ else
+ var/hitzone = user.held_index_to_dir(user.active_hand_index) == "r" ? "r_hand" : "l_hand"
+ user.apply_damage(5, BURN, hitzone)
+ user.visible_message("After a few attempts, [user] manages to light [src] - however, [user.p_they()] burn their finger in the process.", "You burn yourself while lighting the lighter!")
+
+ else
+ set_lit(FALSE)
+ if(fancy)
+ user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "You quietly shut off [src] without even looking at what you're doing. Wow.")
+ else
+ user.visible_message("[user] quietly shuts off [src].", "You quietly shut off [src].")
+ else
+ . = ..()
+
+/obj/item/lighter/attack(mob/living/carbon/M, mob/living/carbon/user)
+ if(lit && M.IgniteMob())
+ message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire")
+ log_game("[key_name(user)] set [key_name(M)] on fire")
+ var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M)
+ if(lit && cig && user.a_intent == INTENT_HELP)
+ if(cig.lit)
+ to_chat(user, "The [cig.name] is already lit.")
+ if(M == user)
+ cig.attackby(src, user)
+ else
+ if(fancy)
+ cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame they light \the [cig] with.")
+ else
+ cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
+ else
+ ..()
+
+/obj/item/lighter/process()
+ open_flame()
+
+/obj/item/lighter/is_hot()
+ return lit * heat
+
+
+/obj/item/lighter/greyscale
+ name = "cheap lighter"
+ desc = "A cheap-as-free lighter."
+ icon_state = "lighter"
+ fancy = FALSE
+
+/obj/item/lighter/greyscale/Initialize()
+ . = ..()
+ add_atom_colour(color2hex(randomColor(1)), FIXED_COLOUR_PRIORITY)
+ update_icon()
+
+/obj/item/lighter/greyscale/update_icon()
+ cut_overlays()
+ var/mutable_appearance/base_overlay = mutable_appearance(icon,"[initial(icon_state)]_base")
+ base_overlay.appearance_flags = RESET_COLOR //the edging doesn't change color
+ if(lit)
+ base_overlay.icon_state = "[initial(icon_state)]_on"
+ add_overlay(base_overlay)
+
+/obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user)
+ if(is_hot())
+ . = "After some fiddling, [user] manages to light [A] with [src]."
+
+
+///////////
+//ROLLING//
+///////////
+/obj/item/rollingpaper
+ name = "rolling paper"
+ desc = "A thin piece of paper used to make fine smokeables."
+ icon = 'icons/obj/cigarettes.dmi'
+ icon_state = "cig_paper"
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/rollingpaper/afterattack(atom/target, mob/user, proximity)
+ if(!proximity)
+ return
+ if(istype(target, /obj/item/reagent_containers/food/snacks/grown))
+ var/obj/item/reagent_containers/food/snacks/grown/O = target
+ if(O.dry)
+ var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
+ R.chem_volume = target.reagents.total_volume
+ target.reagents.trans_to(R, R.chem_volume)
+ qdel(target)
+ qdel(src)
+ user.put_in_active_hand(R)
+ to_chat(user, "You roll the [target.name] into a rolling paper.")
+ R.desc = "Dried [target.name] rolled up in a thin piece of paper."
+ else
+ to_chat(user, "You need to dry this first!")
+ else
+ ..()
+
+///////////////
+//VAPE NATION//
+///////////////
+/obj/item/clothing/mask/vape
+ name = "E-Cigarette"
+ desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that.
+ icon = 'icons/obj/clothing/masks.dmi'
+ icon_state = null
+ item_state = null
+ w_class = WEIGHT_CLASS_TINY
+ var/chem_volume = 100
+ var/vapetime = 0 //this so it won't puff out clouds every tick
+ var/screw = 0 // kinky
+ var/super = 0 //for the fattest vapes dude.
+
+/obj/item/clothing/mask/vape/suicide_act(mob/user)
+ user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer
+ return (TOXLOSS|OXYLOSS)
+
+
+/obj/item/clothing/mask/vape/Initialize(mapload, param_color)
+ . = ..()
+ create_reagents(chem_volume)
+ reagents.set_reacting(FALSE) // so it doesn't react until you light it
+ reagents.add_reagent("nicotine", 50)
+ if(!icon_state)
+ if(!param_color)
+ param_color = pick("red","blue","black","white","green","purple","yellow","orange")
+ icon_state = "[param_color]_vape"
+ item_state = "[param_color]_vape"
+
+/obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params)
+ if(istype(O, /obj/item/reagent_containers) && (O.container_type & OPENCONTAINER_1))
+ if(reagents.total_volume < chem_volume)
+ if(O.reagents.total_volume > 0)
+ O.reagents.trans_to(src,25)
+ to_chat(user, "You add the contents of [O] to the [src]")
+ else
+ to_chat(user, "The [O] is empty!")
+ else
+ to_chat(user, "[src] can't hold anymore reagents!")
+
+ if(istype(O, /obj/item/screwdriver))
+ if(!screw)
+ screw = 1
+ to_chat(user, "You open the cap on the [src]")
+ if(super)
+ add_overlay("vapeopen_med")
+ else
+ add_overlay("vapeopen_low")
+ else
+ screw = 0
+ to_chat(user, "You close the cap on the [src]")
+ cut_overlays()
+
+ if(istype(O, /obj/item/device/multitool))
+ if(screw && !emagged)//also kinky
+ if(!super)
+ cut_overlays()
+ super = 1
+ to_chat(user, "You increase the voltage in the [src]")
+ add_overlay("vapeopen_med")
+ else
+ cut_overlays()
+ super = 0
+ to_chat(user, "You decrease the voltage in the [src]")
+ add_overlay("vapeopen_low")
+
+ if(screw && emagged)
+ to_chat(user, "The [name] can't be modified!")
+
+
+/obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY.
+ if(screw)
+ if(!emagged)
+ cut_overlays()
+ emagged = TRUE
+ super = 0
+ to_chat(user, "You maximize the voltage in the [src]")
+ add_overlay("vapeopen_high")
+ var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect
+ sp.set_up(5, 1, src)
+ sp.start()
+ else
+ to_chat(user, "The [name] is already emagged!")
+ else
+ to_chat(user, "You need to open the cap to do that")
+
+/obj/item/clothing/mask/vape/attack_self(mob/user)
+ if(reagents.total_volume > 0)
+ to_chat(user, "you empty [src] of all reagents.")
+ reagents.clear_reagents()
+ return
+
+/obj/item/clothing/mask/vape/equipped(mob/user, slot)
+ if(slot == slot_wear_mask)
+ if(!screw)
+ to_chat(user, "You start puffing on the vape.")
+ reagents.set_reacting(TRUE)
+ START_PROCESSING(SSobj, src)
+ else //it will not start if the vape is opened.
+ to_chat(user, "You need to close the cap first!")
+
+/obj/item/clothing/mask/vape/dropped(mob/user)
+ var/mob/living/carbon/C = user
+ if(C.get_item_by_slot(slot_wear_mask) == src)
+ reagents.set_reacting(FALSE)
+ STOP_PROCESSING(SSobj, src)
+
+/obj/item/clothing/mask/vape/proc/hand_reagents()//had to rename to avoid duplicate error
+ if(reagents.total_volume)
+ if(iscarbon(loc))
+ var/mob/living/carbon/C = loc
+ if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob
+ var/fraction = min(REAGENTS_METABOLISM/reagents.total_volume, 1) //this will react instantly, making them a little more dangerous than cigarettes
+ reagents.reaction(C, INGEST, fraction)
+ if(!reagents.trans_to(C, REAGENTS_METABOLISM))
+ reagents.remove_any(REAGENTS_METABOLISM)
+ if(reagents.get_reagent_amount("welding_fuel"))
+ //HOT STUFF
+ C.fire_stacks = 2
+ C.IgniteMob()
+
+ if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
+ var/datum/effect_system/reagents_explosion/e = new()
+ e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
+ e.start()
+ qdel(src)
+ return
+ reagents.remove_any(REAGENTS_METABOLISM)
+
+/obj/item/clothing/mask/vape/process()
+ var/mob/living/M = loc
+
+ if(isliving(loc))
+ M.IgniteMob()
+
+ vapetime++
+
+ if(!reagents.total_volume)
+ if(ismob(loc))
+ to_chat(M, "The [name] is empty!")
+ STOP_PROCESSING(SSobj, src)
+ //it's reusable so it won't unequip when empty
+ return
+ //open flame removed because vapes are a closed system, they wont light anything on fire
+
+ if(super && vapetime > 3)//Time to start puffing those fat vapes, yo.
+ var/datum/effect_system/smoke_spread/chem/s = new
+ s.set_up(reagents, 1, loc, silent=TRUE)
+ s.start()
+ vapetime = 0
+
+ if(emagged && vapetime > 3)
+ var/datum/effect_system/smoke_spread/chem/s = new
+ s.set_up(reagents, 4, loc, silent=TRUE)
+ s.start()
+ vapetime = 0
+ if(prob(5))//small chance for the vape to break and deal damage if it's emagged
+ playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, 0)
+ M.apply_damage(20, BURN, "head")
+ M.Knockdown(300, 1, 0)
+ var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread
+ sp.set_up(5, 1, src)
+ sp.start()
+ to_chat(M, "The [name] suddenly explodes in your mouth!")
+ qdel(src)
+ return
+
+ if(reagents && reagents.total_volume)
+ hand_reagents()
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index f9564018f8..74adfbe535 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -212,7 +212,6 @@
build_path = /obj/machinery/computer/cargo
origin_tech = "programming=3"
var/contraband = FALSE
- var/emagged = FALSE
/obj/item/circuitboard/computer/cargo/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/multitool))
@@ -258,22 +257,6 @@
build_path = /obj/machinery/computer/telecomms/server
origin_tech = "programming=3;magnets=3;bluespace=2"
-/obj/item/circuitboard/computer/shuttle
- name = "Shuttle (Computer Board)"
- build_path = /obj/machinery/computer/shuttle
- var/shuttleId
- var/possible_destinations = ""
-
-/obj/item/circuitboard/computer/shuttle/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/multitool))
- var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null)
- if(chosen_id >= 0)
- shuttleId = chosen_id
- else
- shuttleId = initial(shuttleId)
- else
- return ..()
-
/obj/item/circuitboard/computer/labor_shuttle
name = "Labor Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/labor
@@ -340,7 +323,7 @@
build_path = /obj/machinery/computer/apc_control
origin_tech = "programming=3;engineering=3;powerstorage=2"
-/obj/item/circuitboard/computer/shuttle/monastery_shuttle
+/obj/item/circuitboard/computer/monastery_shuttle
name = "Monastery Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/monastery_shuttle
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 645e8c05a3..cbbf1d0cb7 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -720,4 +720,12 @@
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stack/cable_coil = 2,
/obj/item/stock_parts/console_screen = 1,
- /obj/item/stack/sheet/glass = 1)
\ No newline at end of file
+ /obj/item/stack/sheet/glass = 1)
+
+/obj/item/circuitboard/machine/vending/donksofttoyvendor
+ name = "Donksoft Toy Vendor (Machine Board)"
+ build_path = /obj/machinery/vending/donksofttoyvendor
+ origin_tech = "programming=1;syndicate=2"
+ req_components = list(
+ /obj/item/stock_parts/console_screen = 1,
+ /obj/item/vending_refill/donksoft = 3)
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index da8edb2e5a..aae4aad91d 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -48,7 +48,7 @@
/obj/item/soap/suicide_act(mob/user)
user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!")
- user.visible_message("[user] lifts [src] to their mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!")
+ user.visible_message("[user] lifts [src] to their mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!")
new /obj/effect/particle_effect/foam(loc)
return (TOXLOSS)
@@ -107,39 +107,26 @@
throw_speed = 3
throw_range = 7
attack_verb = list("HONKED")
- var/next_usable = 0
- var/honksound = 'sound/items/bikehorn.ogg'
- var/cooldowntime = 20
+
+/obj/item/bikehorn/Initialize()
+ . = ..()
+ AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
/obj/item/bikehorn/suicide_act(mob/user)
user.visible_message("[user] solemnly points the horn at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!")
- playsound(src.loc, honksound, 50, 1)
+ playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
return (BRUTELOSS)
-/obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(!(next_usable > world.time))
- playsound(loc, honksound, 50, 1, -1) //plays instead of tap.ogg!
- return ..()
-
-/obj/item/bikehorn/attack_self(mob/user)
- if(!(next_usable > world.time))
- next_usable = world.time + cooldowntime
- playsound(src.loc, honksound, 50, 1)
- src.add_fingerprint(user)
-
-/obj/item/bikehorn/Crossed(mob/living/L)
- if(isliving(L))
- playsound(loc, honksound, 50, 1, -1)
- ..()
-
/obj/item/bikehorn/airhorn
name = "air horn"
desc = "Damn son, where'd you find this?"
icon_state = "air_horn"
- honksound = 'sound/items/airhorn2.ogg'
- cooldowntime = 50
origin_tech = "materials=4;engineering=4"
+/obj/item/bikehorn/airhorn/Initialize()
+ . = ..()
+ AddComponent(/datum/component/squeak, list('sound/items/airhorn2.ogg'=1), 50)
+
/obj/item/bikehorn/golden
name = "golden bike horn"
desc = "Golden? Clearly, it's made with bananium! Honk!"
@@ -155,14 +142,13 @@
..()
/obj/item/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user)
- if(!(next_usable > world.time))
- var/turf/T = get_turf(src)
- for(M in ohearers(7, T))
- if(ishuman(M) && M.can_hear())
- var/mob/living/carbon/human/H = M
- if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
- continue
- M.emote("flip")
+ var/turf/T = get_turf(src)
+ for(M in ohearers(7, T))
+ if(ishuman(M) && M.can_hear())
+ var/mob/living/carbon/human/H = M
+ if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
+ continue
+ M.emote("flip")
/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter
name = "Canned Laughter"
diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm
index 4f2c1a620a..8ec32f088e 100644
--- a/code/game/objects/items/cosmetics.dm
+++ b/code/game/objects/items/cosmetics.dm
@@ -1,186 +1,189 @@
-/obj/item/lipstick
- gender = PLURAL
- name = "red lipstick"
- desc = "A generic brand of lipstick."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "lipstick"
- w_class = WEIGHT_CLASS_TINY
- var/colour = "red"
- var/open = FALSE
-
-
-/obj/item/lipstick/purple
- name = "purple lipstick"
- colour = "purple"
-
-/obj/item/lipstick/jade
- //It's still called Jade, but theres no HTML color for jade, so we use lime.
- name = "jade lipstick"
- colour = "lime"
-
-/obj/item/lipstick/black
- name = "black lipstick"
- colour = "black"
-
-
-/obj/item/lipstick/random
- name = "lipstick"
-
-/obj/item/lipstick/random/New()
- ..()
- colour = pick("red","purple","lime","black","green","blue","white")
- name = "[colour] lipstick"
-
-
-
-/obj/item/lipstick/attack_self(mob/user)
- cut_overlays()
- to_chat(user, "You twist \the [src] [open ? "closed" : "open"].")
- open = !open
- if(open)
- var/mutable_appearance/colored_overlay = mutable_appearance(icon, "lipstick_uncap_color")
- colored_overlay.color = colour
- icon_state = "lipstick_uncap"
- add_overlay(colored_overlay)
- else
- icon_state = "lipstick"
-
-/obj/item/lipstick/attack(mob/M, mob/user)
- if(!open)
- return
-
- if(!ismob(M))
- return
-
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.is_mouth_covered())
- to_chat(user, "Remove [ H == user ? "your" : "their" ] mask!")
- return
- if(H.lip_style) //if they already have lipstick on
- to_chat(user, "You need to wipe off the old lipstick first!")
- return
- if(H == user)
- user.visible_message("[user] does their lips with \the [src].", \
- "You take a moment to apply \the [src]. Perfect!")
- H.lip_style = "lipstick"
- H.lip_color = colour
- H.update_body()
- else
- user.visible_message("[user] begins to do [H]'s lips with \the [src].", \
- "You begin to apply \the [src] on [H]'s lips...")
- if(do_after(user, 20, target = H))
- user.visible_message("[user] does [H]'s lips with \the [src].", \
- "You apply \the [src] on [H]'s lips.")
- H.lip_style = "lipstick"
- H.lip_color = colour
- H.update_body()
- else
- to_chat(user, "Where are the lips on that?")
-
-//you can wipe off lipstick with paper!
-/obj/item/paper/attack(mob/M, mob/user)
- if(user.zone_selected == "mouth")
- if(!ismob(M))
- return
-
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H == user)
- to_chat(user, "You wipe off the lipstick with [src].")
- H.lip_style = null
- H.update_body()
- else
- user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \
- "You begin to wipe off [H]'s lipstick...")
- if(do_after(user, 10, target = H))
- user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \
- "You wipe off [H]'s lipstick.")
- H.lip_style = null
- H.update_body()
- else
- ..()
-
-
-/obj/item/razor
- name = "electric razor"
- desc = "The latest and greatest power razor born from the science of shaving."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "razor"
- flags_1 = CONDUCT_1
- w_class = WEIGHT_CLASS_TINY
-
-
-/obj/item/razor/proc/shave(mob/living/carbon/human/H, location = "mouth")
- if(location == "mouth")
- H.facial_hair_style = "Shaved"
- else
- H.hair_style = "Skinhead"
-
- H.update_hair()
- playsound(loc, 'sound/items/welder2.ogg', 20, 1)
-
-
-/obj/item/razor/attack(mob/M, mob/user)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/location = user.zone_selected
- if(location == "mouth")
- if(!(FACEHAIR in H.dna.species.species_traits))
- to_chat(user, "There is no facial hair to shave!")
- return
- if(!get_location_accessible(H, location))
- to_chat(user, "The mask is in the way!")
- return
- if(H.facial_hair_style == "Shaved")
- to_chat(user, "Already clean-shaven!")
- return
-
- if(H == user) //shaving yourself
- user.visible_message("[user] starts to shave their facial hair with [src].", \
- "You take a moment to shave your facial hair with [src]...")
- if(do_after(user, 50, target = H))
- user.visible_message("[user] shaves his facial hair clean with [src].", \
- "You finish shaving with [src]. Fast and clean!")
- shave(H, location)
- else
- var/turf/H_loc = H.loc
- user.visible_message("[user] tries to shave [H]'s facial hair with [src].", \
- "You start shaving [H]'s facial hair...")
- if(do_after(user, 50, target = H))
- if(H_loc == H.loc)
- user.visible_message("[user] shaves off [H]'s facial hair with [src].", \
- "You shave [H]'s facial hair clean off.")
- shave(H, location)
-
- else if(location == "head")
- if(!(HAIR in H.dna.species.species_traits))
- to_chat(user, "There is no hair to shave!")
- return
- if(!get_location_accessible(H, location))
- to_chat(user, "The headgear is in the way!")
- return
- if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead")
- to_chat(user, "There is not enough hair left to shave!")
- return
-
- if(H == user) //shaving yourself
- user.visible_message("[user] starts to shave their head with [src].", \
- "You start to shave your head with [src]...")
- if(do_after(user, 5, target = H))
- user.visible_message("[user] shaves his head with [src].", \
- "You finish shaving with [src].")
- shave(H, location)
- else
- var/turf/H_loc = H.loc
- user.visible_message("[user] tries to shave [H]'s head with [src]!", \
- "You start shaving [H]'s head...")
- if(do_after(user, 50, target = H))
- if(H_loc == H.loc)
- user.visible_message("[user] shaves [H]'s head bald with [src]!", \
- "You shave [H]'s head bald.")
- shave(H, location)
- else
- ..()
- else
- ..()
\ No newline at end of file
+/obj/item/lipstick
+ gender = PLURAL
+ name = "red lipstick"
+ desc = "A generic brand of lipstick."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "lipstick"
+ w_class = WEIGHT_CLASS_TINY
+ var/colour = "red"
+ var/open = FALSE
+
+
+/obj/item/lipstick/purple
+ name = "purple lipstick"
+ colour = "purple"
+
+/obj/item/lipstick/jade
+ //It's still called Jade, but theres no HTML color for jade, so we use lime.
+ name = "jade lipstick"
+ colour = "lime"
+
+/obj/item/lipstick/black
+ name = "black lipstick"
+ colour = "black"
+
+
+/obj/item/lipstick/random
+ name = "lipstick"
+
+/obj/item/lipstick/random/New()
+ ..()
+ colour = pick("red","purple","lime","black","green","blue","white")
+ name = "[colour] lipstick"
+
+
+
+/obj/item/lipstick/attack_self(mob/user)
+ cut_overlays()
+ to_chat(user, "You twist \the [src] [open ? "closed" : "open"].")
+ open = !open
+ if(open)
+ var/mutable_appearance/colored_overlay = mutable_appearance(icon, "lipstick_uncap_color")
+ colored_overlay.color = colour
+ icon_state = "lipstick_uncap"
+ add_overlay(colored_overlay)
+ else
+ icon_state = "lipstick"
+
+/obj/item/lipstick/attack(mob/M, mob/user)
+ if(!open)
+ return
+
+ if(!ismob(M))
+ return
+
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.is_mouth_covered())
+ to_chat(user, "Remove [ H == user ? "your" : "their" ] mask!")
+ return
+ if(H.lip_style) //if they already have lipstick on
+ to_chat(user, "You need to wipe off the old lipstick first!")
+ return
+ if(H == user)
+ user.visible_message("[user] does their lips with \the [src].", \
+ "You take a moment to apply \the [src]. Perfect!")
+ H.lip_style = "lipstick"
+ H.lip_color = colour
+ H.update_body()
+ else
+ user.visible_message("[user] begins to do [H]'s lips with \the [src].", \
+ "You begin to apply \the [src] on [H]'s lips...")
+ if(do_after(user, 20, target = H))
+ user.visible_message("[user] does [H]'s lips with \the [src].", \
+ "You apply \the [src] on [H]'s lips.")
+ H.lip_style = "lipstick"
+ H.lip_color = colour
+ H.update_body()
+ else
+ to_chat(user, "Where are the lips on that?")
+
+//you can wipe off lipstick with paper!
+/obj/item/paper/attack(mob/M, mob/user)
+ if(user.zone_selected == "mouth")
+ if(!ismob(M))
+ return
+
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H == user)
+ to_chat(user, "You wipe off the lipstick with [src].")
+ H.lip_style = null
+ H.update_body()
+ else
+ user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \
+ "You begin to wipe off [H]'s lipstick...")
+ if(do_after(user, 10, target = H))
+ user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \
+ "You wipe off [H]'s lipstick.")
+ H.lip_style = null
+ H.update_body()
+ else
+ ..()
+
+
+/obj/item/razor
+ name = "electric razor"
+ desc = "The latest and greatest power razor born from the science of shaving."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "razor"
+ flags_1 = CONDUCT_1
+ w_class = WEIGHT_CLASS_TINY
+
+
+/obj/item/razor/proc/shave(mob/living/carbon/human/H, location = "mouth")
+ if(location == "mouth")
+ H.facial_hair_style = "Shaved"
+ else
+ H.hair_style = "Skinhead"
+
+ H.update_hair()
+ playsound(loc, 'sound/items/welder2.ogg', 20, 1)
+
+
+/obj/item/razor/attack(mob/M, mob/user)
+ 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!")
+ return
+ if(!get_location_accessible(H, location))
+ to_chat(user, "The mask is in the way!")
+ return
+ if(H.facial_hair_style == "Shaved")
+ to_chat(user, "Already clean-shaven!")
+ return
+
+ if(H == user) //shaving yourself
+ user.visible_message("[user] starts to shave their facial hair with [src].", \
+ "You take a moment to shave your facial hair with [src]...")
+ if(do_after(user, 50, target = H))
+ user.visible_message("[user] shaves his facial hair clean with [src].", \
+ "You finish shaving with [src]. Fast and clean!")
+ shave(H, location)
+ else
+ var/turf/H_loc = H.loc
+ user.visible_message("[user] tries to shave [H]'s facial hair with [src].", \
+ "You start shaving [H]'s facial hair...")
+ if(do_after(user, 50, target = H))
+ if(H_loc == H.loc)
+ user.visible_message("[user] shaves off [H]'s facial hair with [src].", \
+ "You shave [H]'s facial hair clean off.")
+ shave(H, location)
+
+ else if(location == "head")
+ if(!(HAIR in H.dna.species.species_traits))
+ to_chat(user, "There is no hair to shave!")
+ return
+ if(!get_location_accessible(H, location))
+ to_chat(user, "The headgear is in the way!")
+ return
+ if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead")
+ to_chat(user, "There is not enough hair left to shave!")
+ return
+
+ if(H == user) //shaving yourself
+ user.visible_message("[user] starts to shave their head with [src].", \
+ "You start to shave your head with [src]...")
+ if(do_after(user, 5, target = H))
+ user.visible_message("[user] shaves his head with [src].", \
+ "You finish shaving with [src].")
+ shave(H, location)
+ else
+ var/turf/H_loc = H.loc
+ user.visible_message("[user] tries to shave [H]'s head with [src]!", \
+ "You start shaving [H]'s head...")
+ if(do_after(user, 50, target = H))
+ if(H_loc == H.loc)
+ user.visible_message("[user] shaves [H]'s head bald with [src]!", \
+ "You shave [H]'s head bald.")
+ shave(H, location)
+ else
+ ..()
+ else
+ ..()
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 6ff939482c..23905200e9 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -54,7 +54,6 @@
var/self_contained = TRUE // If it deletes itself when it is empty
var/list/validSurfaces = list(/turf/open/floor)
- var/gang = FALSE //For marking territory
var/edible = TRUE // That doesn't mean eating it is a good idea
@@ -73,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)
@@ -278,15 +276,6 @@
else if(drawing in numerals)
temp = "number"
- // If a gang member is using a gang spraycan, it'll behave differently
- var/gang_mode = FALSE
- if(gang && user.mind && user.mind.gang_datum)
- gang_mode = TRUE
-
- // discontinue if the area isn't valid for tagging because gang "honour"
- if(gang_mode && (!can_claim_for_gang(user, target)))
- return
-
var/graf_rot
if(drawing in oriented)
switch(user.dir)
@@ -307,8 +296,6 @@
playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5)
var/takes_time = !instant
- if(gang_mode)
- takes_time = TRUE
var/wait_time = 50
if(PAINT_LARGE_HORIZONTAL)
@@ -325,28 +312,21 @@
var/list/turf/affected_turfs = list()
if(actually_paints)
- if(gang_mode)
- // Double check it wasn't tagged in the meanwhile
- if(!can_claim_for_gang(user, target))
- return
- tag_for_gang(user, target)
- affected_turfs += target
- else
- switch(paint_mode)
- if(PAINT_NORMAL)
- new /obj/effect/decal/cleanable/crayon(target, paint_color, drawing, temp, graf_rot)
+ switch(paint_mode)
+ if(PAINT_NORMAL)
+ new /obj/effect/decal/cleanable/crayon(target, paint_color, drawing, temp, graf_rot)
+ affected_turfs += target
+ if(PAINT_LARGE_HORIZONTAL)
+ var/turf/left = locate(target.x-1,target.y,target.z)
+ var/turf/right = locate(target.x+1,target.y,target.z)
+ if(is_type_in_list(left, validSurfaces) && is_type_in_list(right, validSurfaces))
+ new /obj/effect/decal/cleanable/crayon(left, paint_color, drawing, temp, graf_rot, PAINT_LARGE_HORIZONTAL_ICON)
+ affected_turfs += left
+ affected_turfs += right
affected_turfs += target
- if(PAINT_LARGE_HORIZONTAL)
- var/turf/left = locate(target.x-1,target.y,target.z)
- var/turf/right = locate(target.x+1,target.y,target.z)
- if(is_type_in_list(left, validSurfaces) && is_type_in_list(right, validSurfaces))
- new /obj/effect/decal/cleanable/crayon(left, paint_color, drawing, temp, graf_rot, PAINT_LARGE_HORIZONTAL_ICON)
- affected_turfs += left
- affected_turfs += right
- affected_turfs += target
- else
- to_chat(user, "There isn't enough space to paint!")
- return
+ else
+ to_chat(user, "There isn't enough space to paint!")
+ return
if(!instant)
to_chat(user, "You finish drawing \the [temp].")
@@ -385,47 +365,6 @@
else
..()
-/obj/item/toy/crayon/proc/can_claim_for_gang(mob/user, atom/target)
- // Check area validity.
- // Reject space, player-created areas, and non-station z-levels.
- var/area/A = get_area(target)
- if(!A || (A.z != ZLEVEL_STATION) || !A.valid_territory)
- to_chat(user, "[A] is unsuitable for tagging.")
- return FALSE
-
- var/spraying_over = FALSE
- for(var/obj/effect/decal/cleanable/crayon/gang/G in target)
- spraying_over = TRUE
-
- for(var/obj/machinery/power/apc in target)
- to_chat(user, "You can't tag an APC.")
- return FALSE
-
- var/occupying_gang = territory_claimed(A, user)
- if(occupying_gang && !spraying_over)
- to_chat(user, "[A] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!")
- return FALSE
-
- // If you pass the gaunlet of checks, you're good to proceed
- return TRUE
-
-/obj/item/toy/crayon/proc/territory_claimed(area/territory, mob/user)
- for(var/datum/gang/G in SSticker.mode.gangs)
- if(territory.type in (G.territory|G.territory_new))
- . = G.name
- break
-
-/obj/item/toy/crayon/proc/tag_for_gang(mob/user, atom/target)
- //Delete any old markings on this tile, including other gang tags
- for(var/obj/effect/decal/cleanable/crayon/old_marking in target)
- qdel(old_marking)
-
- var/gangID = user.mind.gang_datum
- var/area/territory = get_area(target)
-
- new /obj/effect/decal/cleanable/crayon/gang(target,gangID,"graffiti",0,user)
- to_chat(user, "You tagged [territory] for your gang!")
-
/obj/item/toy/crayon/red
icon_state = "crayonred"
paint_color = "#DA0000"
@@ -676,25 +615,9 @@
spray_overlay.color = paint_color
add_overlay(spray_overlay)
-/obj/item/toy/crayon/spraycan/gang
- //desc = "A modified container containing suspicious paint."
- charges = 20
- gang = TRUE
-
pre_noise = FALSE
post_noise = TRUE
-/obj/item/toy/crayon/spraycan/gang/New(loc, datum/gang/G)
- ..()
- if(G)
- paint_color = G.color_hex
- update_icon()
-
-/obj/item/toy/crayon/spraycan/gang/examine(mob/user)
- . = ..()
- if((user.mind && user.mind.gang_datum) || isobserver(user))
- to_chat(user, "This spraycan has been specially modified for tagging territory.")
-
/obj/item/toy/crayon/spraycan/borg
name = "cyborg spraycan"
desc = "A metallic container containing shiny synthesised paint."
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 169c464bc0..aa54f9ca36 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -135,10 +135,10 @@
/obj/item/defibrillator/emag_act(mob/user)
if(safety)
safety = 0
- to_chat(user, "You silently disable [src]'s safety protocols with the cryptographic sequencer.")
+ to_chat(user, "You silently disable [src]'s safety protocols with the cryptographic sequencer.")
else
safety = 1
- to_chat(user, "You silently enable [src]'s safety protocols with the cryptographic sequencer.")
+ to_chat(user, "You silently enable [src]'s safety protocols with the cryptographic sequencer.")
/obj/item/defibrillator/emp_act(severity)
if(cell)
@@ -497,7 +497,7 @@
update_icon()
return
if(H.stat == DEAD)
- H.visible_message("[H]'s body convulses a bit.")
+ H.visible_message("[H]'s body convulses a bit.")
playsound(get_turf(src), "bodyfall", 50, 1)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
total_brute = H.getBruteLoss()
diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm
index 9432a434f0..649efc0802 100644
--- a/code/game/objects/items/dehy_carp.dm
+++ b/code/game/objects/items/dehy_carp.dm
@@ -4,13 +4,13 @@
*/
//Child of carpplushie because this should do everything the toy does and more
-/obj/item/toy/carpplushie/dehy_carp
+/obj/item/toy/plush/carpplushie/dehy_carp
var/mob/owner = null //Carp doesn't attack owner, set when using in hand
var/owned = 0 //Boolean, no owner to begin with
var/mobtype = /mob/living/simple_animal/hostile/carp //So admins can change what mob spawns via var fuckery
//Attack self
-/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user)
+/obj/item/toy/plush/carpplushie/dehy_carp/attack_self(mob/user)
src.add_fingerprint(user) //Anyone can add their fingerprints to it with this
if(!owned)
to_chat(user, "You pet [src]. You swear it looks up at you.")
@@ -18,7 +18,7 @@
owned = 1
else return ..()
-/obj/item/toy/carpplushie/dehy_carp/proc/Swell()
+/obj/item/toy/plush/carpplushie/dehy_carp/proc/Swell()
desc = "It's growing!"
visible_message("[src] swells up!")
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 5ceb26ee61..ccfe70e662 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -26,11 +26,19 @@ 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:\"VT323\", monospace;letter-spacing:1px;" //The currently selected font.
+ var/background_color = "#808000" //The currently selected background color.
+
+ #define FONT_VT 0
+ #define FONT_SHARE 1
+ #define FONT_ORBITRON 2
+ #define FONT_MONO 3
//Secondary variables
var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner.
var/fon = 0 //Is the flashlight function on?
- var/f_lum = 3 //Luminosity for the flashlight function
+ var/f_lum = 2.3 //Luminosity for the flashlight function
var/silent = 0 //To beep or not to beep, that is the question
var/toff = 0 //If 1, messenger disabled
var/tnote = null //Current Texts
@@ -58,6 +66,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)
@@ -121,7 +136,8 @@ GLOBAL_LIST_EMPTY(PDAs)
hidden_uplink.interact(user)
return
- var/dat = "
Refresh"
@@ -130,6 +146,12 @@ GLOBAL_LIST_EMPTY(PDAs)
if (mode)
dat += " | 
Return"
+ if (mode == 0)
+ dat += ""
+
dat += "
"
if (!owner)
@@ -307,6 +329,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 (FONT_VT)
+ font_mode = "font-family:\"VT323\", monospace;letter-spacing:1px;"
+ if (FONT_SHARE)
+ font_mode = "font-family:\"Share Tech Mono\", monospace;letter-spacing:0px;"
+ if (FONT_ORBITRON)
+ font_mode = "font-family:\"Orbitron\", monospace;letter-spacing:0px; font-size:15px"
+ if (FONT_MONO)
+ font_mode = "font-family:monospace;"
+ 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
@@ -352,9 +392,9 @@ GLOBAL_LIST_EMPTY(PDAs)
if(fon)
fon = 0
set_light(0)
- else
+ else if(f_lum)
fon = 1
- set_light(2.3)
+ set_light(f_lum)
update_icon()
if("Medical Scan")
if(scanmode == 1)
@@ -400,7 +440,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")
@@ -538,7 +578,7 @@ GLOBAL_LIST_EMPTY(PDAs)
P.show_recieved_message(msg,src)
if(!multiple)
show_to_ghosts(user,msg)
- log_talk(user,"[user] (PDA: [name]) sent \"[message]\" to [P.name]",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.")
@@ -548,7 +588,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()]
"
@@ -856,9 +896,6 @@ GLOBAL_LIST_EMPTY(PDAs)
var/list/plist = list()
var/list/namecounts = list()
- if(user.stat == 2)
- return //won't work if dead
-
if(src.aiPDA.toff)
to_chat(user, "Turn on your receiver in order to send messages.")
return
@@ -883,13 +920,17 @@ GLOBAL_LIST_EMPTY(PDAs)
if(add_photo=="Yes")
var/datum/picture/Pic = aicamera.selectpicture(aicamera)
src.aiPDA.photo = Pic.fields["img"]
+
+ if(incapacitated())
+ return
+
src.aiPDA.create_message(src, selected)
/mob/living/silicon/ai/verb/cmd_toggle_pda_receiver()
set category = "AI Commands"
set name = "PDA - Toggle Sender/Receiver"
- if(usr.stat == 2)
+ if(usr.stat == DEAD)
return //won't work if dead
if(!isnull(aiPDA))
aiPDA.toff = !aiPDA.toff
@@ -900,7 +941,7 @@ GLOBAL_LIST_EMPTY(PDAs)
/mob/living/silicon/ai/verb/cmd_toggle_pda_silent()
set category = "AI Commands"
set name = "PDA - Toggle Ringer"
- if(usr.stat == 2)
+ if(usr.stat == DEAD)
return //won't work if dead
if(!isnull(aiPDA))
//0
@@ -910,8 +951,8 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(usr, "You do not have a PDA. You should make an issue report about this.")
/mob/living/silicon/ai/proc/cmd_show_message_log(mob/user)
- if(user.stat == 2)
- return //won't work if dead
+ if(incapacitated())
+ return
if(!isnull(aiPDA))
var/HTML = "Total power: [powmonitor.attached.powernet.viewavail] W
Total load: [num2text(powmonitor.attached.powernet.viewload,10)] W
"
+ menu += "Total power: [DisplayPower(powmonitor.attached.powernet.viewavail)]
"
@@ -437,14 +437,14 @@ Code:
switch(SSshuttle.supply.mode)
if(SHUTTLE_CALL)
menu += "Moving to "
- if(SSshuttle.supply.z != ZLEVEL_STATION)
+ if(!(SSshuttle.supply.z in GLOB.station_z_levels))
menu += "station"
else
menu += "centcom"
menu += " ([SSshuttle.supply.timeLeft(600)] Mins)"
else
menu += "At "
- if(SSshuttle.supply.z != ZLEVEL_STATION)
+ if(!(SSshuttle.supply.z in GLOB.station_z_levels))
menu += "centcom"
else
menu += "station"
diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm
index f6bfa50ce4..2c4fc8fa48 100644
--- a/code/game/objects/items/devices/PDA/radio.dm
+++ b/code/game/objects/items/devices/PDA/radio.dm
@@ -30,7 +30,7 @@
return ..()
/obj/item/radio/integrated/signal/Initialize()
- ..()
+ . = ..()
if (src.frequency < 1200 || src.frequency > 1600)
src.frequency = sanitize_frequency(src.frequency)
diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm
index 2b0a9d3b3c..8c4a42a5aa 100644
--- a/code/game/objects/items/devices/PDA/virus_cart.dm
+++ b/code/game/objects/items/devices/PDA/virus_cart.dm
@@ -90,7 +90,7 @@
return
if(!isnull(target) && !target.toff)
charges--
- var/lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]"
+ var/lock_code = "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]"
to_chat(U, "Virus Sent! The unlock code to the target is: [lock_code]")
if(!target.hidden_uplink)
var/obj/item/device/uplink/uplink = new(target)
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 0000000000..204a1f81d9
--- /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/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index eae0a4c9a2..eab0f030cc 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -16,7 +16,7 @@
var/flashlight_power = 1 //strength of the light when on
/obj/item/device/flashlight/Initialize()
- ..()
+ . = ..()
update_brightness()
/obj/item/device/flashlight/proc/update_brightness(mob/user = null)
@@ -152,7 +152,7 @@
else
to_chat(user, "[M] doesn't have any organs in [their] mouth.")
if(pill_count)
- to_chat(user, "[M] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [their] teeth.")
+ to_chat(user, "[M] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [their] teeth.")
else
return ..()
@@ -208,6 +208,8 @@
desc = "A desk lamp with an adjustable mount."
icon_state = "lamp"
item_state = "lamp"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
brightness_on = 5
w_class = WEIGHT_CLASS_BULKY
flags_1 = CONDUCT_1
@@ -407,7 +409,7 @@
/obj/item/device/flashlight/glowstick/Initialize()
fuel = rand(1600, 2000)
light_color = color
- ..()
+ . = ..()
/obj/item/device/flashlight/glowstick/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -426,7 +428,7 @@
/obj/item/device/flashlight/glowstick/update_icon()
item_state = "glowstick"
- overlays.Cut()
+ cut_overlays()
if(!fuel)
icon_state = "glowstick-empty"
cut_overlays()
diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm
index 069f8375cc..c9755727e7 100644
--- a/code/game/objects/items/devices/geiger_counter.dm
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -16,7 +16,6 @@
materials = list(MAT_METAL = 150, MAT_GLASS = 150)
var/scanning = 0
var/radiation_count = 0
- var/emagged = FALSE
/obj/item/device/geiger_counter/New()
..()
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index 91250f7d3c..6ba8425392 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,9 +15,12 @@ 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()
- ..()
+ . = ..()
GLOB.GPS_list += src
name = "global positioning system ([gpstag])"
add_overlay("working")
@@ -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/instruments.dm b/code/game/objects/items/devices/instruments.dm
index 73fa510bc7..8418e61146 100644
--- a/code/game/objects/items/devices/instruments.dm
+++ b/code/game/objects/items/devices/instruments.dm
@@ -1,65 +1,65 @@
-//copy pasta of the space piano, don't hurt me -Pete
-/obj/item/device/instrument
- name = "generic instrument"
- resistance_flags = FLAMMABLE
- max_integrity = 100
+//copy pasta of the space piano, don't hurt me -Pete
+/obj/item/device/instrument
+ name = "generic instrument"
+ resistance_flags = FLAMMABLE
+ max_integrity = 100
icon = 'icons/obj/musician.dmi'
lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
- var/datum/song/handheld/song
- var/instrumentId = "generic"
+ var/datum/song/handheld/song
+ var/instrumentId = "generic"
var/instrumentExt = "mid"
-
+
/obj/item/device/instrument/Initialize()
. = ..()
song = new(instrumentId, src, instrumentExt)
-
-/obj/item/device/instrument/Destroy()
- qdel(song)
- song = null
- return ..()
-
-/obj/item/device/instrument/suicide_act(mob/user)
- user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!")
- return (BRUTELOSS)
-
-/obj/item/device/instrument/Initialize(mapload)
- ..()
- if(mapload)
- song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
-
-/obj/item/device/instrument/attack_self(mob/user)
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return 1
- interact(user)
-
-/obj/item/device/instrument/interact(mob/user)
- if(!user)
- return
-
- if(!isliving(user) || user.stat || user.restrained() || user.lying)
- return
-
- user.set_machine(src)
- song.interact(user)
-
-/obj/item/device/instrument/violin
- name = "space violin"
- desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
- icon_state = "violin"
- item_state = "violin"
- force = 10
- hitsound = "swing_hit"
- instrumentId = "violin"
-
-/obj/item/device/instrument/violin/golden
- name = "golden violin"
- desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
- icon_state = "golden_violin"
- item_state = "golden_violin"
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-
+
+/obj/item/device/instrument/Destroy()
+ qdel(song)
+ song = null
+ return ..()
+
+/obj/item/device/instrument/suicide_act(mob/user)
+ user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!")
+ return (BRUTELOSS)
+
+/obj/item/device/instrument/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
+
+/obj/item/device/instrument/attack_self(mob/user)
+ if(!user.IsAdvancedToolUser())
+ to_chat(user, "You don't have the dexterity to do this!")
+ return 1
+ interact(user)
+
+/obj/item/device/instrument/interact(mob/user)
+ if(!user)
+ return
+
+ if(!isliving(user) || user.stat || user.restrained() || user.lying)
+ return
+
+ user.set_machine(src)
+ song.interact(user)
+
+/obj/item/device/instrument/violin
+ name = "space violin"
+ desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
+ icon_state = "violin"
+ item_state = "violin"
+ force = 10
+ hitsound = "swing_hit"
+ instrumentId = "violin"
+
+/obj/item/device/instrument/violin/golden
+ name = "golden violin"
+ desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
+ icon_state = "golden_violin"
+ item_state = "golden_violin"
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+
/obj/item/device/instrument/piano_synth
name = "synthesizer"
desc = "An advanced electronic synthesizer that can be used as various instruments."
@@ -74,26 +74,26 @@
song.instrumentDir = name
song.instrumentExt = insTypes[name]
-/obj/item/device/instrument/guitar
- name = "guitar"
- desc = "It's made of wood and has bronze strings."
- icon_state = "guitar"
- item_state = "guitar"
+/obj/item/device/instrument/guitar
+ name = "guitar"
+ desc = "It's made of wood and has bronze strings."
+ icon_state = "guitar"
+ item_state = "guitar"
instrumentExt = "ogg"
- force = 10
- attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
- hitsound = 'sound/weapons/stringsmash.ogg'
- instrumentId = "guitar"
-
-/obj/item/device/instrument/eguitar
- name = "electric guitar"
- desc = "Makes all your shredding needs possible."
- icon_state = "eguitar"
- item_state = "eguitar"
- force = 12
- attack_verb = list("played metal on", "shredded", "crashed", "smashed")
- hitsound = 'sound/weapons/stringsmash.ogg'
- instrumentId = "eguitar"
+ force = 10
+ attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
+ hitsound = 'sound/weapons/stringsmash.ogg'
+ instrumentId = "guitar"
+
+/obj/item/device/instrument/eguitar
+ name = "electric guitar"
+ desc = "Makes all your shredding needs possible."
+ icon_state = "eguitar"
+ item_state = "eguitar"
+ force = 12
+ attack_verb = list("played metal on", "shredded", "crashed", "smashed")
+ hitsound = 'sound/weapons/stringsmash.ogg'
+ instrumentId = "eguitar"
instrumentExt = "ogg"
/obj/item/device/instrument/glockenspiel
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 742a58a462..6bfbff9f3a 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -1,269 +1,268 @@
-
-// Light Replacer (LR)
-//
-// ABOUT THE DEVICE
-//
-// This is a device supposedly to be used by Janitors and Janitor Cyborgs which will
-// allow them to easily replace lights. This was mostly designed for Janitor Cyborgs since
-// they don't have hands or a way to replace lightbulbs.
-//
-// HOW IT WORKS
-//
-// You attack a light fixture with it, if the light fixture is broken it will replace the
-// light fixture with a working light; the broken light is then placed on the floor for the
-// user to then pickup with a trash bag. If it's empty then it will just place a light in the fixture.
-//
-// HOW TO REFILL THE DEVICE
-//
-// It will need to be manually refilled with lights.
-// If it's part of a robot module, it will charge when the Robot is inside a Recharge Station.
-//
-// EMAGGED FEATURES
-//
-// NOTICE: The Cyborg cannot use the emagged Light Replacer and the light's explosion was nerfed. It cannot create holes in the station anymore.
-//
-// I'm not sure everyone will react the emag's features so please say what your opinions are of it.
-//
-// When emagged it will rig every light it replaces, which will explode when the light is on.
-// This is VERY noticable, even the device's name changes when you emag it so if anyone
-// examines you when you're holding it in your hand, you will be discovered.
-// It will also be very obvious who is setting all these lights off, since only Janitor Borgs and Janitors have easy
-// access to them, and only one of them can emag their device.
-//
-// The explosion cannot insta-kill anyone with 30% or more health.
-
-#define LIGHT_OK 0
-#define LIGHT_EMPTY 1
-#define LIGHT_BROKEN 2
-#define LIGHT_BURNED 3
-
-
-/obj/item/device/lightreplacer
-
- name = "light replacer"
- desc = "A device to automatically replace lights. Refill with broken or working lightbulbs, or sheets of glass."
-
- icon = 'icons/obj/janitor.dmi'
- icon_state = "lightreplacer0"
- item_state = "electronic"
+
+// Light Replacer (LR)
+//
+// ABOUT THE DEVICE
+//
+// This is a device supposedly to be used by Janitors and Janitor Cyborgs which will
+// allow them to easily replace lights. This was mostly designed for Janitor Cyborgs since
+// they don't have hands or a way to replace lightbulbs.
+//
+// HOW IT WORKS
+//
+// You attack a light fixture with it, if the light fixture is broken it will replace the
+// light fixture with a working light; the broken light is then placed on the floor for the
+// user to then pickup with a trash bag. If it's empty then it will just place a light in the fixture.
+//
+// HOW TO REFILL THE DEVICE
+//
+// It will need to be manually refilled with lights.
+// If it's part of a robot module, it will charge when the Robot is inside a Recharge Station.
+//
+// EMAGGED FEATURES
+//
+// NOTICE: The Cyborg cannot use the emagged Light Replacer and the light's explosion was nerfed. It cannot create holes in the station anymore.
+//
+// I'm not sure everyone will react the emag's features so please say what your opinions are of it.
+//
+// When emagged it will rig every light it replaces, which will explode when the light is on.
+// This is VERY noticable, even the device's name changes when you emag it so if anyone
+// examines you when you're holding it in your hand, you will be discovered.
+// It will also be very obvious who is setting all these lights off, since only Janitor Borgs and Janitors have easy
+// access to them, and only one of them can emag their device.
+//
+// The explosion cannot insta-kill anyone with 30% or more health.
+
+#define LIGHT_OK 0
+#define LIGHT_EMPTY 1
+#define LIGHT_BROKEN 2
+#define LIGHT_BURNED 3
+
+
+/obj/item/device/lightreplacer
+
+ name = "light replacer"
+ desc = "A device to automatically replace lights. Refill with broken or working lightbulbs, or sheets of glass."
+
+ icon = 'icons/obj/janitor.dmi'
+ icon_state = "lightreplacer0"
+ item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-
+
flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- origin_tech = "magnets=3;engineering=4"
-
- var/max_uses = 20
- var/uses = 0
- var/emagged = FALSE
- var/failmsg = ""
- // How much to increase per each glass?
- var/increment = 5
- // How much to take from the glass?
- var/decrement = 1
- var/charge = 1
-
- // Eating used bulbs gives us bulb shards
- var/bulb_shards = 0
- // when we get this many shards, we get a free bulb.
- var/shards_required = 4
-
-/obj/item/device/lightreplacer/New()
- uses = max_uses / 2
- failmsg = "The [name]'s refill light blinks red."
- ..()
-
-/obj/item/device/lightreplacer/examine(mob/user)
- ..()
- to_chat(user, status_string())
-
-/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params)
-
- if(istype(W, /obj/item/stack/sheet/glass))
- var/obj/item/stack/sheet/glass/G = W
- if(uses >= max_uses)
- to_chat(user, "[src.name] is full.")
- return
- else if(G.use(decrement))
- AddUses(increment)
- to_chat(user, "You insert a piece of glass into the [src.name]. You have [uses] light\s remaining.")
- return
- else
- to_chat(user, "You need one sheet of glass to replace lights!")
-
- if(istype(W, /obj/item/shard))
- if(uses >= max_uses)
- to_chat(user, "[src.name] is full.")
- return
- if(!user.temporarilyRemoveItemFromInventory(W))
- return
- AddUses(round(increment*0.75))
- to_chat(user, "You insert a shard of glass into the [src.name]. You have [uses] light\s remaining.")
- qdel(W)
- return
-
- if(istype(W, /obj/item/light))
- var/obj/item/light/L = W
- if(L.status == 0) // LIGHT OKAY
- if(uses < max_uses)
- if(!user.temporarilyRemoveItemFromInventory(W))
- return
- AddUses(1)
- qdel(L)
- else
- if(!user.temporarilyRemoveItemFromInventory(W))
- return
- to_chat(user, "You insert the [L.name] into the [src.name]")
- AddShards(1, user)
- qdel(L)
- return
-
- if(istype(W, /obj/item/storage))
- var/obj/item/storage/S = W
- var/found_lightbulbs = FALSE
- var/replaced_something = TRUE
-
- for(var/obj/item/I in S.contents)
+ slot_flags = SLOT_BELT
+ origin_tech = "magnets=3;engineering=4"
+
+ var/max_uses = 20
+ var/uses = 0
+ var/failmsg = ""
+ // How much to increase per each glass?
+ var/increment = 5
+ // How much to take from the glass?
+ var/decrement = 1
+ var/charge = 1
+
+ // Eating used bulbs gives us bulb shards
+ var/bulb_shards = 0
+ // when we get this many shards, we get a free bulb.
+ var/shards_required = 4
+
+/obj/item/device/lightreplacer/New()
+ uses = max_uses / 2
+ failmsg = "The [name]'s refill light blinks red."
+ ..()
+
+/obj/item/device/lightreplacer/examine(mob/user)
+ ..()
+ to_chat(user, status_string())
+
+/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params)
+
+ if(istype(W, /obj/item/stack/sheet/glass))
+ var/obj/item/stack/sheet/glass/G = W
+ if(uses >= max_uses)
+ to_chat(user, "[src.name] is full.")
+ return
+ else if(G.use(decrement))
+ AddUses(increment)
+ to_chat(user, "You insert a piece of glass into the [src.name]. You have [uses] light\s remaining.")
+ return
+ else
+ to_chat(user, "You need one sheet of glass to replace lights!")
+
+ if(istype(W, /obj/item/shard))
+ if(uses >= max_uses)
+ to_chat(user, "[src.name] is full.")
+ return
+ if(!user.temporarilyRemoveItemFromInventory(W))
+ return
+ AddUses(round(increment*0.75))
+ to_chat(user, "You insert a shard of glass into the [src.name]. You have [uses] light\s remaining.")
+ qdel(W)
+ return
+
+ if(istype(W, /obj/item/light))
+ var/obj/item/light/L = W
+ if(L.status == 0) // LIGHT OKAY
+ if(uses < max_uses)
+ if(!user.temporarilyRemoveItemFromInventory(W))
+ return
+ AddUses(1)
+ qdel(L)
+ else
+ if(!user.temporarilyRemoveItemFromInventory(W))
+ return
+ to_chat(user, "You insert the [L.name] into the [src.name]")
+ AddShards(1, user)
+ qdel(L)
+ return
+
+ if(istype(W, /obj/item/storage))
+ var/obj/item/storage/S = W
+ var/found_lightbulbs = FALSE
+ var/replaced_something = TRUE
+
+ for(var/obj/item/I in S.contents)
if(istype(I, /obj/item/light))
- var/obj/item/light/L = I
- found_lightbulbs = TRUE
- if(src.uses >= max_uses)
- break
- if(L.status == LIGHT_OK)
- replaced_something = TRUE
- AddUses(1)
- qdel(L)
-
- else if(L.status == LIGHT_BROKEN || L.status == LIGHT_BURNED)
- replaced_something = TRUE
- AddShards(1, user)
- qdel(L)
-
- if(!found_lightbulbs)
- to_chat(user, "\The [S] contains no bulbs.")
- return
-
- if(!replaced_something && src.uses == max_uses)
- to_chat(user, "\The [src] is full!")
- return
-
- to_chat(user, "You fill \the [src] with lights from \the [S]. " + status_string() + "")
-
-/obj/item/device/lightreplacer/emag_act()
+ var/obj/item/light/L = I
+ found_lightbulbs = TRUE
+ if(src.uses >= max_uses)
+ break
+ if(L.status == LIGHT_OK)
+ replaced_something = TRUE
+ AddUses(1)
+ qdel(L)
+
+ else if(L.status == LIGHT_BROKEN || L.status == LIGHT_BURNED)
+ replaced_something = TRUE
+ AddShards(1, user)
+ qdel(L)
+
+ if(!found_lightbulbs)
+ to_chat(user, "\The [S] contains no bulbs.")
+ return
+
+ if(!replaced_something && src.uses == max_uses)
+ to_chat(user, "\The [src] is full!")
+ return
+
+ to_chat(user, "You fill \the [src] with lights from \the [S]. " + status_string() + "")
+
+/obj/item/device/lightreplacer/emag_act()
if(emagged)
return
Emag()
-
-/obj/item/device/lightreplacer/attack_self(mob/user)
- to_chat(user, status_string())
-
-/obj/item/device/lightreplacer/update_icon()
- icon_state = "lightreplacer[emagged]"
-
-/obj/item/device/lightreplacer/proc/status_string()
- return "It has [uses] light\s remaining (plus [bulb_shards] fragment\s)."
-
-/obj/item/device/lightreplacer/proc/Use(mob/user)
- playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- AddUses(-1)
- return 1
-
-// Negative numbers will subtract
-/obj/item/device/lightreplacer/proc/AddUses(amount = 1)
- uses = Clamp(uses + amount, 0, max_uses)
-
-/obj/item/device/lightreplacer/proc/AddShards(amount = 1, user)
- bulb_shards += amount
- var/new_bulbs = round(bulb_shards / shards_required)
- if(new_bulbs > 0)
- AddUses(new_bulbs)
- bulb_shards = bulb_shards % shards_required
- if(new_bulbs != 0)
- to_chat(user, "\The [src] has fabricated a new bulb from the broken glass it has stored. It now has [uses] uses.")
- playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
- return new_bulbs
-
-/obj/item/device/lightreplacer/proc/Charge(var/mob/user)
- charge += 1
- if(charge > 3)
- AddUses(1)
- charge = 1
-
-/obj/item/device/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U)
-
- if(target.status != LIGHT_OK)
- if(CanUse(U))
- if(!Use(U)) return
- to_chat(U, "You replace the [target.fitting] with \the [src].")
-
- if(target.status != LIGHT_EMPTY)
- AddShards(1, U)
- target.status = LIGHT_EMPTY
- target.update()
-
- var/obj/item/light/L2 = new target.light_type()
-
- target.status = L2.status
- target.switchcount = L2.switchcount
- target.rigged = emagged
- target.brightness = L2.brightness
- target.on = target.has_power()
- target.update()
- qdel(L2)
-
- if(target.on && target.rigged)
- target.explode()
- return
-
- else
- to_chat(U, failmsg)
- return
- else
- to_chat(U, "There is a working [target.fitting] already inserted!")
- return
-
-/obj/item/device/lightreplacer/proc/Emag()
- emagged = !emagged
- playsound(src.loc, "sparks", 100, 1)
- if(emagged)
- name = "shortcircuited [initial(name)]"
- else
- name = initial(name)
- update_icon()
-
-/obj/item/device/lightreplacer/proc/CanUse(mob/living/user)
- src.add_fingerprint(user)
- if(uses > 0)
- return 1
- else
- return 0
-
-/obj/item/device/lightreplacer/afterattack(atom/T, mob/U, proximity)
- if(!proximity)
- return
- if(!isturf(T))
- return
-
- var/used = FALSE
- for(var/atom/A in T)
- if(!CanUse(U))
- break
- used = TRUE
- if(istype(A, /obj/machinery/light))
- ReplaceLight(A, U)
-
- if(!used)
- to_chat(U, failmsg)
-
-/obj/item/device/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
- J.put_in_cart(src, user)
- J.myreplacer = src
- J.update_icon()
-
-/obj/item/device/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
- return
-
-#undef LIGHT_OK
-#undef LIGHT_EMPTY
-#undef LIGHT_BROKEN
-#undef LIGHT_BURNED
+
+/obj/item/device/lightreplacer/attack_self(mob/user)
+ to_chat(user, status_string())
+
+/obj/item/device/lightreplacer/update_icon()
+ icon_state = "lightreplacer[emagged]"
+
+/obj/item/device/lightreplacer/proc/status_string()
+ return "It has [uses] light\s remaining (plus [bulb_shards] fragment\s)."
+
+/obj/item/device/lightreplacer/proc/Use(mob/user)
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ AddUses(-1)
+ return 1
+
+// Negative numbers will subtract
+/obj/item/device/lightreplacer/proc/AddUses(amount = 1)
+ uses = Clamp(uses + amount, 0, max_uses)
+
+/obj/item/device/lightreplacer/proc/AddShards(amount = 1, user)
+ bulb_shards += amount
+ var/new_bulbs = round(bulb_shards / shards_required)
+ if(new_bulbs > 0)
+ AddUses(new_bulbs)
+ bulb_shards = bulb_shards % shards_required
+ if(new_bulbs != 0)
+ to_chat(user, "\The [src] has fabricated a new bulb from the broken glass it has stored. It now has [uses] uses.")
+ playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
+ return new_bulbs
+
+/obj/item/device/lightreplacer/proc/Charge(var/mob/user)
+ charge += 1
+ if(charge > 3)
+ AddUses(1)
+ charge = 1
+
+/obj/item/device/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U)
+
+ if(target.status != LIGHT_OK)
+ if(CanUse(U))
+ if(!Use(U)) return
+ to_chat(U, "You replace the [target.fitting] with \the [src].")
+
+ if(target.status != LIGHT_EMPTY)
+ AddShards(1, U)
+ target.status = LIGHT_EMPTY
+ target.update()
+
+ var/obj/item/light/L2 = new target.light_type()
+
+ target.status = L2.status
+ target.switchcount = L2.switchcount
+ target.rigged = emagged
+ target.brightness = L2.brightness
+ target.on = target.has_power()
+ target.update()
+ qdel(L2)
+
+ if(target.on && target.rigged)
+ target.explode()
+ return
+
+ else
+ to_chat(U, failmsg)
+ return
+ else
+ to_chat(U, "There is a working [target.fitting] already inserted!")
+ return
+
+/obj/item/device/lightreplacer/proc/Emag()
+ emagged = !emagged
+ playsound(src.loc, "sparks", 100, 1)
+ if(emagged)
+ name = "shortcircuited [initial(name)]"
+ else
+ name = initial(name)
+ update_icon()
+
+/obj/item/device/lightreplacer/proc/CanUse(mob/living/user)
+ src.add_fingerprint(user)
+ if(uses > 0)
+ return 1
+ else
+ return 0
+
+/obj/item/device/lightreplacer/afterattack(atom/T, mob/U, proximity)
+ if(!proximity)
+ return
+ if(!isturf(T))
+ return
+
+ var/used = FALSE
+ for(var/atom/A in T)
+ if(!CanUse(U))
+ break
+ used = TRUE
+ if(istype(A, /obj/machinery/light))
+ ReplaceLight(A, U)
+
+ if(!used)
+ to_chat(U, failmsg)
+
+/obj/item/device/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+ J.put_in_cart(src, user)
+ J.myreplacer = src
+ J.update_icon()
+
+/obj/item/device/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+ return
+
+#undef LIGHT_OK
+#undef LIGHT_EMPTY
+#undef LIGHT_BROKEN
+#undef LIGHT_BURNED
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 607238e2e9..30cec4c5a1 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -8,7 +8,6 @@
w_class = WEIGHT_CLASS_SMALL
siemens_coefficient = 1
var/spamcheck = 0
- var/emagged = FALSE
var/list/voicespan = list(SPAN_COMMAND)
/obj/item/device/megaphone/get_held_item_speechspans(mob/living/carbon/user)
diff --git a/code/game/objects/items/devices/pinpointer.dm b/code/game/objects/items/devices/pinpointer.dm
new file mode 100644
index 0000000000..1d11f312a4
--- /dev/null
+++ b/code/game/objects/items/devices/pinpointer.dm
@@ -0,0 +1,152 @@
+//Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk.
+/obj/item/weapon/pinpointer
+ name = "pinpointer"
+ desc = "A handheld tracking device that locks onto certain signals."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "pinpointer"
+ flags = CONDUCT
+ slot_flags = SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ item_state = "electronic"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ throw_speed = 3
+ throw_range = 7
+ materials = list(MAT_METAL = 500, MAT_GLASS = 250)
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ var/active = FALSE
+ var/atom/movable/target = null //The thing we're searching for
+ var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination
+ var/alert = FALSE // TRUE to display things more seriously
+
+/obj/item/weapon/pinpointer/New()
+ ..()
+ GLOB.pinpointer_list += src
+
+/obj/item/weapon/pinpointer/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ GLOB.pinpointer_list -= src
+ return ..()
+
+/obj/item/weapon/pinpointer/attack_self(mob/living/user)
+ active = !active
+ user.visible_message("[user] [active ? "" : "de"]activates their pinpointer.", "You [active ? "" : "de"]activate your pinpointer.")
+ playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
+ if(active)
+ START_PROCESSING(SSfastprocess, src)
+ else
+ target = null
+ STOP_PROCESSING(SSfastprocess, src)
+ update_pointer_overlay()
+
+/obj/item/weapon/pinpointer/process()
+ if(!active)
+ STOP_PROCESSING(SSfastprocess, src)
+ return
+ scan_for_target()
+ update_pointer_overlay()
+
+/obj/item/weapon/pinpointer/proc/scan_for_target()
+ return
+
+/obj/item/weapon/pinpointer/proc/update_pointer_overlay()
+ cut_overlays()
+ if(!active)
+ return
+ if(!target)
+ add_overlay("pinon[alert ? "alert" : ""]null")
+ var/turf/here = get_turf(src)
+ var/turf/there = get_turf(target)
+ if(here.z != there.z)
+ add_overlay("pinon[alert ? "alert" : ""]null")
+ return
+ if(get_dist_euclidian(here,there) <= minimum_range)
+ add_overlay("pinon[alert ? "alert" : ""]direct")
+ else
+ setDir(get_dir(here, there))
+ switch(get_dist(here, there))
+ if(1 to 8)
+ add_overlay("pinon[alert ? "alert" : "close"]")
+ if(9 to 16)
+ add_overlay("pinon[alert ? "alert" : "medium"]")
+ if(16 to INFINITY)
+ add_overlay("pinon[alert ? "alert" : "far"]")
+
+/obj/item/weapon/pinpointer/crew // A replacement for the old crew monitoring consoles
+ name = "crew pinpointer"
+ desc = "A handheld tracking device that points to crew suit sensors."
+ icon_state = "pinpointer_crew"
+
+/obj/item/weapon/pinpointer/crew/proc/trackable(mob/living/carbon/human/H)
+ var/turf/here = get_turf(src)
+ if((H.z == 0 || H.z == here.z) && istype(H.w_uniform, /obj/item/clothing/under))
+ var/obj/item/clothing/under/U = H.w_uniform
+
+ // Suit sensors must be on maximum.
+ if(!U.has_sensor || U.sensor_mode < SENSOR_COORDS)
+ return FALSE
+
+ var/turf/there = get_turf(H)
+ return (H.z != 0 || (there && there.z == H.z))
+
+ return FALSE
+
+/obj/item/weapon/pinpointer/crew/attack_self(mob/living/user)
+ if(active)
+ active = FALSE
+ user.visible_message("[user] deactivates their pinpointer.", "You deactivate your pinpointer.")
+ playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
+ target = null //Restarting the pinpointer forces a target reset
+ STOP_PROCESSING(SSfastprocess, src)
+ update_pointer_overlay()
+ return
+
+ var/list/name_counts = list()
+ var/list/names = list()
+
+ for(var/mob/living/carbon/human/H in GLOB.mob_list)
+ if(!trackable(H))
+ continue
+
+ var/name = "Unknown"
+ if(H.wear_id)
+ var/obj/item/weapon/card/id/I = H.wear_id.GetID()
+ name = I.registered_name
+
+ while(name in name_counts)
+ name_counts[name]++
+ name = text("[] ([])", name, name_counts[name])
+ names[name] = H
+ name_counts[name] = 1
+
+ if(!names.len)
+ user.visible_message("[user]'s pinpointer fails to detect a signal.", "Your pinpointer fails to detect a signal.")
+ return
+
+ var/A = input(user, "Person to track", "Pinpoint") in names
+ if(!src || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !A)
+ return
+
+ target = names[A]
+ active = TRUE
+ user.visible_message("[user] activates their pinpointer.", "You activate your pinpointer.")
+ playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
+ START_PROCESSING(SSfastprocess, src)
+ update_pointer_overlay()
+
+/obj/item/weapon/pinpointer/crew/scan_for_target()
+ if(target)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ if(!trackable(H))
+ target = null
+ if(!target)
+ active = FALSE
+
+/obj/item/weapon/pinpointer/process()
+ if(!active)
+ STOP_PROCESSING(SSfastprocess, src)
+ return
+ scan_for_target()
+ update_pointer_overlay()
+
diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm
index fdcf781a4d..19a81e8640 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 e3f767f9fa..d32ae86090 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/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm
index bab40edb29..183e960a08 100644
--- a/code/game/objects/items/devices/pressureplates.dm
+++ b/code/game/objects/items/devices/pressureplates.dm
@@ -1,7 +1,7 @@
/obj/item/device/pressure_plate
name = "pressure plate"
- desc = "Useful for autismforts"
+ desc = "An electronic device that triggers when stepped on."
item_state = "flash"
icon_state = "pressureplate"
level = 1
@@ -17,11 +17,11 @@
var/removable_signaller = TRUE
var/active = FALSE
var/image/tile_overlay = null
- var/crossed = FALSE
+ var/can_trigger = TRUE
var/trigger_delay = 10
/obj/item/device/pressure_plate/Initialize()
- ..()
+ . = ..()
tile_overlay = image(icon = 'icons/turf/floors.dmi', icon_state = "pp_overlay")
if(roundstart_signaller)
sigdev = new
@@ -31,45 +31,27 @@
hide(TRUE)
/obj/item/device/pressure_plate/Crossed(atom/movable/AM)
- if(!active)
+ . = ..()
+ if(!can_trigger || !active)
return
- if(isliving(AM) && trigger_mob)
+ if(trigger_mob && isliving(AM))
var/mob/living/L = AM
- step_living(L)
- crossed = TRUE
- else if(trigger_item)
- step_item(AM)
- crossed = TRUE
- if(!trigger_silent)
- if(isturf(loc))
- loc.visible_message("Click!")
- playsound(loc, trigger_sound, 50, 1)
- . = ..()
-
-/obj/item/device/pressure_plate/Uncrossed(atom/movable/AM)
- if(crossed)
- playsound(loc, trigger_sound, 50, 1)
- if(isliving(AM))
- var/mob/living/L = AM
- to_chat(L, "You feel something click back into place as you step off [loc]!")
- addtimer(CALLBACK(src, .proc/trigger), trigger_delay)
- . = ..()
+ to_chat(L, "You feel something click beneath you!")
+ else if(!trigger_item)
+ return
+ can_trigger = FALSE
+ addtimer(CALLBACK(src, .proc/trigger), trigger_delay)
/obj/item/device/pressure_plate/proc/trigger()
+ can_trigger = TRUE
if(istype(sigdev))
sigdev.signal()
-/obj/item/device/pressure_plate/proc/step_living(mob/living/L)
- to_chat(L, "You feel a click under your feet!")
-
-/obj/item/device/pressure_plate/proc/step_item(atom/movable/AM)
- return
-
/obj/item/device/pressure_plate/attackby(obj/item/I, mob/living/L)
if(istype(I, /obj/item/device/assembly/signaler) && !istype(sigdev) && removable_signaller && L.transferItemToLoc(I, src))
sigdev = I
to_chat(L, "You attach [I] to [src]!")
- . = ..()
+ return ..()
/obj/item/device/pressure_plate/attack_self(mob/living/L)
if(removable_signaller && istype(sigdev))
@@ -77,7 +59,7 @@
if(!L.put_in_hands(sigdev))
sigdev.forceMove(get_turf(src))
sigdev = null
- . = ..()
+ return ..()
/obj/item/device/pressure_plate/hide(yes)
if(yes)
@@ -85,11 +67,10 @@
anchored = TRUE
icon_state = null
active = TRUE
+ can_trigger = TRUE
if(tile_overlay)
- loc.overlays += tile_overlay
+ loc.add_overlay(tile_overlay)
else
- if(crossed)
- trigger() //no cheesing.
invisibility = initial(invisibility)
anchored = FALSE
icon_state = initial(icon_state)
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index bd54fda56f..513ffb8d2b 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -4,13 +4,13 @@
icon = 'icons/obj/radio.dmi'
icon_state = "electropack0"
item_state = "electropack"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- flags_1 = CONDUCT_1
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ flags_1 = CONDUCT_1
slot_flags = SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
materials = list(MAT_METAL=10000, MAT_GLASS=2500)
- var/on = TRUE
+ var/on = TRUE
var/code = 2
var/frequency = 1449
var/shock_cooldown = 0
@@ -20,11 +20,11 @@
return (FIRELOSS)
/obj/item/device/electropack/Initialize()
- ..()
+ . = ..()
SSradio.add_object(src, frequency, GLOB.RADIO_CHAT)
/obj/item/device/electropack/Destroy()
- SSradio.remove_object(src, frequency)
+ SSradio.remove_object(src, frequency)
return ..()
/obj/item/device/electropack/attack_hand(mob/user)
@@ -52,8 +52,8 @@
user.put_in_hands(A)
A.add_fingerprint(user)
- if(src.flags_1 & NODROP_1)
- A.flags_1 |= NODROP_1
+ if(src.flags_1 & NODROP_1)
+ A.flags_1 |= NODROP_1
else
return ..()
@@ -108,7 +108,7 @@
spawn(100)
shock_cooldown = 0
var/mob/living/L = loc
- step(L, pick(GLOB.cardinals))
+ step(L, pick(GLOB.cardinals))
to_chat(L, "You feel a sharp shock!")
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
@@ -144,3 +144,81 @@ Code:
user << browse(dat, "window=radio")
onclose(user, "radio")
return
+
+/obj/item/device/electropack/shockcollar
+ name = "shock collar"
+ desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.."
+ icon = 'icons/obj/clothing/neck.dmi'
+ icon_state = "shockcollar"
+ item_state = "shockcollar"
+ body_parts_covered = NECK
+ slot_flags = SLOT_NECK
+ w_class = WEIGHT_CLASS_SMALL
+ strip_delay = 60
+ equip_delay_other = 60
+ materials = list(MAT_METAL=5000, MAT_GLASS=2000)
+ var/tagname = null
+
+/obj/item/device/electropack/shockcollar/attack_hand(mob/user)
+ if(loc == user)
+ if(slot_flags == SLOT_NECK)
+ to_chat(user, "The collar is fastened tight! You'll need help taking this off!")
+ return
+ ..()
+
+/obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal)
+ if(!signal || signal.encryption != code)
+ return
+
+ if(isliving(loc) && on)
+ if(shock_cooldown != 0)
+ return
+ shock_cooldown = 1
+ spawn(100)
+ shock_cooldown = 0
+ var/mob/living/L = loc
+ step(L, pick(GLOB.cardinals))
+
+ to_chat(L, "You feel a sharp shock from the collar!")
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+ s.set_up(3, 1, L)
+ s.start()
+
+ L.Knockdown(100)
+
+ if(master)
+ master.receive_signal()
+ return
+
+/obj/item/device/electropack/shockcollar/attack_self(mob/user) //Turns out can't fully source this from the parent item, spritepath gets confused if power toggled. Will come back to this when I know how to code better and readd powertoggle..
+ var/option = "Change Name"
+ option = input(user, "What do you want to do?", "[src]", option) as null|anything in list("Change Name", "Change Frequency")
+ switch(option)
+ if("Change Name")
+ var/t = input(user, "Would you like to change the name on the tag?", "Name your new pet", tagname ? tagname : "Spot") as null|text
+ if(t)
+ tagname = copytext(sanitize(t), 1, MAX_NAME_LEN)
+ name = "[initial(name)] - [tagname]"
+ if("Change Frequency")
+ if(!ishuman(user))
+ return
+ user.set_machine(src)
+ var/dat = {"
Total load: [DisplayPower(powmonitor.attached.powernet.viewload)]
"
menu += ""
@@ -314,7 +314,7 @@ Code:
for(var/obj/machinery/power/apc/A in L)
menu += copytext(add_tspace(A.area.name, 30), 1, 30)
- menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"]
"
+ menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(DisplayPower(A.lastused_total), 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"]
"
menu += "
+ Frequency/Code for shock collar:
+ Frequency:
+ -
+ - [format_frequency(frequency)]
+ +
+ +
+
+ Code:
+ -
+ - [code]
+ +
+ +
+
"
if(cyberimp_detect)
to_chat(user, "Detected cybernetic modifications:")
@@ -251,6 +310,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/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index dba9b8ba7d..912a083171 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -1,294 +1,294 @@
-/obj/item/device/taperecorder
- name = "universal recorder"
- desc = "A device that can record to cassette tapes, and play them. It automatically translates the content in playback."
- icon_state = "taperecorder_empty"
- item_state = "analyzer"
+/obj/item/device/taperecorder
+ name = "universal recorder"
+ desc = "A device that can record to cassette tapes, and play them. It automatically translates the content in playback."
+ icon_state = "taperecorder_empty"
+ item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- w_class = WEIGHT_CLASS_SMALL
+ w_class = WEIGHT_CLASS_SMALL
flags_1 = HEAR_1
- slot_flags = SLOT_BELT
- materials = list(MAT_METAL=60, MAT_GLASS=30)
- force = 2
- throwforce = 0
- var/recording = 0
- var/playing = 0
- var/playsleepseconds = 0
- var/obj/item/device/tape/mytape
- var/starting_tape_type = /obj/item/device/tape/random
- var/open_panel = 0
- var/canprint = 1
-
-
-/obj/item/device/taperecorder/Initialize(mapload)
- ..()
- if(starting_tape_type)
- mytape = new starting_tape_type(src)
- update_icon()
-
-
-/obj/item/device/taperecorder/examine(mob/user)
- ..()
- to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].")
-
-
-/obj/item/device/taperecorder/attackby(obj/item/I, mob/user, params)
- if(!mytape && istype(I, /obj/item/device/tape))
- if(!user.transferItemToLoc(I,src))
- return
- mytape = I
- to_chat(user, "You insert [I] into [src].")
- update_icon()
-
-
-/obj/item/device/taperecorder/proc/eject(mob/user)
- if(mytape)
- to_chat(user, "You remove [mytape] from [src].")
- stop()
- user.put_in_hands(mytape)
- mytape = null
- update_icon()
-
-/obj/item/device/taperecorder/fire_act(exposed_temperature, exposed_volume)
- mytape.ruin() //Fires destroy the tape
- ..()
-
-/obj/item/device/taperecorder/attack_hand(mob/user)
- if(loc == user)
- if(mytape)
- if(!user.is_holding(src))
- ..()
- return
- eject(user)
- return
- ..()
-
-
-/obj/item/device/taperecorder/proc/can_use(mob/user)
- if(user && ismob(user))
- if(!user.incapacitated())
- return 1
- return 0
-
-
-/obj/item/device/taperecorder/verb/ejectverb()
- set name = "Eject Tape"
- set category = "Object"
-
- if(!can_use(usr))
- return
- if(!mytape)
- return
-
- eject(usr)
-
-
-/obj/item/device/taperecorder/update_icon()
- if(!mytape)
- icon_state = "taperecorder_empty"
- else if(recording)
- icon_state = "taperecorder_recording"
- else if(playing)
- icon_state = "taperecorder_playing"
- else
- icon_state = "taperecorder_idle"
-
-
-/obj/item/device/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
- if(mytape && recording)
- mytape.timestamp += mytape.used_capacity
- mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [message]"
-
-/obj/item/device/taperecorder/verb/record()
- set name = "Start Recording"
- set category = "Object"
-
- if(!can_use(usr))
- return
- if(!mytape || mytape.ruined)
- return
- if(recording)
- return
- if(playing)
- return
-
- if(mytape.used_capacity < mytape.max_capacity)
- to_chat(usr, "Recording started.")
- recording = 1
- update_icon()
- mytape.timestamp += mytape.used_capacity
- mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording started."
- var/used = mytape.used_capacity //to stop runtimes when you eject the tape
- var/max = mytape.max_capacity
- for(used, used < max)
- if(recording == 0)
- break
- mytape.used_capacity++
- used++
- sleep(10)
- recording = 0
- update_icon()
- else
- to_chat(usr, "The tape is full.")
-
-
-/obj/item/device/taperecorder/verb/stop()
- set name = "Stop"
- set category = "Object"
-
- if(!can_use(usr))
- return
-
- if(recording)
- recording = 0
- mytape.timestamp += mytape.used_capacity
- mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped."
- to_chat(usr, "Recording stopped.")
- return
- else if(playing)
- playing = 0
- var/turf/T = get_turf(src)
- T.visible_message("Tape Recorder: Playback stopped.")
- update_icon()
-
-
-/obj/item/device/taperecorder/verb/play()
- set name = "Play Tape"
- set category = "Object"
-
- if(!can_use(usr))
- return
- if(!mytape || mytape.ruined)
- return
- if(recording)
- return
- if(playing)
- return
-
- playing = 1
- update_icon()
- to_chat(usr, "Playing started.")
- var/used = mytape.used_capacity //to stop runtimes when you eject the tape
- var/max = mytape.max_capacity
- for(var/i = 1, used < max, sleep(10 * playsleepseconds))
- if(!mytape)
- break
- if(playing == 0)
- break
- if(mytape.storedinfo.len < i)
- break
- say(mytape.storedinfo[i])
- if(mytape.storedinfo.len < i + 1)
- playsleepseconds = 1
- sleep(10)
- say("End of recording.")
- else
- playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i]
- if(playsleepseconds > 14)
- sleep(10)
- say("Skipping [playsleepseconds] seconds of silence")
- playsleepseconds = 1
- i++
-
- playing = 0
- update_icon()
-
-
-/obj/item/device/taperecorder/attack_self(mob/user)
- if(!mytape || mytape.ruined)
- return
- if(recording)
- stop()
- else
- record()
-
-
-/obj/item/device/taperecorder/verb/print_transcript()
- set name = "Print Transcript"
- set category = "Object"
-
- if(!can_use(usr))
- return
- if(!mytape)
- return
- if(!canprint)
- to_chat(usr, "The recorder can't print that fast!")
- return
- if(recording || playing)
- return
-
- to_chat(usr, "Transcript printed.")
- var/obj/item/paper/P = new /obj/item/paper(get_turf(src))
- var/t1 = "Transcript:
"
- for(var/i = 1, mytape.storedinfo.len >= i, i++)
- t1 += "[mytape.storedinfo[i]]
"
- P.info = t1
- P.name = "paper- 'Transcript'"
- usr.put_in_hands(P)
- canprint = 0
- sleep(300)
- canprint = 1
-
-
-//empty tape recorders
-/obj/item/device/taperecorder/empty
- starting_tape_type = null
-
-
-/obj/item/device/tape
- name = "tape"
- desc = "A magnetic tape that can hold up to ten minutes of content."
- icon_state = "tape_white"
- item_state = "analyzer"
+ slot_flags = SLOT_BELT
+ materials = list(MAT_METAL=60, MAT_GLASS=30)
+ force = 2
+ throwforce = 0
+ var/recording = 0
+ var/playing = 0
+ var/playsleepseconds = 0
+ var/obj/item/device/tape/mytape
+ var/starting_tape_type = /obj/item/device/tape/random
+ var/open_panel = 0
+ var/canprint = 1
+
+
+/obj/item/device/taperecorder/Initialize(mapload)
+ . = ..()
+ if(starting_tape_type)
+ mytape = new starting_tape_type(src)
+ update_icon()
+
+
+/obj/item/device/taperecorder/examine(mob/user)
+ ..()
+ to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].")
+
+
+/obj/item/device/taperecorder/attackby(obj/item/I, mob/user, params)
+ if(!mytape && istype(I, /obj/item/device/tape))
+ if(!user.transferItemToLoc(I,src))
+ return
+ mytape = I
+ to_chat(user, "You insert [I] into [src].")
+ update_icon()
+
+
+/obj/item/device/taperecorder/proc/eject(mob/user)
+ if(mytape)
+ to_chat(user, "You remove [mytape] from [src].")
+ stop()
+ user.put_in_hands(mytape)
+ mytape = null
+ update_icon()
+
+/obj/item/device/taperecorder/fire_act(exposed_temperature, exposed_volume)
+ mytape.ruin() //Fires destroy the tape
+ ..()
+
+/obj/item/device/taperecorder/attack_hand(mob/user)
+ if(loc == user)
+ if(mytape)
+ if(!user.is_holding(src))
+ ..()
+ return
+ eject(user)
+ return
+ ..()
+
+
+/obj/item/device/taperecorder/proc/can_use(mob/user)
+ if(user && ismob(user))
+ if(!user.incapacitated())
+ return 1
+ return 0
+
+
+/obj/item/device/taperecorder/verb/ejectverb()
+ set name = "Eject Tape"
+ set category = "Object"
+
+ if(!can_use(usr))
+ return
+ if(!mytape)
+ return
+
+ eject(usr)
+
+
+/obj/item/device/taperecorder/update_icon()
+ if(!mytape)
+ icon_state = "taperecorder_empty"
+ else if(recording)
+ icon_state = "taperecorder_recording"
+ else if(playing)
+ icon_state = "taperecorder_playing"
+ else
+ icon_state = "taperecorder_idle"
+
+
+/obj/item/device/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
+ if(mytape && recording)
+ mytape.timestamp += mytape.used_capacity
+ mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [message]"
+
+/obj/item/device/taperecorder/verb/record()
+ set name = "Start Recording"
+ set category = "Object"
+
+ if(!can_use(usr))
+ return
+ if(!mytape || mytape.ruined)
+ return
+ if(recording)
+ return
+ if(playing)
+ return
+
+ if(mytape.used_capacity < mytape.max_capacity)
+ to_chat(usr, "Recording started.")
+ recording = 1
+ update_icon()
+ mytape.timestamp += mytape.used_capacity
+ mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording started."
+ var/used = mytape.used_capacity //to stop runtimes when you eject the tape
+ var/max = mytape.max_capacity
+ for(used, used < max)
+ if(recording == 0)
+ break
+ mytape.used_capacity++
+ used++
+ sleep(10)
+ recording = 0
+ update_icon()
+ else
+ to_chat(usr, "The tape is full.")
+
+
+/obj/item/device/taperecorder/verb/stop()
+ set name = "Stop"
+ set category = "Object"
+
+ if(!can_use(usr))
+ return
+
+ if(recording)
+ recording = 0
+ mytape.timestamp += mytape.used_capacity
+ mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped."
+ to_chat(usr, "Recording stopped.")
+ return
+ else if(playing)
+ playing = 0
+ var/turf/T = get_turf(src)
+ T.visible_message("Tape Recorder: Playback stopped.")
+ update_icon()
+
+
+/obj/item/device/taperecorder/verb/play()
+ set name = "Play Tape"
+ set category = "Object"
+
+ if(!can_use(usr))
+ return
+ if(!mytape || mytape.ruined)
+ return
+ if(recording)
+ return
+ if(playing)
+ return
+
+ playing = 1
+ update_icon()
+ to_chat(usr, "Playing started.")
+ var/used = mytape.used_capacity //to stop runtimes when you eject the tape
+ var/max = mytape.max_capacity
+ for(var/i = 1, used < max, sleep(10 * playsleepseconds))
+ if(!mytape)
+ break
+ if(playing == 0)
+ break
+ if(mytape.storedinfo.len < i)
+ break
+ say(mytape.storedinfo[i])
+ if(mytape.storedinfo.len < i + 1)
+ playsleepseconds = 1
+ sleep(10)
+ say("End of recording.")
+ else
+ playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i]
+ if(playsleepseconds > 14)
+ sleep(10)
+ say("Skipping [playsleepseconds] seconds of silence")
+ playsleepseconds = 1
+ i++
+
+ playing = 0
+ update_icon()
+
+
+/obj/item/device/taperecorder/attack_self(mob/user)
+ if(!mytape || mytape.ruined)
+ return
+ if(recording)
+ stop()
+ else
+ record()
+
+
+/obj/item/device/taperecorder/verb/print_transcript()
+ set name = "Print Transcript"
+ set category = "Object"
+
+ if(!can_use(usr))
+ return
+ if(!mytape)
+ return
+ if(!canprint)
+ to_chat(usr, "The recorder can't print that fast!")
+ return
+ if(recording || playing)
+ return
+
+ to_chat(usr, "Transcript printed.")
+ var/obj/item/paper/P = new /obj/item/paper(get_turf(src))
+ var/t1 = "Transcript:
"
+ for(var/i = 1, mytape.storedinfo.len >= i, i++)
+ t1 += "[mytape.storedinfo[i]]
"
+ P.info = t1
+ P.name = "paper- 'Transcript'"
+ usr.put_in_hands(P)
+ canprint = 0
+ sleep(300)
+ canprint = 1
+
+
+//empty tape recorders
+/obj/item/device/taperecorder/empty
+ starting_tape_type = null
+
+
+/obj/item/device/tape
+ name = "tape"
+ desc = "A magnetic tape that can hold up to ten minutes of content."
+ icon_state = "tape_white"
+ item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- w_class = WEIGHT_CLASS_TINY
- materials = list(MAT_METAL=20, MAT_GLASS=5)
- force = 1
- throwforce = 0
- var/max_capacity = 600
- var/used_capacity = 0
- var/list/storedinfo = list()
- var/list/timestamp = list()
- var/ruined = 0
-
-/obj/item/device/tape/fire_act(exposed_temperature, exposed_volume)
- ruin()
- ..()
-
-/obj/item/device/tape/attack_self(mob/user)
- if(!ruined)
- to_chat(user, "You pull out all the tape!")
- ruin()
-
-
-/obj/item/device/tape/proc/ruin()
- //Lets not add infinite amounts of overlays when our fireact is called
- //repeatedly
- if(!ruined)
- add_overlay("ribbonoverlay")
- ruined = 1
-
-
-/obj/item/device/tape/proc/fix()
- cut_overlay("ribbonoverlay")
- ruined = 0
-
-
-/obj/item/device/tape/attackby(obj/item/I, mob/user, params)
- if(ruined)
- var/delay = -1
- if (istype(I, /obj/item/screwdriver))
- delay = 120*I.toolspeed
- else if(istype(I, /obj/item/pen))
- delay = 120*1.5
- if (delay != -1)
- to_chat(user, "You start winding the tape back in...")
- if(do_after(user, delay, target = src))
- to_chat(user, "You wound the tape back in.")
- fix()
-
-//Random colour tapes
-/obj/item/device/tape/random/New()
- icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
- ..()
+ w_class = WEIGHT_CLASS_TINY
+ materials = list(MAT_METAL=20, MAT_GLASS=5)
+ force = 1
+ throwforce = 0
+ var/max_capacity = 600
+ var/used_capacity = 0
+ var/list/storedinfo = list()
+ var/list/timestamp = list()
+ var/ruined = 0
+
+/obj/item/device/tape/fire_act(exposed_temperature, exposed_volume)
+ ruin()
+ ..()
+
+/obj/item/device/tape/attack_self(mob/user)
+ if(!ruined)
+ to_chat(user, "You pull out all the tape!")
+ ruin()
+
+
+/obj/item/device/tape/proc/ruin()
+ //Lets not add infinite amounts of overlays when our fireact is called
+ //repeatedly
+ if(!ruined)
+ add_overlay("ribbonoverlay")
+ ruined = 1
+
+
+/obj/item/device/tape/proc/fix()
+ cut_overlay("ribbonoverlay")
+ ruined = 0
+
+
+/obj/item/device/tape/attackby(obj/item/I, mob/user, params)
+ if(ruined)
+ var/delay = -1
+ if (istype(I, /obj/item/screwdriver))
+ delay = 120*I.toolspeed
+ else if(istype(I, /obj/item/pen))
+ delay = 120*1.5
+ if (delay != -1)
+ to_chat(user, "You start winding the tape back in...")
+ if(do_after(user, delay, target = src))
+ to_chat(user, "You wound the tape back in.")
+ fix()
+
+//Random colour tapes
+/obj/item/device/tape/random/New()
+ icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
+ ..()
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index a74ea61e06..663eed0a8d 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)
@@ -147,7 +146,7 @@ effective or pretty fucking useless.
usr.set_machine(src)
if(href_list["rad"])
irradiate = !irradiate
-
+
else if(href_list["stealthy"])
stealth = !stealth
@@ -242,11 +241,10 @@ effective or pretty fucking useless.
var/range = 12
/obj/item/device/jammer/attack_self(mob/user)
- to_chat(user,"You [active ? "deactivate" : "activate"] the [src]")
+ to_chat(user,"You [active ? "deactivate" : "activate"] the [src].")
active = !active
if(active)
GLOB.active_jammers |= src
else
GLOB.active_jammers -= src
update_icon()
-
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 1b47bbf3f9..045da484ed 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -1,213 +1,213 @@
-/obj/item/device/transfer_valve
- icon = 'icons/obj/assemblies.dmi'
- name = "tank transfer valve"
- icon_state = "valve_1"
- item_state = "ttv"
+/obj/item/device/transfer_valve
+ icon = 'icons/obj/assemblies.dmi'
+ name = "tank transfer valve"
+ icon_state = "valve_1"
+ item_state = "ttv"
lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
- desc = "Regulates the transfer of air between two tanks"
- var/obj/item/tank/tank_one
- var/obj/item/tank/tank_two
+ desc = "Regulates the transfer of air between two tanks"
+ var/obj/item/tank/tank_one
+ var/obj/item/tank/tank_two
var/obj/item/device/assembly/attached_device
- var/mob/attacher = null
+ var/mob/attacher = null
var/valve_open = FALSE
- var/toggle = 1
- origin_tech = "materials=1;engineering=1"
-
-/obj/item/device/transfer_valve/IsAssemblyHolder()
- return 1
-
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
- if(istype(item, /obj/item/tank))
- if(tank_one && tank_two)
- to_chat(user, "There are already two tanks attached, remove one first!")
- return
-
- if(!tank_one)
- if(!user.transferItemToLoc(item, src))
- return
- tank_one = item
- to_chat(user, "You attach the tank to the transfer valve.")
- if(item.w_class > w_class)
- w_class = item.w_class
- else if(!tank_two)
- if(!user.transferItemToLoc(item, src))
- return
- tank_two = item
- to_chat(user, "You attach the tank to the transfer valve.")
- if(item.w_class > w_class)
- w_class = item.w_class
-
- update_icon()
-//TODO: Have this take an assemblyholder
- else if(isassembly(item))
- var/obj/item/device/assembly/A = item
- if(A.secured)
- to_chat(user, "The device is secured.")
- return
- if(attached_device)
- to_chat(user, "There is already a device attached to the valve, remove it first!")
- return
- if(!user.transferItemToLoc(item, src))
- return
- attached_device = A
- to_chat(user, "You attach the [item] to the valve controls and secure it.")
- A.holder = src
- A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
-
- GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
- message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
- log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
- attacher = user
- return
-
-/obj/item/device/transfer_valve/attack_self(mob/user)
- user.set_machine(src)
- var/dat = {" Valve properties:
-
Attachment one: [tank_one] [tank_one ? "Remove" : ""]
-
Attachment two: [tank_two] [tank_two ? "Remove" : ""]
-
Valve attachment: [attached_device ? "[attached_device]" : "None"] [attached_device ? "Remove" : ""]
-
Valve status: [ valve_open ? "Closed Open" : "Closed Open"]"}
-
- var/datum/browser/popup = new(user, "trans_valve", name)
- popup.set_content(dat)
- popup.open()
- return
-
-/obj/item/device/transfer_valve/Topic(href, href_list)
- ..()
- if ( usr.stat || usr.restrained() )
- return
- if (src.loc == usr)
- if(tank_one && href_list["tankone"])
- split_gases()
+ var/toggle = 1
+ origin_tech = "materials=1;engineering=1"
+
+/obj/item/device/transfer_valve/IsAssemblyHolder()
+ return 1
+
+/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
+ if(istype(item, /obj/item/tank))
+ if(tank_one && tank_two)
+ to_chat(user, "There are already two tanks attached, remove one first!")
+ return
+
+ if(!tank_one)
+ if(!user.transferItemToLoc(item, src))
+ return
+ tank_one = item
+ to_chat(user, "You attach the tank to the transfer valve.")
+ if(item.w_class > w_class)
+ w_class = item.w_class
+ else if(!tank_two)
+ if(!user.transferItemToLoc(item, src))
+ return
+ tank_two = item
+ to_chat(user, "You attach the tank to the transfer valve.")
+ if(item.w_class > w_class)
+ w_class = item.w_class
+
+ update_icon()
+//TODO: Have this take an assemblyholder
+ else if(isassembly(item))
+ var/obj/item/device/assembly/A = item
+ if(A.secured)
+ to_chat(user, "The device is secured.")
+ return
+ if(attached_device)
+ to_chat(user, "There is already a device attached to the valve, remove it first!")
+ return
+ if(!user.transferItemToLoc(item, src))
+ return
+ attached_device = A
+ to_chat(user, "You attach the [item] to the valve controls and secure it.")
+ A.holder = src
+ A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
+
+ GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
+ message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
+ log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
+ attacher = user
+ return
+
+/obj/item/device/transfer_valve/attack_self(mob/user)
+ user.set_machine(src)
+ var/dat = {" Valve properties:
+
Attachment one: [tank_one] [tank_one ? "Remove" : ""]
+
Attachment two: [tank_two] [tank_two ? "Remove" : ""]
+
Valve attachment: [attached_device ? "[attached_device]" : "None"] [attached_device ? "Remove" : ""]
+
Valve status: [ valve_open ? "Closed Open" : "Closed Open"]"}
+
+ var/datum/browser/popup = new(user, "trans_valve", name)
+ popup.set_content(dat)
+ popup.open()
+ return
+
+/obj/item/device/transfer_valve/Topic(href, href_list)
+ ..()
+ if ( usr.stat || usr.restrained() )
+ return
+ if (src.loc == usr)
+ if(tank_one && href_list["tankone"])
+ split_gases()
valve_open = FALSE
- tank_one.loc = get_turf(src)
- tank_one = null
- update_icon()
- if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
- w_class = WEIGHT_CLASS_NORMAL
- else if(tank_two && href_list["tanktwo"])
- split_gases()
+ tank_one.loc = get_turf(src)
+ tank_one = null
+ update_icon()
+ if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+ w_class = WEIGHT_CLASS_NORMAL
+ else if(tank_two && href_list["tanktwo"])
+ split_gases()
valve_open = FALSE
- tank_two.loc = get_turf(src)
- tank_two = null
- update_icon()
- if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
- w_class = WEIGHT_CLASS_NORMAL
- else if(href_list["open"])
- toggle_valve()
- else if(attached_device)
- if(href_list["rem_device"])
+ tank_two.loc = get_turf(src)
+ tank_two = null
+ update_icon()
+ if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+ w_class = WEIGHT_CLASS_NORMAL
+ else if(href_list["open"])
+ toggle_valve()
+ else if(attached_device)
+ if(href_list["rem_device"])
attached_device.forceMove(get_turf(src))
attached_device.holder = null
- attached_device = null
- update_icon()
- if(href_list["device"])
- attached_device.attack_self(usr)
-
- src.attack_self(usr)
- src.add_fingerprint(usr)
- return
- return
-
-/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
- if(toggle)
- toggle = 0
- toggle_valve()
- spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
- toggle = 1
-
-/obj/item/device/transfer_valve/update_icon()
- cut_overlays()
- underlays = null
-
- if(!tank_one && !tank_two && !attached_device)
- icon_state = "valve_1"
- return
- icon_state = "valve"
-
- if(tank_one)
- add_overlay("[tank_one.icon_state]")
- if(tank_two)
- var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
- J.Shift(WEST, 13)
- underlays += J
- if(attached_device)
- add_overlay("device")
-
-/obj/item/device/transfer_valve/proc/merge_gases()
- tank_two.air_contents.volume += tank_one.air_contents.volume
- var/datum/gas_mixture/temp
- temp = tank_one.air_contents.remove_ratio(1)
- tank_two.air_contents.merge(temp)
-
-/obj/item/device/transfer_valve/proc/split_gases()
- if (!valve_open || !tank_one || !tank_two)
- return
- var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
- var/datum/gas_mixture/temp
- temp = tank_two.air_contents.remove_ratio(ratio1)
- tank_one.air_contents.merge(temp)
- tank_two.air_contents.volume -= tank_one.air_contents.volume
-
- /*
- Exadv1: I know this isn't how it's going to work, but this was just to check
- it explodes properly when it gets a signal (and it does).
- */
-
-/obj/item/device/transfer_valve/proc/toggle_valve()
- if(!valve_open && tank_one && tank_two)
+ attached_device = null
+ update_icon()
+ if(href_list["device"])
+ attached_device.attack_self(usr)
+
+ src.attack_self(usr)
+ src.add_fingerprint(usr)
+ return
+ return
+
+/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
+ if(toggle)
+ toggle = 0
+ toggle_valve()
+ spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
+ toggle = 1
+
+/obj/item/device/transfer_valve/update_icon()
+ cut_overlays()
+ underlays = null
+
+ if(!tank_one && !tank_two && !attached_device)
+ icon_state = "valve_1"
+ return
+ icon_state = "valve"
+
+ if(tank_one)
+ add_overlay("[tank_one.icon_state]")
+ if(tank_two)
+ var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
+ J.Shift(WEST, 13)
+ underlays += J
+ if(attached_device)
+ add_overlay("device")
+
+/obj/item/device/transfer_valve/proc/merge_gases()
+ tank_two.air_contents.volume += tank_one.air_contents.volume
+ var/datum/gas_mixture/temp
+ temp = tank_one.air_contents.remove_ratio(1)
+ tank_two.air_contents.merge(temp)
+
+/obj/item/device/transfer_valve/proc/split_gases()
+ if (!valve_open || !tank_one || !tank_two)
+ return
+ var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
+ var/datum/gas_mixture/temp
+ temp = tank_two.air_contents.remove_ratio(ratio1)
+ tank_one.air_contents.merge(temp)
+ tank_two.air_contents.volume -= tank_one.air_contents.volume
+
+ /*
+ Exadv1: I know this isn't how it's going to work, but this was just to check
+ it explodes properly when it gets a signal (and it does).
+ */
+
+/obj/item/device/transfer_valve/proc/toggle_valve()
+ if(!valve_open && tank_one && tank_two)
valve_open = TRUE
- var/turf/bombturf = get_turf(src)
- var/area/A = get_area(bombturf)
-
- var/attachment = "no device"
- if(attached_device)
- if(istype(attached_device, /obj/item/device/assembly/signaler))
- attachment = "[attached_device]"
- else
- attachment = attached_device
-
- var/attacher_name = ""
- if(!attacher)
- attacher_name = "Unknown"
- else
- attacher_name = "[key_name_admin(attacher)]"
-
- var/log_str1 = "Bomb valve opened in "
- var/log_str2 = "with [attachment] attacher: [attacher_name]"
-
- var/log_attacher = ""
- if(attacher)
- log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
-
- var/mob/mob = get_mob_by_key(src.fingerprintslast)
- var/last_touch_info = ""
- if(mob)
- last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"
-
- var/log_str3 = " Last touched by: [key_name_admin(mob)]"
-
- var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"
-
- GLOB.bombers += bomb_message
-
- message_admins(bomb_message, 0, 1)
- log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
- merge_gases()
- spawn(20) // In case one tank bursts
- for (var/i=0,i<5,i++)
- src.update_icon()
- sleep(10)
- src.update_icon()
-
- else if(valve_open && tank_one && tank_two)
- split_gases()
+ var/turf/bombturf = get_turf(src)
+ var/area/A = get_area(bombturf)
+
+ var/attachment = "no device"
+ if(attached_device)
+ if(istype(attached_device, /obj/item/device/assembly/signaler))
+ attachment = "[attached_device]"
+ else
+ attachment = attached_device
+
+ var/attacher_name = ""
+ if(!attacher)
+ attacher_name = "Unknown"
+ else
+ attacher_name = "[key_name_admin(attacher)]"
+
+ var/log_str1 = "Bomb valve opened in "
+ var/log_str2 = "with [attachment] attacher: [attacher_name]"
+
+ var/log_attacher = ""
+ if(attacher)
+ log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
+
+ var/mob/mob = get_mob_by_key(src.fingerprintslast)
+ var/last_touch_info = ""
+ if(mob)
+ last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"
+
+ var/log_str3 = " Last touched by: [key_name_admin(mob)]"
+
+ var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"
+
+ GLOB.bombers += bomb_message
+
+ message_admins(bomb_message, 0, 1)
+ log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
+ merge_gases()
+ spawn(20) // In case one tank bursts
+ for (var/i=0,i<5,i++)
+ src.update_icon()
+ sleep(10)
+ src.update_icon()
+
+ else if(valve_open && tank_one && tank_two)
+ split_gases()
valve_open = FALSE
- src.update_icon()
-
-// this doesn't do anything but the timer etc. expects it to be here
-// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
-/obj/item/device/transfer_valve/proc/c_state()
- return
+ src.update_icon()
+
+// this doesn't do anything but the timer etc. expects it to be here
+// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
+/obj/item/device/transfer_valve/proc/c_state()
+ return
diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm
index 771d322c34..7cf88e77ef 100644
--- a/code/game/objects/items/dice.dm
+++ b/code/game/objects/items/dice.dm
@@ -1,193 +1,192 @@
-/obj/item/storage/pill_bottle/dice
- name = "bag of dice"
- desc = "Contains all the luck you'll ever need."
- icon = 'icons/obj/dice.dmi'
- icon_state = "dicebag"
-
-/obj/item/storage/pill_bottle/dice/New()
- ..()
- var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
- if(special_die == "1")
- new /obj/item/dice/d1(src)
- if(special_die == "2")
- new /obj/item/dice/d2(src)
- new /obj/item/dice/d4(src)
- new /obj/item/dice/d6(src)
- if(special_die == "fudge")
- new /obj/item/dice/fudge(src)
- if(special_die == "space")
- new /obj/item/dice/d6/space(src)
- new /obj/item/dice/d8(src)
- new /obj/item/dice/d10(src)
- if(special_die == "00")
- new /obj/item/dice/d00(src)
- new /obj/item/dice/d12(src)
- new /obj/item/dice/d20(src)
- if(special_die == "8bd20")
- new /obj/item/dice/eightbd20(src)
- if(special_die == "4dd6")
- new /obj/item/dice/fourdd6(src)
- if(special_die == "100")
- new /obj/item/dice/d100(src)
-
-/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
- name = "die"
- desc = "A die with six sides. Basic and servicable."
- icon = 'icons/obj/dice.dmi'
- icon_state = "d6"
- w_class = WEIGHT_CLASS_TINY
- var/sides = 6
- var/result = null
- var/list/special_faces = list() //entries should match up to sides var if used
- var/can_be_rigged = TRUE
- var/rigged = FALSE
-
-/obj/item/dice/New()
- result = rand(1, sides)
- update_icon()
- ..()
-
-/obj/item/dice/d1
- name = "d1"
- desc = "A die with one side. Deterministic!"
- icon_state = "d1"
- sides = 1
-
-/obj/item/dice/d2
- name = "d2"
- desc = "A die with two sides. Coins are undignified!"
- icon_state = "d2"
- sides = 2
-
-/obj/item/dice/d4
- name = "d4"
- desc = "A die with four sides. The nerd's caltrop."
- icon_state = "d4"
- sides = 4
-
-/obj/item/dice/d6
- name = "d6"
-
-/obj/item/dice/d6/space
- name = "space cube"
- desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST."
- icon_state = "spaced6"
-
-/obj/item/dice/d6/space/New()
- ..()
- if(prob(10))
- name = "spess cube"
-
-/obj/item/dice/fudge
- name = "fudge die"
- desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
- sides = 3 //shhh
- icon_state = "fudge"
- special_faces = list("minus","blank","plus")
-
-/obj/item/dice/d8
- name = "d8"
- desc = "A die with eight sides. It feels... lucky."
- icon_state = "d8"
- sides = 8
-
-/obj/item/dice/d10
- name = "d10"
- desc = "A die with ten sides. Useful for percentages."
- icon_state = "d10"
- sides = 10
-
-/obj/item/dice/d00
- name = "d00"
- desc = "A die with ten sides. Works better for d100 rolls than a golfball."
- icon_state = "d00"
- sides = 10
-
-/obj/item/dice/d12
- name = "d12"
- desc = "A die with twelve sides. There's an air of neglect about it."
- icon_state = "d12"
- sides = 12
-
-/obj/item/dice/d20
- name = "d20"
- desc = "A die with twenty sides. The prefered die to throw at the GM."
- icon_state = "d20"
- sides = 20
-
-/obj/item/dice/d100
- name = "d100"
- desc = "A die with one hundred sides! Probably not fairly weighted..."
- icon_state = "d100"
- sides = 100
-
-/obj/item/dice/d100/update_icon()
- return
-
-/obj/item/dice/eightbd20
- name = "strange d20"
- desc = "A weird die with raised text printed on the faces. Everything's white on white so reading it is a struggle. What poor design!"
- icon_state = "8bd20"
- sides = 20
- special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful")
-
-/obj/item/dice/eightbd20/update_icon()
- return
-
-/obj/item/dice/fourdd6
- name = "4d d6"
- desc = "A die that exists in four dimensional space. Properly interpreting them can only be properly done with the help of a mathematician, a physicist, and a priest."
- icon_state = "4dd6"
- sides = 48
- special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6")
-
-/obj/item/dice/fourdd6/update_icon()
- return
-
-/obj/item/dice/attack_self(mob/user)
- diceroll(user)
-
-/obj/item/dice/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
- if(!..())
- return
- diceroll(thrower)
-
-/obj/item/dice/proc/diceroll(mob/user)
- result = rand(1, sides)
- if(rigged && result != rigged)
- if(prob(Clamp(1/(sides - 1) * 100, 25, 80)))
- result = rigged
- var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
- var/comment = ""
- if(sides == 20 && result == 20)
- comment = "Nat 20!"
- else if(sides == 20 && result == 1)
- comment = "Ouch, bad luck."
- update_icon()
- if(initial(icon_state) == "d00")
- result = (result - 1)*10
- if(special_faces.len == sides)
- result = special_faces[result]
- if(user != null) //Dice was rolled in someone's hand
- user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
- "You throw [src]. It lands on [result]. [comment]", \
- "You hear [src] rolling, it sounds like a [fake_result].")
- else if(!src.throwing) //Dice was thrown and is coming to rest
- visible_message("[src] rolls to a stop, landing on [result]. [comment]")
-
-/obj/item/dice/d4/Crossed(mob/living/carbon/human/H)
- if(istype(H) && !H.shoes)
- if(PIERCEIMMUNE in H.dna.species.species_traits)
- return 0
- to_chat(H, "You step on the D4!")
- H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
- H.Knockdown(60)
-
-/obj/item/dice/update_icon()
- cut_overlays()
- add_overlay("[src.icon_state][src.result]")
-
-/obj/item/dice/microwave_act(obj/machinery/microwave/M)
- if(can_be_rigged)
- rigged = result
- ..(M)
+/obj/item/storage/pill_bottle/dice
+ name = "bag of dice"
+ desc = "Contains all the luck you'll ever need."
+ icon = 'icons/obj/dice.dmi'
+ icon_state = "dicebag"
+
+/obj/item/storage/pill_bottle/dice/New()
+ ..()
+ var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
+ if(special_die == "1")
+ new /obj/item/dice/d1(src)
+ if(special_die == "2")
+ new /obj/item/dice/d2(src)
+ new /obj/item/dice/d4(src)
+ new /obj/item/dice/d6(src)
+ if(special_die == "fudge")
+ new /obj/item/dice/fudge(src)
+ if(special_die == "space")
+ new /obj/item/dice/d6/space(src)
+ new /obj/item/dice/d8(src)
+ new /obj/item/dice/d10(src)
+ if(special_die == "00")
+ new /obj/item/dice/d00(src)
+ new /obj/item/dice/d12(src)
+ new /obj/item/dice/d20(src)
+ if(special_die == "8bd20")
+ new /obj/item/dice/eightbd20(src)
+ if(special_die == "4dd6")
+ new /obj/item/dice/fourdd6(src)
+ if(special_die == "100")
+ new /obj/item/dice/d100(src)
+
+/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
+ name = "die"
+ desc = "A die with six sides. Basic and servicable."
+ icon = 'icons/obj/dice.dmi'
+ icon_state = "d6"
+ w_class = WEIGHT_CLASS_TINY
+ var/sides = 6
+ var/result = null
+ var/list/special_faces = list() //entries should match up to sides var if used
+ var/can_be_rigged = TRUE
+ var/rigged = FALSE
+
+/obj/item/dice/New()
+ result = rand(1, sides)
+ update_icon()
+ ..()
+
+/obj/item/dice/d1
+ name = "d1"
+ desc = "A die with one side. Deterministic!"
+ icon_state = "d1"
+ sides = 1
+
+/obj/item/dice/d2
+ name = "d2"
+ desc = "A die with two sides. Coins are undignified!"
+ icon_state = "d2"
+ sides = 2
+
+/obj/item/dice/d4
+ name = "d4"
+ desc = "A die with four sides. The nerd's caltrop."
+ icon_state = "d4"
+ sides = 4
+
+/obj/item/dice/d6
+ name = "d6"
+
+/obj/item/dice/d6/space
+ name = "space cube"
+ desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST."
+ icon_state = "spaced6"
+
+/obj/item/dice/d6/space/New()
+ ..()
+ if(prob(10))
+ name = "spess cube"
+
+/obj/item/dice/fudge
+ name = "fudge die"
+ desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
+ sides = 3 //shhh
+ icon_state = "fudge"
+ special_faces = list("minus","blank","plus")
+
+/obj/item/dice/d8
+ name = "d8"
+ desc = "A die with eight sides. It feels... lucky."
+ icon_state = "d8"
+ sides = 8
+
+/obj/item/dice/d10
+ name = "d10"
+ desc = "A die with ten sides. Useful for percentages."
+ icon_state = "d10"
+ sides = 10
+
+/obj/item/dice/d00
+ name = "d00"
+ desc = "A die with ten sides. Works better for d100 rolls than a golfball."
+ icon_state = "d00"
+ sides = 10
+
+/obj/item/dice/d12
+ name = "d12"
+ desc = "A die with twelve sides. There's an air of neglect about it."
+ icon_state = "d12"
+ sides = 12
+
+/obj/item/dice/d20
+ name = "d20"
+ desc = "A die with twenty sides. The prefered die to throw at the GM."
+ icon_state = "d20"
+ sides = 20
+
+/obj/item/dice/d100
+ name = "d100"
+ desc = "A die with one hundred sides! Probably not fairly weighted..."
+ icon_state = "d100"
+ sides = 100
+
+/obj/item/dice/d100/update_icon()
+ return
+
+/obj/item/dice/eightbd20
+ name = "strange d20"
+ desc = "A weird die with raised text printed on the faces. Everything's white on white so reading it is a struggle. What poor design!"
+ icon_state = "8bd20"
+ sides = 20
+ special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful")
+
+/obj/item/dice/eightbd20/update_icon()
+ return
+
+/obj/item/dice/fourdd6
+ name = "4d d6"
+ desc = "A die that exists in four dimensional space. Properly interpreting them can only be properly done with the help of a mathematician, a physicist, and a priest."
+ icon_state = "4dd6"
+ sides = 48
+ special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6")
+
+/obj/item/dice/fourdd6/update_icon()
+ return
+
+/obj/item/dice/attack_self(mob/user)
+ diceroll(user)
+
+/obj/item/dice/throw_impact(atom/target)
+ diceroll(thrownby)
+ . = ..()
+
+/obj/item/dice/proc/diceroll(mob/user)
+ result = rand(1, sides)
+ if(rigged && result != rigged)
+ if(prob(Clamp(1/(sides - 1) * 100, 25, 80)))
+ result = rigged
+ var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
+ var/comment = ""
+ if(sides == 20 && result == 20)
+ comment = "Nat 20!"
+ else if(sides == 20 && result == 1)
+ comment = "Ouch, bad luck."
+ update_icon()
+ if(initial(icon_state) == "d00")
+ result = (result - 1)*10
+ if(special_faces.len == sides)
+ result = special_faces[result]
+ if(user != null) //Dice was rolled in someone's hand
+ user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
+ "You throw [src]. It lands on [result]. [comment]", \
+ "You hear [src] rolling, it sounds like a [fake_result].")
+ else if(!src.throwing) //Dice was thrown and is coming to rest
+ visible_message("[src] rolls to a stop, landing on [result]. [comment]")
+
+/obj/item/dice/d4/Crossed(mob/living/carbon/human/H)
+ if(istype(H) && !H.shoes)
+ if(PIERCEIMMUNE in H.dna.species.species_traits)
+ return 0
+ to_chat(H, "You step on the D4!")
+ H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
+ H.Knockdown(60)
+
+/obj/item/dice/update_icon()
+ cut_overlays()
+ add_overlay("[src.icon_state][src.result]")
+
+/obj/item/dice/microwave_act(obj/machinery/microwave/M)
+ if(can_be_rigged)
+ rigged = result
+ ..(M)
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index b5c7c1ddce..18064f83de 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -1,370 +1,370 @@
-/obj/item/dnainjector
- name = "\improper DNA injector"
- desc = "This injects the person with DNA."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "dnainjector"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- throw_speed = 3
- throw_range = 5
- w_class = WEIGHT_CLASS_TINY
- origin_tech = "biotech=1"
-
- var/damage_coeff = 1
- var/list/fields
- var/list/add_mutations = list()
- var/list/remove_mutations = list()
-
- var/list/add_mutations_static = list()
- var/list/remove_mutations_static = list()
-
- var/used = 0
-
-/obj/item/dnainjector/attack_paw(mob/user)
- return attack_hand(user)
-
-/obj/item/dnainjector/proc/prepare()
- for(var/mut_key in add_mutations_static)
- add_mutations.Add(GLOB.mutations_list[mut_key])
- for(var/mut_key in remove_mutations_static)
- remove_mutations.Add(GLOB.mutations_list[mut_key])
-
-/obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
- prepare()
-
- if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.disabilities & NOCLONE))
- M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
- var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
- for(var/datum/mutation/human/HM in remove_mutations)
- HM.force_lose(M)
- for(var/datum/mutation/human/HM in add_mutations)
- if(HM.name == RACEMUT)
- message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)")
- log_msg += " (MONKEY)"
- HM.force_give(M)
- if(fields)
- if(fields["name"] && fields["UE"] && fields["blood_type"])
- M.real_name = fields["name"]
- M.dna.unique_enzymes = fields["UE"]
- M.name = M.real_name
- M.dna.blood_type = fields["blood_type"]
- if(fields["UI"]) //UI+UE
- M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
- M.updateappearance(mutations_overlay_update=1)
- log_attack(log_msg)
- return TRUE
- return FALSE
-
-/obj/item/dnainjector/attack(mob/target, mob/user)
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return
- if(used)
- to_chat(user, "This injector is used up!")
- return
- if(ishuman(target))
- var/mob/living/carbon/human/humantarget = target
- if (!humantarget.can_inject(user, 1))
- return
- add_logs(user, target, "attempted to inject", src)
-
- if(target != user)
- target.visible_message("[user] is trying to inject [target] with [src]!", "[user] is trying to inject [target] with [src]!")
- if(!do_mob(user, target) || used)
- return
- target.visible_message("[user] injects [target] with the syringe with [src]!", \
- "[user] injects [target] with the syringe with [src]!")
-
- else
- to_chat(user, "You inject yourself with [src].")
-
- add_logs(user, target, "injected", src)
-
- if(!inject(target, user)) //Now we actually do the heavy lifting.
- to_chat(user, "It appears that [target] does not have compatible DNA.")
-
- used = 1
- icon_state = "dnainjector0"
- desc += " This one is used up."
-
-
-/obj/item/dnainjector/antihulk
- name = "\improper DNA injector (Anti-Hulk)"
- desc = "Cures green skin."
- remove_mutations_static = list(HULK)
-
-/obj/item/dnainjector/hulkmut
- name = "\improper DNA injector (Hulk)"
- desc = "This will make you big and strong, but give you a bad skin condition."
- add_mutations_static = list(HULK)
-
-/obj/item/dnainjector/xraymut
- name = "\improper DNA injector (Xray)"
- desc = "Finally you can see what the Captain does."
- add_mutations_static = list(XRAY)
-
-/obj/item/dnainjector/antixray
- name = "\improper DNA injector (Anti-Xray)"
- desc = "It will make you see harder."
- remove_mutations_static = list(XRAY)
-
-/////////////////////////////////////
-/obj/item/dnainjector/antiglasses
- name = "\improper DNA injector (Anti-Glasses)"
- desc = "Toss away those glasses!"
- remove_mutations_static = list(BADSIGHT)
-
-/obj/item/dnainjector/glassesmut
- name = "\improper DNA injector (Glasses)"
- desc = "Will make you need dorkish glasses."
- add_mutations_static = list(BADSIGHT)
-
-/obj/item/dnainjector/epimut
- name = "\improper DNA injector (Epi.)"
- desc = "Shake shake shake the room!"
- add_mutations_static = list(EPILEPSY)
-
-/obj/item/dnainjector/antiepi
- name = "\improper DNA injector (Anti-Epi.)"
- desc = "Will fix you up from shaking the room."
- remove_mutations_static = list(EPILEPSY)
-////////////////////////////////////
-/obj/item/dnainjector/anticough
- name = "\improper DNA injector (Anti-Cough)"
- desc = "Will stop that aweful noise."
- remove_mutations_static = list(COUGH)
-
-/obj/item/dnainjector/coughmut
- name = "\improper DNA injector (Cough)"
- desc = "Will bring forth a sound of horror from your throat."
- add_mutations_static = list(COUGH)
-
-/obj/item/dnainjector/antidwarf
- name = "\improper DNA injector (Anti-Dwarfism)"
- desc = "Helps you grow big and strong."
- remove_mutations_static = list(DWARFISM)
-
-/obj/item/dnainjector/dwarf
- name = "\improper DNA injector (Dwarfism)"
- desc = "It's a small world after all."
- add_mutations_static = list(DWARFISM)
-
-/obj/item/dnainjector/clumsymut
- name = "\improper DNA injector (Clumsy)"
- desc = "Makes clown minions."
- add_mutations_static = list(CLOWNMUT)
-
-/obj/item/dnainjector/anticlumsy
- name = "\improper DNA injector (Anti-Clumsy)"
- desc = "Apply this for Security Clown."
- remove_mutations_static = list(CLOWNMUT)
-
-/obj/item/dnainjector/antitour
- name = "\improper DNA injector (Anti-Tour.)"
- desc = "Will cure tourrets."
- remove_mutations_static = list(TOURETTES)
-
-/obj/item/dnainjector/tourmut
- name = "\improper DNA injector (Tour.)"
- desc = "Gives you a nasty case of Tourette's."
- add_mutations_static = list(TOURETTES)
-
-/obj/item/dnainjector/stuttmut
- name = "\improper DNA injector (Stutt.)"
- desc = "Makes you s-s-stuttterrr"
- add_mutations_static = list(NERVOUS)
-
-/obj/item/dnainjector/antistutt
- name = "\improper DNA injector (Anti-Stutt.)"
- desc = "Fixes that speaking impairment."
- remove_mutations_static = list(NERVOUS)
-
-/obj/item/dnainjector/antifire
- name = "\improper DNA injector (Anti-Fire)"
- desc = "Cures fire."
- remove_mutations_static = list(COLDRES)
-
-/obj/item/dnainjector/firemut
- name = "\improper DNA injector (Fire)"
- desc = "Gives you fire."
- add_mutations_static = list(COLDRES)
-
-/obj/item/dnainjector/blindmut
- name = "\improper DNA injector (Blind)"
- desc = "Makes you not see anything."
- add_mutations_static = list(BLINDMUT)
-
-/obj/item/dnainjector/antiblind
- name = "\improper DNA injector (Anti-Blind)"
- desc = "IT'S A MIRACLE!!!"
- remove_mutations_static = list(BLINDMUT)
-
-/obj/item/dnainjector/antitele
- name = "\improper DNA injector (Anti-Tele.)"
- desc = "Will make you not able to control your mind."
- remove_mutations_static = list(TK)
-
-/obj/item/dnainjector/telemut
- name = "\improper DNA injector (Tele.)"
- desc = "Super brain man!"
- add_mutations_static = list(TK)
-
-/obj/item/dnainjector/telemut/darkbundle
- name = "\improper DNA injector"
- desc = "Good. Let the hate flow through you."
-
-/obj/item/dnainjector/deafmut
- name = "\improper DNA injector (Deaf)"
- desc = "Sorry, what did you say?"
- add_mutations_static = list(DEAFMUT)
-
-/obj/item/dnainjector/antideaf
- name = "\improper DNA injector (Anti-Deaf)"
- desc = "Will make you hear once more."
- remove_mutations_static = list(DEAFMUT)
-
-/obj/item/dnainjector/h2m
- name = "\improper DNA injector (Human > Monkey)"
- desc = "Will make you a flea bag."
- add_mutations_static = list(RACEMUT)
-
-/obj/item/dnainjector/m2h
- name = "\improper DNA injector (Monkey > Human)"
- desc = "Will make you...less hairy."
- remove_mutations_static = list(RACEMUT)
-
-/obj/item/dnainjector/antichameleon
- name = "\improper DNA injector (Anti-Chameleon)"
- remove_mutations_static = list(CHAMELEON)
-
-/obj/item/dnainjector/chameleonmut
- name = "\improper DNA injector (Chameleon)"
- add_mutations_static = list(CHAMELEON)
-
-/obj/item/dnainjector/antiwacky
- name = "\improper DNA injector (Anti-Wacky)"
- remove_mutations_static = list(WACKY)
-
-/obj/item/dnainjector/wackymut
- name = "\improper DNA injector (Wacky)"
- add_mutations_static = list(WACKY)
-
-/obj/item/dnainjector/antimute
- name = "\improper DNA injector (Anti-Mute)"
- remove_mutations_static = list(MUT_MUTE)
-
-/obj/item/dnainjector/mutemut
- name = "\improper DNA injector (Mute)"
- add_mutations_static = list(MUT_MUTE)
-
-/obj/item/dnainjector/antismile
- name = "\improper DNA injector (Anti-Smile)"
- remove_mutations_static = list(SMILE)
-
-/obj/item/dnainjector/smilemut
- name = "\improper DNA injector (Smile)"
- add_mutations_static = list(SMILE)
-
-/obj/item/dnainjector/unintelligablemut
- name = "\improper DNA injector (Unintelligable)"
- add_mutations_static = list(UNINTELLIGABLE)
-
-/obj/item/dnainjector/antiunintelligable
- name = "\improper DNA injector (Anti-Unintelligable)"
- remove_mutations_static = list(UNINTELLIGABLE)
-
-/obj/item/dnainjector/swedishmut
- name = "\improper DNA injector (Swedish)"
- add_mutations_static = list(SWEDISH)
-
-/obj/item/dnainjector/antiswedish
- name = "\improper DNA injector (Anti-Swedish)"
- remove_mutations_static = list(SWEDISH)
-
-/obj/item/dnainjector/chavmut
- name = "\improper DNA injector (Chav)"
- add_mutations_static = list(CHAV)
-
-/obj/item/dnainjector/antichav
- name = "\improper DNA injector (Anti-Chav)"
- remove_mutations_static = list(CHAV)
-
-/obj/item/dnainjector/elvismut
- name = "\improper DNA injector (Elvis)"
- add_mutations_static = list(ELVIS)
-
-/obj/item/dnainjector/antielvis
- name = "\improper DNA injector (Anti-Elvis)"
- remove_mutations_static = list(ELVIS)
-
-/obj/item/dnainjector/lasereyesmut
- name = "\improper DNA injector (Laser Eyes)"
- add_mutations_static = list(LASEREYES)
-
-/obj/item/dnainjector/antilasereyes
- name = "\improper DNA injector (Anti-Laser Eyes)"
- remove_mutations_static = list(LASEREYES)
-
-/obj/item/dnainjector/timed
- var/duration = 600
-
-/obj/item/dnainjector/timed/inject(mob/living/carbon/M, mob/user)
- prepare()
- if(M.stat == DEAD) //prevents dead people from having their DNA changed
- to_chat(user, "You can't modify [M]'s DNA while [M.p_theyre()] dead.")
- return FALSE
-
- if(M.has_dna() && !(M.disabilities & NOCLONE))
- M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
- var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
- var/endtime = world.time+duration
- for(var/datum/mutation/human/HM in remove_mutations)
- if(HM.name == RACEMUT)
- if(ishuman(M))
- continue
- M = HM.force_lose(M)
- else
- HM.force_lose(M)
- for(var/datum/mutation/human/HM in add_mutations)
- if((HM in M.dna.mutations) && !(M.dna.temporary_mutations[HM.name]))
- continue //Skip permanent mutations we already have.
- if(HM.name == RACEMUT && ishuman(M))
- message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)")
- log_msg += " (MONKEY)"
- M = HM.force_give(M)
- else
- HM.force_give(M)
- M.dna.temporary_mutations[HM.name] = endtime
- if(fields)
- if(fields["name"] && fields["UE"] && fields["blood_type"])
- if(!M.dna.previous["name"])
- M.dna.previous["name"] = M.real_name
- if(!M.dna.previous["UE"])
- M.dna.previous["UE"] = M.dna.unique_enzymes
- if(!M.dna.previous["blood_type"])
- M.dna.previous["blood_type"] = M.dna.blood_type
- M.real_name = fields["name"]
- M.dna.unique_enzymes = fields["UE"]
- M.name = M.real_name
- M.dna.blood_type = fields["blood_type"]
- M.dna.temporary_mutations[UE_CHANGED] = endtime
- if(fields["UI"]) //UI+UE
- if(!M.dna.previous["UI"])
- M.dna.previous["UI"] = M.dna.uni_identity
- M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
- M.updateappearance(mutations_overlay_update=1)
- M.dna.temporary_mutations[UI_CHANGED] = endtime
- log_attack(log_msg)
- return TRUE
- else
- return FALSE
-
-/obj/item/dnainjector/timed/hulk
- name = "\improper DNA injector (Hulk)"
- desc = "This will make you big and strong, but give you a bad skin condition."
- add_mutations_static = list(HULK)
-
-/obj/item/dnainjector/timed/h2m
- name = "\improper DNA injector (Human > Monkey)"
- desc = "Will make you a flea bag."
- add_mutations_static = list(RACEMUT)
+/obj/item/dnainjector
+ name = "\improper DNA injector"
+ desc = "This injects the person with DNA."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "dnainjector"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ throw_speed = 3
+ throw_range = 5
+ w_class = WEIGHT_CLASS_TINY
+ origin_tech = "biotech=1"
+
+ var/damage_coeff = 1
+ var/list/fields
+ var/list/add_mutations = list()
+ var/list/remove_mutations = list()
+
+ var/list/add_mutations_static = list()
+ var/list/remove_mutations_static = list()
+
+ var/used = 0
+
+/obj/item/dnainjector/attack_paw(mob/user)
+ return attack_hand(user)
+
+/obj/item/dnainjector/proc/prepare()
+ for(var/mut_key in add_mutations_static)
+ add_mutations.Add(GLOB.mutations_list[mut_key])
+ for(var/mut_key in remove_mutations_static)
+ remove_mutations.Add(GLOB.mutations_list[mut_key])
+
+/obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
+ prepare()
+
+ if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.disabilities & NOCLONE))
+ M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
+ var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
+ for(var/datum/mutation/human/HM in remove_mutations)
+ HM.force_lose(M)
+ for(var/datum/mutation/human/HM in add_mutations)
+ if(HM.name == RACEMUT)
+ message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)")
+ log_msg += " (MONKEY)"
+ HM.force_give(M)
+ if(fields)
+ if(fields["name"] && fields["UE"] && fields["blood_type"])
+ M.real_name = fields["name"]
+ M.dna.unique_enzymes = fields["UE"]
+ M.name = M.real_name
+ M.dna.blood_type = fields["blood_type"]
+ if(fields["UI"]) //UI+UE
+ M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
+ M.updateappearance(mutations_overlay_update=1)
+ log_attack(log_msg)
+ return TRUE
+ return FALSE
+
+/obj/item/dnainjector/attack(mob/target, mob/user)
+ if(!user.IsAdvancedToolUser())
+ to_chat(user, "You don't have the dexterity to do this!")
+ return
+ if(used)
+ to_chat(user, "This injector is used up!")
+ return
+ if(ishuman(target))
+ var/mob/living/carbon/human/humantarget = target
+ if (!humantarget.can_inject(user, 1))
+ return
+ add_logs(user, target, "attempted to inject", src)
+
+ if(target != user)
+ target.visible_message("[user] is trying to inject [target] with [src]!", "[user] is trying to inject [target] with [src]!")
+ if(!do_mob(user, target) || used)
+ return
+ target.visible_message("[user] injects [target] with the syringe with [src]!", \
+ "[user] injects [target] with the syringe with [src]!")
+
+ else
+ to_chat(user, "You inject yourself with [src].")
+
+ add_logs(user, target, "injected", src)
+
+ if(!inject(target, user)) //Now we actually do the heavy lifting.
+ to_chat(user, "It appears that [target] does not have compatible DNA.")
+
+ used = 1
+ icon_state = "dnainjector0"
+ desc += " This one is used up."
+
+
+/obj/item/dnainjector/antihulk
+ name = "\improper DNA injector (Anti-Hulk)"
+ desc = "Cures green skin."
+ remove_mutations_static = list(HULK)
+
+/obj/item/dnainjector/hulkmut
+ name = "\improper DNA injector (Hulk)"
+ desc = "This will make you big and strong, but give you a bad skin condition."
+ add_mutations_static = list(HULK)
+
+/obj/item/dnainjector/xraymut
+ name = "\improper DNA injector (Xray)"
+ desc = "Finally you can see what the Captain does."
+ add_mutations_static = list(XRAY)
+
+/obj/item/dnainjector/antixray
+ name = "\improper DNA injector (Anti-Xray)"
+ desc = "It will make you see harder."
+ remove_mutations_static = list(XRAY)
+
+/////////////////////////////////////
+/obj/item/dnainjector/antiglasses
+ name = "\improper DNA injector (Anti-Glasses)"
+ desc = "Toss away those glasses!"
+ remove_mutations_static = list(BADSIGHT)
+
+/obj/item/dnainjector/glassesmut
+ name = "\improper DNA injector (Glasses)"
+ desc = "Will make you need dorkish glasses."
+ add_mutations_static = list(BADSIGHT)
+
+/obj/item/dnainjector/epimut
+ name = "\improper DNA injector (Epi.)"
+ desc = "Shake shake shake the room!"
+ add_mutations_static = list(EPILEPSY)
+
+/obj/item/dnainjector/antiepi
+ name = "\improper DNA injector (Anti-Epi.)"
+ desc = "Will fix you up from shaking the room."
+ remove_mutations_static = list(EPILEPSY)
+////////////////////////////////////
+/obj/item/dnainjector/anticough
+ name = "\improper DNA injector (Anti-Cough)"
+ desc = "Will stop that aweful noise."
+ remove_mutations_static = list(COUGH)
+
+/obj/item/dnainjector/coughmut
+ name = "\improper DNA injector (Cough)"
+ desc = "Will bring forth a sound of horror from your throat."
+ add_mutations_static = list(COUGH)
+
+/obj/item/dnainjector/antidwarf
+ name = "\improper DNA injector (Anti-Dwarfism)"
+ desc = "Helps you grow big and strong."
+ remove_mutations_static = list(DWARFISM)
+
+/obj/item/dnainjector/dwarf
+ name = "\improper DNA injector (Dwarfism)"
+ desc = "It's a small world after all."
+ add_mutations_static = list(DWARFISM)
+
+/obj/item/dnainjector/clumsymut
+ name = "\improper DNA injector (Clumsy)"
+ desc = "Makes clown minions."
+ add_mutations_static = list(CLOWNMUT)
+
+/obj/item/dnainjector/anticlumsy
+ name = "\improper DNA injector (Anti-Clumsy)"
+ desc = "Apply this for Security Clown."
+ remove_mutations_static = list(CLOWNMUT)
+
+/obj/item/dnainjector/antitour
+ name = "\improper DNA injector (Anti-Tour.)"
+ desc = "Will cure tourrets."
+ remove_mutations_static = list(TOURETTES)
+
+/obj/item/dnainjector/tourmut
+ name = "\improper DNA injector (Tour.)"
+ desc = "Gives you a nasty case of Tourette's."
+ add_mutations_static = list(TOURETTES)
+
+/obj/item/dnainjector/stuttmut
+ name = "\improper DNA injector (Stutt.)"
+ desc = "Makes you s-s-stuttterrr"
+ add_mutations_static = list(NERVOUS)
+
+/obj/item/dnainjector/antistutt
+ name = "\improper DNA injector (Anti-Stutt.)"
+ desc = "Fixes that speaking impairment."
+ remove_mutations_static = list(NERVOUS)
+
+/obj/item/dnainjector/antifire
+ name = "\improper DNA injector (Anti-Fire)"
+ desc = "Cures fire."
+ remove_mutations_static = list(COLDRES)
+
+/obj/item/dnainjector/firemut
+ name = "\improper DNA injector (Fire)"
+ desc = "Gives you fire."
+ add_mutations_static = list(COLDRES)
+
+/obj/item/dnainjector/blindmut
+ name = "\improper DNA injector (Blind)"
+ desc = "Makes you not see anything."
+ add_mutations_static = list(BLINDMUT)
+
+/obj/item/dnainjector/antiblind
+ name = "\improper DNA injector (Anti-Blind)"
+ desc = "IT'S A MIRACLE!!!"
+ remove_mutations_static = list(BLINDMUT)
+
+/obj/item/dnainjector/antitele
+ name = "\improper DNA injector (Anti-Tele.)"
+ desc = "Will make you not able to control your mind."
+ remove_mutations_static = list(TK)
+
+/obj/item/dnainjector/telemut
+ name = "\improper DNA injector (Tele.)"
+ desc = "Super brain man!"
+ add_mutations_static = list(TK)
+
+/obj/item/dnainjector/telemut/darkbundle
+ name = "\improper DNA injector"
+ desc = "Good. Let the hate flow through you."
+
+/obj/item/dnainjector/deafmut
+ name = "\improper DNA injector (Deaf)"
+ desc = "Sorry, what did you say?"
+ add_mutations_static = list(DEAFMUT)
+
+/obj/item/dnainjector/antideaf
+ name = "\improper DNA injector (Anti-Deaf)"
+ desc = "Will make you hear once more."
+ remove_mutations_static = list(DEAFMUT)
+
+/obj/item/dnainjector/h2m
+ name = "\improper DNA injector (Human > Monkey)"
+ desc = "Will make you a flea bag."
+ add_mutations_static = list(RACEMUT)
+
+/obj/item/dnainjector/m2h
+ name = "\improper DNA injector (Monkey > Human)"
+ desc = "Will make you...less hairy."
+ remove_mutations_static = list(RACEMUT)
+
+/obj/item/dnainjector/antichameleon
+ name = "\improper DNA injector (Anti-Chameleon)"
+ remove_mutations_static = list(CHAMELEON)
+
+/obj/item/dnainjector/chameleonmut
+ name = "\improper DNA injector (Chameleon)"
+ add_mutations_static = list(CHAMELEON)
+
+/obj/item/dnainjector/antiwacky
+ name = "\improper DNA injector (Anti-Wacky)"
+ remove_mutations_static = list(WACKY)
+
+/obj/item/dnainjector/wackymut
+ name = "\improper DNA injector (Wacky)"
+ add_mutations_static = list(WACKY)
+
+/obj/item/dnainjector/antimute
+ name = "\improper DNA injector (Anti-Mute)"
+ remove_mutations_static = list(MUT_MUTE)
+
+/obj/item/dnainjector/mutemut
+ name = "\improper DNA injector (Mute)"
+ add_mutations_static = list(MUT_MUTE)
+
+/obj/item/dnainjector/antismile
+ name = "\improper DNA injector (Anti-Smile)"
+ remove_mutations_static = list(SMILE)
+
+/obj/item/dnainjector/smilemut
+ name = "\improper DNA injector (Smile)"
+ add_mutations_static = list(SMILE)
+
+/obj/item/dnainjector/unintelligablemut
+ name = "\improper DNA injector (Unintelligable)"
+ add_mutations_static = list(UNINTELLIGABLE)
+
+/obj/item/dnainjector/antiunintelligable
+ name = "\improper DNA injector (Anti-Unintelligable)"
+ remove_mutations_static = list(UNINTELLIGABLE)
+
+/obj/item/dnainjector/swedishmut
+ name = "\improper DNA injector (Swedish)"
+ add_mutations_static = list(SWEDISH)
+
+/obj/item/dnainjector/antiswedish
+ name = "\improper DNA injector (Anti-Swedish)"
+ remove_mutations_static = list(SWEDISH)
+
+/obj/item/dnainjector/chavmut
+ name = "\improper DNA injector (Chav)"
+ add_mutations_static = list(CHAV)
+
+/obj/item/dnainjector/antichav
+ name = "\improper DNA injector (Anti-Chav)"
+ remove_mutations_static = list(CHAV)
+
+/obj/item/dnainjector/elvismut
+ name = "\improper DNA injector (Elvis)"
+ add_mutations_static = list(ELVIS)
+
+/obj/item/dnainjector/antielvis
+ name = "\improper DNA injector (Anti-Elvis)"
+ remove_mutations_static = list(ELVIS)
+
+/obj/item/dnainjector/lasereyesmut
+ name = "\improper DNA injector (Laser Eyes)"
+ add_mutations_static = list(LASEREYES)
+
+/obj/item/dnainjector/antilasereyes
+ name = "\improper DNA injector (Anti-Laser Eyes)"
+ remove_mutations_static = list(LASEREYES)
+
+/obj/item/dnainjector/timed
+ var/duration = 600
+
+/obj/item/dnainjector/timed/inject(mob/living/carbon/M, mob/user)
+ prepare()
+ if(M.stat == DEAD) //prevents dead people from having their DNA changed
+ to_chat(user, "You can't modify [M]'s DNA while [M.p_theyre()] dead.")
+ return FALSE
+
+ if(M.has_dna() && !(M.disabilities & NOCLONE))
+ M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
+ var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
+ var/endtime = world.time+duration
+ for(var/datum/mutation/human/HM in remove_mutations)
+ if(HM.name == RACEMUT)
+ if(ishuman(M))
+ continue
+ M = HM.force_lose(M)
+ else
+ HM.force_lose(M)
+ for(var/datum/mutation/human/HM in add_mutations)
+ if((HM in M.dna.mutations) && !(M.dna.temporary_mutations[HM.name]))
+ continue //Skip permanent mutations we already have.
+ if(HM.name == RACEMUT && ishuman(M))
+ message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)")
+ log_msg += " (MONKEY)"
+ M = HM.force_give(M)
+ else
+ HM.force_give(M)
+ M.dna.temporary_mutations[HM.name] = endtime
+ if(fields)
+ if(fields["name"] && fields["UE"] && fields["blood_type"])
+ if(!M.dna.previous["name"])
+ M.dna.previous["name"] = M.real_name
+ if(!M.dna.previous["UE"])
+ M.dna.previous["UE"] = M.dna.unique_enzymes
+ if(!M.dna.previous["blood_type"])
+ M.dna.previous["blood_type"] = M.dna.blood_type
+ M.real_name = fields["name"]
+ M.dna.unique_enzymes = fields["UE"]
+ M.name = M.real_name
+ M.dna.blood_type = fields["blood_type"]
+ M.dna.temporary_mutations[UE_CHANGED] = endtime
+ if(fields["UI"]) //UI+UE
+ if(!M.dna.previous["UI"])
+ M.dna.previous["UI"] = M.dna.uni_identity
+ M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
+ M.updateappearance(mutations_overlay_update=1)
+ M.dna.temporary_mutations[UI_CHANGED] = endtime
+ log_attack(log_msg)
+ return TRUE
+ else
+ return FALSE
+
+/obj/item/dnainjector/timed/hulk
+ name = "\improper DNA injector (Hulk)"
+ desc = "This will make you big and strong, but give you a bad skin condition."
+ add_mutations_static = list(HULK)
+
+/obj/item/dnainjector/timed/h2m
+ name = "\improper DNA injector (Human > Monkey)"
+ desc = "Will make you a flea bag."
+ add_mutations_static = list(RACEMUT)
diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm
index 82d4c3d99f..15c6bcd4b1 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 05ef0220de..c42322044a 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -1,188 +1,190 @@
-/obj/item/extinguisher
- name = "fire extinguisher"
- desc = "A traditional red fire extinguisher."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "fire_extinguisher0"
- item_state = "fire_extinguisher"
- hitsound = 'sound/weapons/smash.ogg'
- flags_1 = CONDUCT_1
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- throw_speed = 2
- throw_range = 7
- force = 10
- materials = list(MAT_METAL=90)
- attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
- dog_fashion = /datum/dog_fashion/back
- resistance_flags = FIRE_PROOF
- var/max_water = 50
- var/last_use = 1
- var/safety = TRUE
- var/refilling = FALSE
- var/sprite_name = "fire_extinguisher"
- var/power = 5 //Maximum distance launched water will travel
- var/precision = 0 //By default, turfs picked from a spray are random, set to 1 to make it always have at least one water effect per row
- var/cooling_power = 2 //Sets the cooling_temperature of the water reagent datum inside of the extinguisher when it is refilled
-
-/obj/item/extinguisher/mini
- name = "pocket fire extinguisher"
- desc = "A light and compact fibreglass-framed model fire extinguisher."
- icon_state = "miniFE0"
- item_state = "miniFE"
- hitsound = null //it is much lighter, after all.
- flags_1 = null //doesn't CONDUCT_1
- throwforce = 2
- w_class = WEIGHT_CLASS_SMALL
- force = 3
- materials = list()
- max_water = 30
- sprite_name = "miniFE"
- dog_fashion = null
-
-/obj/item/extinguisher/New()
- ..()
- create_reagents(max_water)
- reagents.add_reagent("water", max_water)
-
-/obj/item/extinguisher/attack_self(mob/user)
- safety = !safety
- src.icon_state = "[sprite_name][!safety]"
- src.desc = "The safety is [safety ? "on" : "off"]."
- to_chat(user, "The safety is [safety ? "on" : "off"].")
- return
-
-/obj/item/extinguisher/attack(mob/M, mob/user)
- if(user.a_intent == INTENT_HELP && !safety) //If we're on help intent and going to spray people, don't bash them.
- return FALSE
- else
- return ..()
-
-/obj/item/extinguisher/attack_obj(obj/O, mob/living/user)
- if(AttemptRefill(O, user))
- refilling = TRUE
- return FALSE
- else
- return ..()
-
-/obj/item/extinguisher/examine(mob/user)
- ..()
- if(reagents.total_volume)
- to_chat(user, "It contains [round(reagents.total_volume)] units.")
- else
- to_chat(user, "It is empty.")
-
-/obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user)
- if(istype(target, /obj/structure/reagent_dispensers/watertank) && target.Adjacent(user))
- var/safety_save = safety
- safety = TRUE
- if(reagents.total_volume == reagents.maximum_volume)
- to_chat(user, "\The [src] is already full!")
- safety = safety_save
- return 1
- var/obj/structure/reagent_dispensers/watertank/W = target
- var/transferred = W.reagents.trans_to(src, max_water)
- if(transferred > 0)
- to_chat(user, "\The [src] has been refilled by [transferred] units.")
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
- for(var/datum/reagent/water/R in reagents.reagent_list)
- R.cooling_temperature = cooling_power
- else
- to_chat(user, "\The [W] is empty!")
- safety = safety_save
- return 1
- else
- return 0
-
-/obj/item/extinguisher/afterattack(atom/target, mob/user , flag)
- // Make it so the extinguisher doesn't spray yourself when you click your inventory items
- if (target.loc == user)
- return
- //TODO; Add support for reagents in water.
- if(refilling)
- refilling = FALSE
- return
- if (!safety)
- if (src.reagents.total_volume < 1)
- to_chat(usr, "\The [src] is empty!")
- return
-
- if (world.time < src.last_use + 12)
- return
-
- src.last_use = world.time
-
- playsound(src.loc, 'sound/effects/extinguish.ogg', 75, 1, -3)
-
- var/direction = get_dir(src,target)
-
- if(user.buckled && isobj(user.buckled) && !user.buckled.anchored)
- spawn(0)
- var/obj/B = user.buckled
- var/movementdirection = turn(direction,180)
- step(B, movementdirection)
- sleep(1)
- step(B, movementdirection)
- sleep(1)
- step(B, movementdirection)
- sleep(1)
- step(B, movementdirection)
- sleep(2)
- step(B, movementdirection)
- sleep(2)
- step(B, movementdirection)
- sleep(3)
- step(B, movementdirection)
- sleep(3)
- step(B, movementdirection)
- sleep(3)
- step(B, movementdirection)
-
- else user.newtonian_move(turn(direction, 180))
-
- var/turf/T = get_turf(target)
- var/turf/T1 = get_step(T,turn(direction, 90))
- var/turf/T2 = get_step(T,turn(direction, -90))
- var/list/the_targets = list(T,T1,T2)
- if(precision)
- var/turf/T3 = get_step(T1, turn(direction, 90))
- var/turf/T4 = get_step(T2,turn(direction, -90))
- the_targets = list(T,T1,T2,T3,T4)
-
- for(var/a=0, a<5, a++)
- spawn(0)
- var/obj/effect/particle_effect/water/W = new /obj/effect/particle_effect/water(get_turf(src))
- var/turf/my_target = pick(the_targets)
- if(precision)
- the_targets -= my_target
- var/datum/reagents/R = new/datum/reagents(5)
- if(!W) return
- W.reagents = R
- R.my_atom = W
- if(!W || !src) return
- src.reagents.trans_to(W,1)
- for(var/b=0, bindoctrinate rehabilitate hardened recidivists."
- special_name = "Imprint"
- injection_cooldown = 3000
- auto_inject = FALSE
- auto_replenish = FALSE
- special = TRUE
- var/objective = "Obey the law. Praise Nanotrasen."
- var/custom = FALSE
-
-/obj/machinery/implantchair/brainwash/implant_action(mob/living/C,mob/user)
- if(!istype(C) || !C.mind) // I don't know how this makes any sense for silicons but laws trump objectives anyway.
- return 0
- if(custom)
- if(!user || !user.Adjacent(src))
- return 0
- objective = stripped_input(usr,"What order do you want to imprint on [C]?","Enter the order","",120)
- message_admins("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
- log_game("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
- var/datum/objective/custom_objective = new/datum/objective(objective)
- custom_objective.owner = C.mind
- C.mind.objectives += custom_objective
- C.mind.announce_objectives()
- message_admins("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
- log_game("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
- return 1
-
+/obj/machinery/implantchair
+ name = "mindshield implanter"
+ desc = "Used to implant occupants with mindshield implants."
+ icon = 'icons/obj/machines/implantchair.dmi'
+ icon_state = "implantchair"
+ density = TRUE
+ opacity = 0
+ anchored = TRUE
+
+ var/ready = TRUE
+ var/replenishing = FALSE
+
+ var/ready_implants = 5
+ var/max_implants = 5
+ var/injection_cooldown = 600
+ var/replenish_cooldown = 6000
+ var/implant_type = /obj/item/implant/mindshield
+ var/auto_inject = FALSE
+ var/auto_replenish = TRUE
+ var/special = FALSE
+ var/special_name = "special function"
+ var/message_cooldown
+ var/breakout_time = 600
+
+/obj/machinery/implantchair/Initialize()
+ . = ..()
+ open_machine()
+ update_icon()
+
+
+/obj/machinery/implantchair/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "implantchair", name, 375, 280, master_ui, state)
+ ui.open()
+
+
+/obj/machinery/implantchair/ui_data()
+ var/list/data = list()
+ data["occupied"] = occupant ? 1 : 0
+ data["open"] = state_open
+
+ data["occupant"] = list()
+ if(occupant)
+ var/mob/living/mob_occupant = occupant
+ data["occupant"]["name"] = mob_occupant.name
+ data["occupant"]["stat"] = mob_occupant.stat
+
+ data["special_name"] = special ? special_name : null
+ data["ready_implants"] = ready_implants
+ data["ready"] = ready
+ data["replenishing"] = replenishing
+
+ return data
+
+/obj/machinery/implantchair/ui_act(action, params)
+ if(..())
+ return
+ switch(action)
+ if("door")
+ if(state_open)
+ close_machine()
+ else
+ open_machine()
+ . = TRUE
+ if("implant")
+ implant(occupant,usr)
+ . = TRUE
+
+/obj/machinery/implantchair/proc/implant(mob/living/M,mob/user)
+ if (!istype(M))
+ return
+ if(!ready_implants || !ready)
+ return
+ if(implant_action(M,user))
+ ready_implants--
+ if(!replenishing && auto_replenish)
+ replenishing = TRUE
+ addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
+ if(injection_cooldown > 0)
+ ready = FALSE
+ addtimer(CALLBACK(src,"set_ready"),injection_cooldown)
+ else
+ playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, 1)
+ update_icon()
+
+/obj/machinery/implantchair/proc/implant_action(mob/living/M)
+ 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)
+ if(state_open)
+ icon_state += "_open"
+ if(occupant)
+ icon_state += "_occupied"
+ if(ready)
+ add_overlay("ready")
+ else
+ cut_overlays()
+
+/obj/machinery/implantchair/proc/replenish()
+ if(ready_implants < max_implants)
+ ready_implants++
+ if(ready_implants < max_implants)
+ addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
+ else
+ replenishing = FALSE
+
+/obj/machinery/implantchair/proc/set_ready()
+ ready = TRUE
+ update_icon()
+
+/obj/machinery/implantchair/container_resist(mob/living/user)
+ 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 [DisplayTimeText(breakout_time)].)", \
+ "You hear a metallic creaking from [src].")
+ 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]!", \
+ "You successfully break out of [src]!")
+ open_machine()
+
+/obj/machinery/implantchair/relaymove(mob/user)
+ if(message_cooldown <= world.time)
+ message_cooldown = world.time + 50
+ to_chat(user, "[src]'s door won't budge!")
+
+/obj/machinery/implantchair/MouseDrop_T(mob/target, mob/user)
+ if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !isliving(target) || !user.IsAdvancedToolUser())
+ return
+ close_machine(target)
+
+/obj/machinery/implantchair/close_machine(mob/living/user)
+ if((isnull(user) || istype(user)) && state_open)
+ ..(user)
+ if(auto_inject && ready && ready_implants > 0)
+ implant(user,null)
+
+/obj/machinery/implantchair/genepurge
+ name = "Genetic purifier"
+ desc = "Used to purge human genome of foreign influences"
+ special = TRUE
+ special_name = "Purge genome"
+ injection_cooldown = 0
+ replenish_cooldown = 300
+
+/obj/machinery/implantchair/genepurge/implant_action(mob/living/carbon/human/H,mob/user)
+ if(!istype(H))
+ return 0
+ H.set_species(/datum/species/human, 1)//lizards go home
+ purrbation_remove(H)//remove cats
+ H.dna.remove_all_mutations()//hulks out
+ return 1
+
+
+/obj/machinery/implantchair/brainwash
+ name = "Neural Imprinter"
+ desc = "Used to indoctrinate rehabilitate hardened recidivists."
+ special_name = "Imprint"
+ injection_cooldown = 3000
+ auto_inject = FALSE
+ auto_replenish = FALSE
+ special = TRUE
+ var/objective = "Obey the law. Praise Nanotrasen."
+ var/custom = FALSE
+
+/obj/machinery/implantchair/brainwash/implant_action(mob/living/C,mob/user)
+ if(!istype(C) || !C.mind) // I don't know how this makes any sense for silicons but laws trump objectives anyway.
+ return 0
+ if(custom)
+ if(!user || !user.Adjacent(src))
+ return 0
+ objective = stripped_input(usr,"What order do you want to imprint on [C]?","Enter the order","",120)
+ message_admins("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
+ log_game("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
+ var/datum/objective/custom_objective = new/datum/objective(objective)
+ custom_objective.owner = C.mind
+ C.mind.objectives += custom_objective
+ C.mind.announce_objectives()
+ message_admins("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
+ log_game("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
+ return 1
diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm
index 24b1928dbc..372671acf5 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()
@@ -70,4 +70,4 @@
/obj/item/implanter/emp
name = "implanter (EMP)"
- imp_type = /obj/item/implant/emp
+ imp_type = /obj/item/implant/emp
\ No newline at end of file
diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm
index bc97925c00..a0a493530b 100644
--- a/code/game/objects/items/inducer.dm
+++ b/code/game/objects/items/inducer.dm
@@ -157,7 +157,7 @@
/obj/item/inducer/examine(mob/living/M)
..()
if(cell)
- to_chat(M, "It's display shows: [cell.charge]W")
+ to_chat(M, "It's display shows: [DisplayPower(cell.charge)]")
else
to_chat(M,"It's display is dark.")
if(opened)
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index ccf3f55e83..508e75d8cb 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -1,168 +1,170 @@
-/* Kitchen tools
- * Contains:
- * Fork
- * Kitchen knives
- * Ritual Knife
- * Butcher's cleaver
- * Combat Knife
- * Rolling Pins
- */
-
-/obj/item/kitchen
- icon = 'icons/obj/kitchen.dmi'
- origin_tech = "materials=1"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-
-/obj/item/kitchen/fork
- name = "fork"
- desc = "Pointy."
- icon_state = "fork"
- force = 5
- w_class = WEIGHT_CLASS_TINY
- throwforce = 0
- throw_speed = 3
- throw_range = 5
- materials = list(MAT_METAL=80)
- flags_1 = CONDUCT_1
- attack_verb = list("attacked", "stabbed", "poked")
- hitsound = 'sound/weapons/bladeslice.ogg'
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
- var/datum/reagent/forkload //used to eat omelette
-
-/obj/item/kitchen/fork/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(!istype(M))
- return ..()
-
- if(forkload)
- if(M == user)
- M.visible_message("[user] eats a delicious forkful of omelette!")
- M.reagents.add_reagent(forkload.id, 1)
- else
- M.visible_message("[user] feeds [M] a delicious forkful of omelette!")
- M.reagents.add_reagent(forkload.id, 1)
- icon_state = "fork"
- forkload = null
-
- else if(user.zone_selected == "eyes")
- if(user.disabilities & CLUMSY && prob(50))
- M = user
- return eyestab(M,user)
- else
- return ..()
-
-
-/obj/item/kitchen/knife
- name = "kitchen knife"
- icon_state = "knife"
- desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
- flags_1 = CONDUCT_1
- force = 10
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 10
- hitsound = 'sound/weapons/bladeslice.ogg'
- throw_speed = 3
- throw_range = 6
- materials = list(MAT_METAL=12000)
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- sharpness = IS_SHARP_ACCURATE
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
- var/bayonet = FALSE //Can this be attached to a gun?
-
-/obj/item/kitchen/knife/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(user.zone_selected == "eyes")
- if(user.disabilities & CLUMSY && prob(50))
- M = user
- return eyestab(M,user)
- else
- return ..()
-
-/obj/item/kitchen/knife/suicide_act(mob/user)
- user.visible_message(pick("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \
- "[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \
- "[user] is slitting [user.p_their()] stomach open with the [src.name]! It looks like [user.p_theyre()] trying to commit seppuku."))
- return (BRUTELOSS)
-
-/obj/item/kitchen/knife/ritual
- name = "ritual knife"
- desc = "The unearthly energies that once powered this blade are now dormant."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "render"
- item_state = "knife"
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/kitchen/knife/butcher
- name = "butcher's cleaver"
- icon_state = "butch"
- desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown by-products."
- flags_1 = CONDUCT_1
- force = 15
- throwforce = 10
- materials = list(MAT_METAL=18000)
- attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/kitchen/knife/combat
- name = "combat knife"
- icon_state = "buckknife"
- item_state = "knife"
- desc = "A military combat utility survival knife."
- force = 20
- throwforce = 20
- origin_tech = "materials=3;combat=4"
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
- bayonet = TRUE
-
-/obj/item/kitchen/knife/combat/survival
- name = "survival knife"
- icon_state = "survivalknife"
- item_state = "knife"
- desc = "A hunting grade survival knife."
- force = 15
- throwforce = 15
- bayonet = TRUE
-
-/obj/item/kitchen/knife/combat/bone
- name = "bone dagger"
- item_state = "bone_dagger"
- icon_state = "bone_dagger"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- desc = "A sharpened bone. The bare mimimum in survival."
- force = 15
- throwforce = 15
- materials = list()
-
-/obj/item/kitchen/knife/combat/cyborg
- name = "cyborg knife"
- icon = 'icons/obj/items_cyborg.dmi'
- icon_state = "knife"
- desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
- origin_tech = null
-
-/obj/item/kitchen/knife/carrotshiv
- name = "carrot shiv"
- icon_state = "carrotshiv"
- item_state = "carrotshiv"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- desc = "Unlike other carrots, you should probably keep this far away from your eyes."
- force = 8
- throwforce = 12//fuck git
- materials = list()
- origin_tech = "biotech=3;combat=2"
- attack_verb = list("shanked", "shivved")
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
-
-/obj/item/kitchen/rollingpin
- name = "rolling pin"
- desc = "Used to knock out the Bartender."
- icon_state = "rolling_pin"
- force = 8
- throwforce = 5
- throw_speed = 3
- throw_range = 7
- w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-
-/* Trays moved to /obj/item/storage/bag */
+/* Kitchen tools
+ * Contains:
+ * Fork
+ * Kitchen knives
+ * Ritual Knife
+ * Butcher's cleaver
+ * Combat Knife
+ * Rolling Pins
+ */
+
+/obj/item/kitchen
+ icon = 'icons/obj/kitchen.dmi'
+ origin_tech = "materials=1"
+ lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
+
+/obj/item/kitchen/fork
+ name = "fork"
+ desc = "Pointy."
+ icon_state = "fork"
+ force = 5
+ w_class = WEIGHT_CLASS_TINY
+ throwforce = 0
+ throw_speed = 3
+ throw_range = 5
+ materials = list(MAT_METAL=80)
+ flags_1 = CONDUCT_1
+ attack_verb = list("attacked", "stabbed", "poked")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
+ var/datum/reagent/forkload //used to eat omelette
+
+/obj/item/kitchen/fork/attack(mob/living/carbon/M, mob/living/carbon/user)
+ if(!istype(M))
+ return ..()
+
+ if(forkload)
+ if(M == user)
+ M.visible_message("[user] eats a delicious forkful of omelette!")
+ M.reagents.add_reagent(forkload.id, 1)
+ else
+ M.visible_message("[user] feeds [M] a delicious forkful of omelette!")
+ M.reagents.add_reagent(forkload.id, 1)
+ icon_state = "fork"
+ forkload = null
+
+ else if(user.zone_selected == "eyes")
+ if(user.disabilities & CLUMSY && prob(50))
+ M = user
+ return eyestab(M,user)
+ else
+ return ..()
+
+
+/obj/item/kitchen/knife
+ name = "kitchen knife"
+ icon_state = "knife"
+ desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
+ flags_1 = CONDUCT_1
+ force = 10
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 10
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ throw_speed = 3
+ throw_range = 6
+ materials = list(MAT_METAL=12000)
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ sharpness = IS_SHARP_ACCURATE
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
+ var/bayonet = FALSE //Can this be attached to a gun?
+
+/obj/item/kitchen/knife/attack(mob/living/carbon/M, mob/living/carbon/user)
+ if(user.zone_selected == "eyes")
+ if(user.disabilities & CLUMSY && prob(50))
+ M = user
+ return eyestab(M,user)
+ else
+ return ..()
+
+/obj/item/kitchen/knife/suicide_act(mob/user)
+ user.visible_message(pick("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \
+ "[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \
+ "[user] is slitting [user.p_their()] stomach open with the [src.name]! It looks like [user.p_theyre()] trying to commit seppuku."))
+ return (BRUTELOSS)
+
+/obj/item/kitchen/knife/ritual
+ name = "ritual knife"
+ desc = "The unearthly energies that once powered this blade are now dormant."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "render"
+ item_state = "knife"
+ lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/kitchen/knife/butcher
+ name = "butcher's cleaver"
+ icon_state = "butch"
+ desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown by-products."
+ flags_1 = CONDUCT_1
+ force = 15
+ throwforce = 10
+ materials = list(MAT_METAL=18000)
+ attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/kitchen/knife/combat
+ name = "combat knife"
+ icon_state = "buckknife"
+ item_state = "knife"
+ desc = "A military combat utility survival knife."
+ force = 20
+ throwforce = 20
+ origin_tech = "materials=3;combat=4"
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
+ bayonet = TRUE
+
+/obj/item/kitchen/knife/combat/survival
+ name = "survival knife"
+ icon_state = "survivalknife"
+ item_state = "knife"
+ desc = "A hunting grade survival knife."
+ force = 15
+ throwforce = 15
+ bayonet = TRUE
+
+/obj/item/kitchen/knife/combat/bone
+ name = "bone dagger"
+ item_state = "bone_dagger"
+ icon_state = "bone_dagger"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ desc = "A sharpened bone. The bare mimimum in survival."
+ force = 15
+ throwforce = 15
+ materials = list()
+
+/obj/item/kitchen/knife/combat/cyborg
+ name = "cyborg knife"
+ icon = 'icons/obj/items_cyborg.dmi'
+ icon_state = "knife"
+ desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
+ origin_tech = null
+
+/obj/item/kitchen/knife/carrotshiv
+ name = "carrot shiv"
+ icon_state = "carrotshiv"
+ item_state = "carrotshiv"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ desc = "Unlike other carrots, you should probably keep this far away from your eyes."
+ force = 8
+ throwforce = 12//fuck git
+ materials = list()
+ origin_tech = "biotech=3;combat=2"
+ attack_verb = list("shanked", "shivved")
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+
+/obj/item/kitchen/rollingpin
+ name = "rolling pin"
+ desc = "Used to knock out the Bartender."
+ icon_state = "rolling_pin"
+ force = 8
+ throwforce = 5
+ throw_speed = 3
+ throw_range = 7
+ w_class = WEIGHT_CLASS_NORMAL
+ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+
+/* Trays moved to /obj/item/storage/bag */
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index 7ee1f49a48..c0298d8122 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 @@
}
", src, src.get_amount())
+ var/t1 = text("
", src, get_amount())
for(var/i=1;i<=recipes.len,i++)
var/datum/stack_recipe/R = recipes[i]
if (isnull(R))
@@ -101,7 +102,7 @@
continue
if (i>1 && !isnull(recipes[i-1]))
t1+="
"
- var/max_multiplier = round(src.get_amount() / R.req_amount)
+ var/max_multiplier = round(get_amount() / R.req_amount)
var/title as text
var/can_build = 1
can_build = can_build && (max_multiplier>0)
@@ -109,7 +110,7 @@
title+= "[R.res_amount]x [R.title]\s"
else
title+= "[R.title]"
- title+= " ([R.req_amount] [src.singular_name]\s)"
+ title+= " ([R.req_amount] [singular_name]\s)"
if (can_build)
t1 += text("[] ", src, i, title)
else
@@ -134,7 +135,7 @@
if (usr.restrained() || usr.stat || usr.get_active_held_item() != src)
return
if (href_list["make"])
- if (src.get_amount() < 1) qdel(src) //Never should happen
+ if (get_amount() < 1) qdel(src) //Never should happen
var/datum/stack_recipe/R = recipes[text2num(href_list["make"])]
var/multiplier = text2num(href_list["multiplier"])
@@ -149,7 +150,7 @@
if(!building_checks(R, multiplier))
return
- var/atom/O = new R.result_type( usr.loc )
+ var/obj/O = new R.result_type()
O.setDir(usr.dir)
use(R.req_amount * multiplier)
@@ -168,11 +169,10 @@
new_item.amount = R.res_amount*multiplier
new_item.update_icon()
- if(new_item.amount <= 0)//if the stack is empty, i.e it has been merged with an existing stack and has been garbage collected
- return
-
if (isitem(O))
usr.put_in_hands(O)
+ else
+ O.forceMove(usr.drop_location())
O.add_fingerprint(usr)
//BubbleWrap - so newly formed boxes are empty
@@ -185,7 +185,7 @@
addtimer(CALLBACK(src, /atom/.proc/interact, usr), 0)
/obj/item/stack/proc/building_checks(datum/stack_recipe/R, multiplier)
- if (src.get_amount() < R.req_amount*multiplier)
+ if (get_amount() < R.req_amount*multiplier)
if (R.req_amount*multiplier>1)
to_chat(usr, "You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!")
else
@@ -276,9 +276,9 @@
return
//get amount from user
var/min = 0
- var/max = src.get_amount()
+ var/max = get_amount()
var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max])") as num)
- if(stackmaterial == null || stackmaterial <= min || stackmaterial >= src.get_amount())
+ if(stackmaterial == null || stackmaterial <= min || stackmaterial >= get_amount() || !user.canUseTopic(src))
return
else
change_stack(user,stackmaterial)
@@ -304,10 +304,10 @@
. = ..()
/obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)
- src.blood_DNA = from.blood_DNA
- src.fingerprints = from.fingerprints
- src.fingerprintshidden = from.fingerprintshidden
- src.fingerprintslast = from.fingerprintslast
+ blood_DNA = from.blood_DNA
+ fingerprints = from.fingerprints
+ fingerprintshidden = from.fingerprintshidden
+ fingerprintslast = from.fingerprintslast
//TODO bloody overlay
/obj/item/stack/microwave_act(obj/machinery/microwave/M)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index fe89f42338..3e9231f562 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 8615e1cf8c..638313386e 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -1,381 +1,382 @@
-/*
- * These absorb the functionality of the plant bag, ore satchel, etc.
- * They use the use_to_pickup, quick_gather, and quick_empty functions
- * that were already defined in weapon/storage, but which had been
- * re-implemented in other classes.
- *
- * Contains:
- * Trash Bag
- * Mining Satchel
- * Plant Bag
- * Sheet Snatcher
- * Book Bag
- * Biowaste Bag
- *
- * -Sayu
- */
-
-// Generic non-item
-/obj/item/storage/bag
- allow_quick_gather = 1
- allow_quick_empty = 1
- display_contents_with_number = 1 // should work fine now
- use_to_pickup = 1
- slot_flags = SLOT_BELT
-
-// -----------------------------
-// Trash bag
-// -----------------------------
-/obj/item/storage/bag/trash
- name = "trash bag"
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
- icon = 'icons/obj/janitor.dmi'
- icon_state = "trashbag"
- item_state = "trashbag"
- lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
-
- w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_SMALL
- max_combined_w_class = 30
- storage_slots = 30
- can_hold = list() // any
- cant_hold = list(/obj/item/disk/nuclear)
-
-/obj/item/storage/bag/trash/suicide_act(mob/user)
- user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!")
- playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
- return (TOXLOSS)
-
-/obj/item/storage/bag/trash/update_icon()
- if(contents.len == 0)
- icon_state = "[initial(icon_state)]"
- else if(contents.len < 12)
- icon_state = "[initial(icon_state)]1"
- else if(contents.len < 21)
- icon_state = "[initial(icon_state)]2"
- else icon_state = "[initial(icon_state)]3"
-
-/obj/item/storage/bag/trash/cyborg
-
-/obj/item/storage/bag/trash/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
- J.put_in_cart(src, user)
- J.mybag=src
- J.update_icon()
-
-/obj/item/storage/bag/trash/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
- return
-
-/obj/item/storage/bag/trash/bluespace
- name = "trash bag of holding"
- desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage."
- icon_state = "bluetrashbag"
- origin_tech = "materials=4;bluespace=4;engineering=4;plasmatech=3"
- max_combined_w_class = 60
- storage_slots = 60
-
-// -----------------------------
-// Mining Satchel
-// -----------------------------
-
-/obj/item/storage/bag/ore
- name = "mining satchel"
- desc = "This little bugger can be used to store and transport ores."
- icon = 'icons/obj/mining.dmi'
- icon_state = "satchel"
- origin_tech = "engineering=2"
- slot_flags = SLOT_BELT | SLOT_POCKET
- w_class = WEIGHT_CLASS_NORMAL
- storage_slots = 50
- max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
- max_w_class = WEIGHT_CLASS_NORMAL
- can_hold = list(/obj/item/ore)
- var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
-
-/obj/item/storage/bag/ore/cyborg
- name = "cyborg mining satchel"
-
-/obj/item/storage/bag/ore/holding //miners, your messiah has arrived
- name = "mining satchel of holding"
- desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures."
- storage_slots = INFINITY
- max_combined_w_class = INFINITY
- origin_tech = "bluespace=4;materials=3;engineering=3"
- icon_state = "satchel_bspace"
-
-// -----------------------------
-// Plant bag
-// -----------------------------
-
-/obj/item/storage/bag/plants
- name = "plant bag"
- icon = 'icons/obj/hydroponics/equipment.dmi'
- icon_state = "plantbag"
- storage_slots = 100; //the number of plant pieces it can carry.
- max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
- max_w_class = WEIGHT_CLASS_NORMAL
- w_class = WEIGHT_CLASS_TINY
- can_hold = list(/obj/item/reagent_containers/food/snacks/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb)
- resistance_flags = FLAMMABLE
-
-////////
-
-/obj/item/storage/bag/plants/portaseeder
- name = "portable seed extractor"
- desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
- icon_state = "portaseeder"
- origin_tech = "biotech=3;engineering=2"
-
-/obj/item/storage/bag/plants/portaseeder/verb/dissolve_contents()
- set name = "Activate Seed Extraction"
- set category = "Object"
- set desc = "Activate to convert your plants into plantable seeds."
- if(usr.stat || !usr.canmove || usr.restrained())
- return
- for(var/obj/item/O in contents)
- seedify(O, 1)
- close_all()
-
-
-// -----------------------------
-// Sheet Snatcher
-// -----------------------------
-// Because it stacks stacks, this doesn't operate normally.
-// However, making it a storage/bag allows us to reuse existing code in some places. -Sayu
-
-/obj/item/storage/bag/sheetsnatcher
- name = "sheet snatcher"
- desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
- icon = 'icons/obj/mining.dmi'
- icon_state = "sheetsnatcher"
-
- var/capacity = 300; //the number of sheets it can carry.
- w_class = WEIGHT_CLASS_NORMAL
-
- allow_quick_empty = 1 // this function is superceded
-
-/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W, stop_messages = 0)
- if(!istype(W, /obj/item/stack/sheet) || istype(W, /obj/item/stack/sheet/mineral/sandstone) || istype(W, /obj/item/stack/sheet/mineral/wood))
- if(!stop_messages)
- to_chat(usr, "The snatcher does not accept [W].")
- return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu
- var/current = 0
- for(var/obj/item/stack/sheet/S in contents)
- current += S.amount
- if(capacity == current)//If it's full, you're done
- if(!stop_messages)
- to_chat(usr, "The snatcher is full.")
- return 0
- return 1
-
-
-// Modified handle_item_insertion. Would prefer not to, but...
-/obj/item/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W, prevent_warning = 0)
- var/obj/item/stack/sheet/S = W
- if(!istype(S)) return 0
-
- var/amount
- var/inserted = 0
- var/current = 0
- for(var/obj/item/stack/sheet/S2 in contents)
- current += S2.amount
- if(capacity < current + S.amount)//If the stack will fill it up
- amount = capacity - current
- else
- amount = S.amount
-
- for(var/obj/item/stack/sheet/sheet in contents)
- if(S.type == sheet.type) // we are violating the amount limitation because these are not sane objects
- sheet.amount += amount // they should only be removed through procs in this file, which split them up.
- S.amount -= amount
- inserted = 1
- break
-
- if(!inserted || !S.amount)
- usr.dropItemToGround(S)
- if (usr.client && usr.s_active != src)
- usr.client.screen -= S
- S.dropped(usr)
- if(!S.amount)
- qdel(S)
- else
- if(S.pulledby)
- S.pulledby.stop_pulling()
- S.loc = src
-
- orient2hud(usr)
- if(usr.s_active)
- usr.s_active.show_to(usr)
- update_icon()
- return 1
-
-
-// Sets up numbered display to show the stack size of each stored mineral
-// NOTE: numbered display is turned off currently because it's broken
-/obj/item/storage/bag/sheetsnatcher/orient2hud(mob/user)
- var/adjusted_contents = contents.len
-
- //Numbered contents display
- var/list/datum/numbered_display/numbered_contents
- if(display_contents_with_number)
- numbered_contents = list()
- adjusted_contents = 0
- for(var/obj/item/stack/sheet/I in contents)
- adjusted_contents++
- var/datum/numbered_display/D = new/datum/numbered_display(I)
- D.number = I.amount
- numbered_contents.Add( D )
-
- var/row_num = 0
- var/col_count = min(7,storage_slots) -1
- if (adjusted_contents > 7)
- row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
- src.standard_orient_objs(row_num, col_count, numbered_contents)
- return
-
-
-// Modified quick_empty verb drops appropriate sized stacks
-/obj/item/storage/bag/sheetsnatcher/quick_empty()
- var/location = get_turf(src)
- for(var/obj/item/stack/sheet/S in contents)
- while(S.amount)
- var/obj/item/stack/sheet/N = new S.type(location)
- var/stacksize = min(S.amount,N.max_amount)
- N.amount = stacksize
- S.amount -= stacksize
- if(!S.amount)
- qdel(S)// todo: there's probably something missing here
- orient2hud(usr)
- if(usr.s_active)
- usr.s_active.show_to(usr)
- update_icon()
-
-// Instead of removing
-/obj/item/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W, atom/new_location)
- var/obj/item/stack/sheet/S = W
- if(!istype(S)) return 0
-
- //I would prefer to drop a new stack, but the item/attack_hand code
- // that calls this can't recieve a different object than you clicked on.
- //Therefore, make a new stack internally that has the remainder.
- // -Sayu
-
- if(S.amount > S.max_amount)
- var/obj/item/stack/sheet/temp = new S.type(src)
- temp.amount = S.amount - S.max_amount
- S.amount = S.max_amount
-
- return ..(S,new_location)
-
-// -----------------------------
-// Sheet Snatcher (Cyborg)
-// -----------------------------
-
-/obj/item/storage/bag/sheetsnatcher/borg
- name = "sheet snatcher 9000"
- desc = ""
- capacity = 500//Borgs get more because >specialization
-
-
-// -----------------------------
-// Book bag
-// -----------------------------
-
-/obj/item/storage/bag/books
- name = "book bag"
- desc = "A bag for books."
- icon = 'icons/obj/library.dmi'
- icon_state = "bookbag"
- display_contents_with_number = 0 //This would look really stupid otherwise
- storage_slots = 7
- max_combined_w_class = 21
- max_w_class = WEIGHT_CLASS_NORMAL
- w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
- can_hold = list(/obj/item/book, /obj/item/storage/book, /obj/item/spellbook)
- resistance_flags = FLAMMABLE
-
-/*
- * Trays - Agouri
- */
-/obj/item/storage/bag/tray
- name = "tray"
- icon = 'icons/obj/food/containers.dmi'
- icon_state = "tray"
- desc = "A metal tray to lay food on."
- force = 5
- throwforce = 10
- throw_speed = 3
- throw_range = 5
- w_class = WEIGHT_CLASS_BULKY
- flags_1 = CONDUCT_1
- materials = list(MAT_METAL=3000)
- preposition = "on"
-
-/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
- ..()
- // Drop all the things. All of them.
- var/list/obj/item/oldContents = contents.Copy()
- quick_empty()
-
- // Make each item scatter a bit
- for(var/obj/item/I in oldContents)
- spawn()
- for(var/i = 1, i <= rand(1,2), i++)
- if(I)
- step(I, pick(NORTH,SOUTH,EAST,WEST))
- sleep(rand(2,4))
-
- if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
- else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
-
- if(ishuman(M) || ismonkey(M))
- if(prob(10))
- M.Knockdown(40)
-
-/obj/item/storage/bag/tray/proc/rebuild_overlays()
- cut_overlays()
- for(var/obj/item/I in contents)
- add_overlay(mutable_appearance(I.icon, I.icon_state))
-
-/obj/item/storage/bag/tray/remove_from_storage(obj/item/W as obj, atom/new_location)
- ..()
- rebuild_overlays()
-
-/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0)
- add_overlay(mutable_appearance(I.icon, I.icon_state))
- . = ..()
-
-
-/*
- * Chemistry bag
- */
-
-/obj/item/storage/bag/chemistry
- name = "chemistry bag"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bag"
- desc = "A bag for storing pills, patches, and bottles."
- storage_slots = 50
- max_combined_w_class = 200
- w_class = WEIGHT_CLASS_TINY
- preposition = "in"
- can_hold = list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
- resistance_flags = FLAMMABLE
-
-/*
- * Biowaste bag (mostly for xenobiologists)
- */
-
-/obj/item/storage/bag/bio
- name = "bio bag"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "biobag"
- desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
- storage_slots = 25
- max_combined_w_class = 200
- w_class = WEIGHT_CLASS_TINY
- preposition = "in"
- can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube)
- resistance_flags = FLAMMABLE
+/*
+ * These absorb the functionality of the plant bag, ore satchel, etc.
+ * They use the use_to_pickup, quick_gather, and quick_empty functions
+ * that were already defined in weapon/storage, but which had been
+ * re-implemented in other classes.
+ *
+ * Contains:
+ * Trash Bag
+ * Mining Satchel
+ * Plant Bag
+ * Sheet Snatcher
+ * Book Bag
+ * Biowaste Bag
+ *
+ * -Sayu
+ */
+
+// Generic non-item
+/obj/item/storage/bag
+ allow_quick_gather = 1
+ allow_quick_empty = 1
+ display_contents_with_number = 1 // should work fine now
+ use_to_pickup = 1
+ slot_flags = SLOT_BELT
+
+// -----------------------------
+// Trash bag
+// -----------------------------
+/obj/item/storage/bag/trash
+ name = "trash bag"
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
+ icon = 'icons/obj/janitor.dmi'
+ icon_state = "trashbag"
+ item_state = "trashbag"
+ lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
+
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_SMALL
+ max_combined_w_class = 30
+ storage_slots = 30
+ can_hold = list() // any
+ cant_hold = list(/obj/item/disk/nuclear)
+
+/obj/item/storage/bag/trash/suicide_act(mob/user)
+ user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!")
+ playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
+ return (TOXLOSS)
+
+/obj/item/storage/bag/trash/update_icon()
+ if(contents.len == 0)
+ icon_state = "[initial(icon_state)]"
+ else if(contents.len < 12)
+ icon_state = "[initial(icon_state)]1"
+ else if(contents.len < 21)
+ icon_state = "[initial(icon_state)]2"
+ else icon_state = "[initial(icon_state)]3"
+
+/obj/item/storage/bag/trash/cyborg
+
+/obj/item/storage/bag/trash/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+ J.put_in_cart(src, user)
+ J.mybag=src
+ J.update_icon()
+
+/obj/item/storage/bag/trash/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+ return
+
+/obj/item/storage/bag/trash/bluespace
+ name = "trash bag of holding"
+ desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage."
+ icon_state = "bluetrashbag"
+ 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
+// -----------------------------
+
+/obj/item/storage/bag/ore
+ name = "mining satchel"
+ desc = "This little bugger can be used to store and transport ores."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "satchel"
+ origin_tech = "engineering=2"
+ slot_flags = SLOT_BELT | SLOT_POCKET
+ w_class = WEIGHT_CLASS_NORMAL
+ storage_slots = 50
+ max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
+ max_w_class = WEIGHT_CLASS_NORMAL
+ can_hold = list(/obj/item/ore)
+ var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
+
+/obj/item/storage/bag/ore/cyborg
+ name = "cyborg mining satchel"
+
+/obj/item/storage/bag/ore/holding //miners, your messiah has arrived
+ name = "mining satchel of holding"
+ desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures."
+ storage_slots = INFINITY
+ max_combined_w_class = INFINITY
+ origin_tech = "bluespace=4;materials=3;engineering=3"
+ icon_state = "satchel_bspace"
+
+// -----------------------------
+// Plant bag
+// -----------------------------
+
+/obj/item/storage/bag/plants
+ name = "plant bag"
+ icon = 'icons/obj/hydroponics/equipment.dmi'
+ icon_state = "plantbag"
+ storage_slots = 100; //the number of plant pieces it can carry.
+ max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
+ max_w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_TINY
+ can_hold = list(/obj/item/reagent_containers/food/snacks/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb)
+ resistance_flags = FLAMMABLE
+
+////////
+
+/obj/item/storage/bag/plants/portaseeder
+ name = "portable seed extractor"
+ desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
+ icon_state = "portaseeder"
+ origin_tech = "biotech=3;engineering=2"
+
+/obj/item/storage/bag/plants/portaseeder/verb/dissolve_contents()
+ set name = "Activate Seed Extraction"
+ set category = "Object"
+ set desc = "Activate to convert your plants into plantable seeds."
+ if(usr.stat || !usr.canmove || usr.restrained())
+ return
+ for(var/obj/item/O in contents)
+ seedify(O, 1)
+ close_all()
+
+
+// -----------------------------
+// Sheet Snatcher
+// -----------------------------
+// Because it stacks stacks, this doesn't operate normally.
+// However, making it a storage/bag allows us to reuse existing code in some places. -Sayu
+
+/obj/item/storage/bag/sheetsnatcher
+ name = "sheet snatcher"
+ desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "sheetsnatcher"
+
+ var/capacity = 300; //the number of sheets it can carry.
+ w_class = WEIGHT_CLASS_NORMAL
+
+ allow_quick_empty = 1 // this function is superceded
+
+/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W, stop_messages = 0)
+ if(!istype(W, /obj/item/stack/sheet) || istype(W, /obj/item/stack/sheet/mineral/sandstone) || istype(W, /obj/item/stack/sheet/mineral/wood))
+ if(!stop_messages)
+ to_chat(usr, "The snatcher does not accept [W].")
+ return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu
+ var/current = 0
+ for(var/obj/item/stack/sheet/S in contents)
+ current += S.amount
+ if(capacity == current)//If it's full, you're done
+ if(!stop_messages)
+ to_chat(usr, "The snatcher is full.")
+ return 0
+ return 1
+
+
+// Modified handle_item_insertion. Would prefer not to, but...
+/obj/item/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W, prevent_warning = 0)
+ var/obj/item/stack/sheet/S = W
+ if(!istype(S)) return 0
+
+ var/amount
+ var/inserted = 0
+ var/current = 0
+ for(var/obj/item/stack/sheet/S2 in contents)
+ current += S2.amount
+ if(capacity < current + S.amount)//If the stack will fill it up
+ amount = capacity - current
+ else
+ amount = S.amount
+
+ for(var/obj/item/stack/sheet/sheet in contents)
+ if(S.type == sheet.type) // we are violating the amount limitation because these are not sane objects
+ sheet.amount += amount // they should only be removed through procs in this file, which split them up.
+ S.amount -= amount
+ inserted = 1
+ break
+
+ if(!inserted || !S.amount)
+ usr.dropItemToGround(S)
+ if (usr.client && usr.s_active != src)
+ usr.client.screen -= S
+ S.dropped(usr)
+ if(!S.amount)
+ qdel(S)
+ else
+ if(S.pulledby)
+ S.pulledby.stop_pulling()
+ S.loc = src
+
+ orient2hud(usr)
+ if(usr.s_active)
+ usr.s_active.show_to(usr)
+ update_icon()
+ return 1
+
+
+// Sets up numbered display to show the stack size of each stored mineral
+// NOTE: numbered display is turned off currently because it's broken
+/obj/item/storage/bag/sheetsnatcher/orient2hud(mob/user)
+ var/adjusted_contents = contents.len
+
+ //Numbered contents display
+ var/list/datum/numbered_display/numbered_contents
+ if(display_contents_with_number)
+ numbered_contents = list()
+ adjusted_contents = 0
+ for(var/obj/item/stack/sheet/I in contents)
+ adjusted_contents++
+ var/datum/numbered_display/D = new/datum/numbered_display(I)
+ D.number = I.amount
+ numbered_contents.Add( D )
+
+ var/row_num = 0
+ var/col_count = min(7,storage_slots) -1
+ if (adjusted_contents > 7)
+ row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
+ src.standard_orient_objs(row_num, col_count, numbered_contents)
+ return
+
+
+// Modified quick_empty verb drops appropriate sized stacks
+/obj/item/storage/bag/sheetsnatcher/quick_empty()
+ var/location = get_turf(src)
+ for(var/obj/item/stack/sheet/S in contents)
+ while(S.amount)
+ var/obj/item/stack/sheet/N = new S.type(location)
+ var/stacksize = min(S.amount,N.max_amount)
+ N.amount = stacksize
+ S.amount -= stacksize
+ if(!S.amount)
+ qdel(S)// todo: there's probably something missing here
+ orient2hud(usr)
+ if(usr.s_active)
+ usr.s_active.show_to(usr)
+ update_icon()
+
+// Instead of removing
+/obj/item/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W, atom/new_location)
+ var/obj/item/stack/sheet/S = W
+ if(!istype(S)) return 0
+
+ //I would prefer to drop a new stack, but the item/attack_hand code
+ // that calls this can't recieve a different object than you clicked on.
+ //Therefore, make a new stack internally that has the remainder.
+ // -Sayu
+
+ if(S.amount > S.max_amount)
+ var/obj/item/stack/sheet/temp = new S.type(src)
+ temp.amount = S.amount - S.max_amount
+ S.amount = S.max_amount
+
+ return ..(S,new_location)
+
+// -----------------------------
+// Sheet Snatcher (Cyborg)
+// -----------------------------
+
+/obj/item/storage/bag/sheetsnatcher/borg
+ name = "sheet snatcher 9000"
+ desc = ""
+ capacity = 500//Borgs get more because >specialization
+
+
+// -----------------------------
+// Book bag
+// -----------------------------
+
+/obj/item/storage/bag/books
+ name = "book bag"
+ desc = "A bag for books."
+ icon = 'icons/obj/library.dmi'
+ icon_state = "bookbag"
+ display_contents_with_number = 0 //This would look really stupid otherwise
+ storage_slots = 7
+ max_combined_w_class = 21
+ max_w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
+ can_hold = list(/obj/item/book, /obj/item/storage/book, /obj/item/spellbook)
+ resistance_flags = FLAMMABLE
+
+/*
+ * Trays - Agouri
+ */
+/obj/item/storage/bag/tray
+ name = "tray"
+ icon = 'icons/obj/food/containers.dmi'
+ icon_state = "tray"
+ desc = "A metal tray to lay food on."
+ force = 5
+ throwforce = 10
+ throw_speed = 3
+ throw_range = 5
+ w_class = WEIGHT_CLASS_BULKY
+ flags_1 = CONDUCT_1
+ materials = list(MAT_METAL=3000)
+ preposition = "on"
+
+/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
+ ..()
+ // Drop all the things. All of them.
+ var/list/obj/item/oldContents = contents.Copy()
+ quick_empty()
+
+ // Make each item scatter a bit
+ for(var/obj/item/I in oldContents)
+ spawn()
+ for(var/i = 1, i <= rand(1,2), i++)
+ if(I)
+ step(I, pick(NORTH,SOUTH,EAST,WEST))
+ sleep(rand(2,4))
+
+ if(prob(50))
+ playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
+ else
+ playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
+
+ if(ishuman(M) || ismonkey(M))
+ if(prob(10))
+ M.Knockdown(40)
+
+/obj/item/storage/bag/tray/proc/rebuild_overlays()
+ cut_overlays()
+ for(var/obj/item/I in contents)
+ add_overlay(mutable_appearance(I.icon, I.icon_state))
+
+/obj/item/storage/bag/tray/remove_from_storage(obj/item/W as obj, atom/new_location)
+ ..()
+ rebuild_overlays()
+
+/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0)
+ add_overlay(mutable_appearance(I.icon, I.icon_state))
+ . = ..()
+
+
+/*
+ * Chemistry bag
+ */
+
+/obj/item/storage/bag/chemistry
+ name = "chemistry bag"
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bag"
+ desc = "A bag for storing pills, patches, and bottles."
+ storage_slots = 50
+ max_combined_w_class = 200
+ w_class = WEIGHT_CLASS_TINY
+ preposition = "in"
+ can_hold = list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
+ resistance_flags = FLAMMABLE
+
+/*
+ * Biowaste bag (mostly for xenobiologists)
+ */
+
+/obj/item/storage/bag/bio
+ name = "bio bag"
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "biobag"
+ desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
+ storage_slots = 25
+ max_combined_w_class = 200
+ w_class = WEIGHT_CLASS_TINY
+ preposition = "in"
+ can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube)
+ resistance_flags = FLAMMABLE
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 9a28d6fc13..0266a65723 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -1,522 +1,532 @@
-/obj/item/storage/belt
- name = "belt"
- desc = "Can hold various things."
- icon = 'icons/obj/clothing/belts.dmi'
- icon_state = "utilitybelt"
- item_state = "utility"
- slot_flags = SLOT_BELT
- attack_verb = list("whipped", "lashed", "disciplined")
- max_integrity = 300
- var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
-
-/obj/item/storage/belt/update_icon()
- cut_overlays()
- if(content_overlays)
- for(var/obj/item/I in contents)
- var/mutable_appearance/M = I.get_belt_overlay()
- add_overlay(M)
- ..()
-
-/obj/item/storage/belt/Initialize()
- . = ..()
- update_icon()
-
-/obj/item/storage/belt/utility
- name = "toolbelt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
- desc = "Holds tools."
- icon_state = "utilitybelt"
- item_state = "utility"
- can_hold = list(
- /obj/item/crowbar,
- /obj/item/screwdriver,
- /obj/item/weldingtool,
- /obj/item/wirecutters,
- /obj/item/wrench,
- /obj/item/device/multitool,
- /obj/item/device/flashlight,
- /obj/item/stack/cable_coil,
- /obj/item/device/t_scanner,
- /obj/item/device/analyzer,
- /obj/item/extinguisher/mini,
- /obj/item/device/radio,
- /obj/item/clothing/gloves
- )
- content_overlays = TRUE
-
-/obj/item/storage/belt/utility/chief
- name = "\improper Chief Engineer's toolbelt" //"the Chief Engineer's toolbelt", because "Chief Engineer's toolbelt" is not a proper noun
- desc = "Holds tools, looks snazzy."
- icon_state = "utilitybelt_ce"
- item_state = "utility_ce"
-
-/obj/item/storage/belt/utility/chief/full/PopulateContents()
- new /obj/item/screwdriver/power(src)
- new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much
- new /obj/item/device/multitool(src)
- new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
- new /obj/item/extinguisher/mini(src)
- new /obj/item/device/analyzer(src)
- //much roomier now that we've managed to remove two tools
-
-
-/obj/item/storage/belt/utility/full/PopulateContents()
- new /obj/item/screwdriver(src)
- new /obj/item/wrench(src)
- new /obj/item/weldingtool(src)
- new /obj/item/crowbar(src)
- new /obj/item/wirecutters(src)
- new /obj/item/device/multitool(src)
- new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
-
-/obj/item/storage/belt/utility/full/engi/PopulateContents()
- new /obj/item/screwdriver(src)
- new /obj/item/wrench(src)
- new /obj/item/weldingtool/largetank(src)
- new /obj/item/crowbar(src)
- new /obj/item/wirecutters(src)
- new /obj/item/device/multitool(src)
- new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
-
-
-/obj/item/storage/belt/utility/atmostech/PopulateContents()
- new /obj/item/screwdriver(src)
- new /obj/item/wrench(src)
- new /obj/item/weldingtool(src)
- new /obj/item/crowbar(src)
- new /obj/item/wirecutters(src)
- new /obj/item/device/t_scanner(src)
- new /obj/item/extinguisher/mini(src)
-
-
-
-/obj/item/storage/belt/medical
- name = "medical belt"
- desc = "Can hold various medical equipment."
- icon_state = "medicalbelt"
- item_state = "medical"
- max_w_class = WEIGHT_CLASS_BULKY
- can_hold = list(
- /obj/item/device/healthanalyzer,
- /obj/item/dnainjector,
- /obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/pill,
- /obj/item/reagent_containers/syringe,
- /obj/item/lighter,
- /obj/item/storage/fancy/cigarettes,
- /obj/item/storage/pill_bottle,
- /obj/item/stack/medical,
- /obj/item/device/flashlight/pen,
- /obj/item/extinguisher/mini,
- /obj/item/reagent_containers/hypospray,
- /obj/item/device/sensor_device,
- /obj/item/device/radio,
- /obj/item/clothing/gloves/,
- /obj/item/lazarus_injector,
- /obj/item/bikehorn/rubberducky,
- /obj/item/clothing/mask/surgical,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/breath/medical,
- /obj/item/surgical_drapes, //for true paramedics
- /obj/item/scalpel,
- /obj/item/circular_saw,
- /obj/item/surgicaldrill,
- /obj/item/retractor,
- /obj/item/cautery,
- /obj/item/hemostat,
- /obj/item/device/geiger_counter,
- /obj/item/clothing/neck/stethoscope,
- /obj/item/stamp,
- /obj/item/clothing/glasses,
- /obj/item/wrench/medical,
- /obj/item/clothing/mask/muzzle,
- /obj/item/storage/bag/chemistry,
- /obj/item/storage/bag/bio,
- /obj/item/reagent_containers/blood,
- /obj/item/tank/internals/emergency_oxygen
- )
-
-
-/obj/item/storage/belt/security
- name = "security belt"
- desc = "Can hold security gear like handcuffs and flashes."
- icon_state = "securitybelt"
- item_state = "security"//Could likely use a better one.
- storage_slots = 5
- max_w_class = WEIGHT_CLASS_NORMAL //Because the baton wouldn't fit otherwise. - Neerti
- can_hold = list(
- /obj/item/melee/baton,
- /obj/item/melee/classic_baton,
- /obj/item/grenade,
- /obj/item/reagent_containers/spray/pepper,
- /obj/item/restraints/handcuffs,
- /obj/item/device/assembly/flash/handheld,
- /obj/item/clothing/glasses,
- /obj/item/ammo_casing/shotgun,
- /obj/item/ammo_box,
- /obj/item/reagent_containers/food/snacks/donut,
- /obj/item/reagent_containers/food/snacks/donut/jelly,
- /obj/item/kitchen/knife/combat,
- /obj/item/device/flashlight/seclite,
- /obj/item/melee/classic_baton/telescopic,
- /obj/item/device/radio,
- /obj/item/clothing/gloves/,
- /obj/item/restraints/legcuffs/bola
- )
- content_overlays = TRUE
-
-/obj/item/storage/belt/security/full/PopulateContents()
- new /obj/item/reagent_containers/spray/pepper(src)
- new /obj/item/restraints/handcuffs(src)
- new /obj/item/grenade/flashbang(src)
- new /obj/item/device/assembly/flash/handheld(src)
- new /obj/item/melee/baton/loaded(src)
- update_icon()
-
-
-/obj/item/storage/belt/mining
- name = "explorer's webbing"
- desc = "A versatile chest rig, cherished by miners and hunters alike."
- icon_state = "explorer1"
- item_state = "explorer1"
- storage_slots = 6
- w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_BULKY //Pickaxes are big.
- max_combined_w_class = 20 //Not an issue with this whitelist, probably.
- can_hold = list(
- /obj/item/crowbar,
- /obj/item/screwdriver,
- /obj/item/weldingtool,
- /obj/item/wirecutters,
- /obj/item/wrench,
- /obj/item/device/flashlight,
- /obj/item/stack/cable_coil,
- /obj/item/device/analyzer,
- /obj/item/extinguisher/mini,
- /obj/item/device/radio,
- /obj/item/clothing/gloves,
- /obj/item/resonator,
- /obj/item/device/mining_scanner,
- /obj/item/pickaxe,
- /obj/item/stack/sheet/animalhide,
- /obj/item/stack/sheet/sinew,
- /obj/item/stack/sheet/bone,
- /obj/item/lighter,
- /obj/item/storage/fancy/cigarettes,
- /obj/item/reagent_containers/food/drinks/bottle,
- /obj/item/stack/medical,
- /obj/item/kitchen/knife,
- /obj/item/reagent_containers/hypospray,
- /obj/item/device/gps,
- /obj/item/storage/bag/ore,
- /obj/item/survivalcapsule,
- /obj/item/device/t_scanner/adv_mining_scanner,
- /obj/item/reagent_containers/pill,
- /obj/item/storage/pill_bottle,
- /obj/item/ore,
- /obj/item/reagent_containers/food/drinks,
- /obj/item/organ/regenerative_core,
- /obj/item/device/wormhole_jaunter,
- /obj/item/storage/bag/plants,
- /obj/item/stack/marker_beacon
- )
-
-
-/obj/item/storage/belt/mining/vendor
- contents = newlist(/obj/item/survivalcapsule)
-
-/obj/item/storage/belt/mining/alt
- icon_state = "explorer2"
- item_state = "explorer2"
-
-/obj/item/storage/belt/mining/primitive
- name = "hunter's belt"
- desc = "A versatile belt, woven from sinew."
- storage_slots = 5
- icon_state = "ebelt"
- item_state = "ebelt"
-
-/obj/item/storage/belt/soulstone
- name = "soul stone belt"
- desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
- icon_state = "soulstonebelt"
- item_state = "soulstonebelt"
- storage_slots = 6
- can_hold = list(
- /obj/item/device/soulstone
- )
-
-/obj/item/storage/belt/soulstone/full/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/device/soulstone(src)
-
-/obj/item/storage/belt/champion
- name = "championship belt"
- desc = "Proves to the world that you are the strongest!"
- icon_state = "championbelt"
- item_state = "champion"
- materials = list(MAT_GOLD=400)
- storage_slots = 1
- can_hold = list(
- /obj/item/clothing/mask/luchador
- )
-
-/obj/item/storage/belt/military
- name = "chest rig"
- desc = "A set of tactical webbing worn by Syndicate boarding parties."
- icon_state = "militarywebbing"
- item_state = "militarywebbing"
- max_w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/storage/belt/military/abductor
- name = "agent belt"
- desc = "A belt used by abductor agents."
- icon = 'icons/obj/abductor.dmi'
- icon_state = "belt"
- item_state = "security"
-
-/obj/item/storage/belt/military/abductor/full/PopulateContents()
- new /obj/item/screwdriver/abductor(src)
- new /obj/item/wrench/abductor(src)
- new /obj/item/weldingtool/abductor(src)
- new /obj/item/crowbar/abductor(src)
- new /obj/item/wirecutters/abductor(src)
- new /obj/item/device/multitool/abductor(src)
- new /obj/item/stack/cable_coil(src,30,"white")
-
-
-/obj/item/storage/belt/military/army
- name = "army belt"
- desc = "A belt used by military forces."
- icon_state = "grenadebeltold"
- item_state = "security"
-
-/obj/item/storage/belt/military/assault
- name = "assault belt"
- desc = "A tactical assault belt."
- icon_state = "assaultbelt"
- item_state = "security"
- storage_slots = 6
-
-/obj/item/storage/belt/grenade
- name = "grenadier belt"
- desc = "A belt for holding grenades."
- icon_state = "grenadebeltnew"
- item_state = "security"
- max_w_class = WEIGHT_CLASS_BULKY
- display_contents_with_number = TRUE
- storage_slots = 30
- max_combined_w_class = 60 //needs to be this high
- can_hold = list(
- /obj/item/grenade,
- /obj/item/screwdriver,
- /obj/item/lighter,
- /obj/item/device/multitool,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
- /obj/item/grenade/plastic/c4,
- )
-/obj/item/storage/belt/grenade/full/PopulateContents()
- new /obj/item/grenade/flashbang(src)
- new /obj/item/grenade/smokebomb(src)
- new /obj/item/grenade/smokebomb(src)
- new /obj/item/grenade/smokebomb(src)
- new /obj/item/grenade/smokebomb(src)
- new /obj/item/grenade/empgrenade(src)
- new /obj/item/grenade/empgrenade(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/gluon(src)
- new /obj/item/grenade/gluon(src)
- new /obj/item/grenade/gluon(src)
- new /obj/item/grenade/gluon(src)
- new /obj/item/grenade/chem_grenade/incendiary(src)
- new /obj/item/grenade/chem_grenade/incendiary(src)
- new /obj/item/grenade/chem_grenade/facid(src)
- new /obj/item/grenade/syndieminibomb(src)
- new /obj/item/grenade/syndieminibomb(src)
- new /obj/item/screwdriver(src)
- new /obj/item/device/multitool(src)
-
-/obj/item/storage/belt/wands
- name = "wand belt"
- desc = "A belt designed to hold various rods of power. A veritable fanny pack of exotic magic."
- icon_state = "soulstonebelt"
- item_state = "soulstonebelt"
- storage_slots = 6
- can_hold = list(
- /obj/item/gun/magic/wand
- )
-
-/obj/item/storage/belt/wands/full/PopulateContents()
- new /obj/item/gun/magic/wand/death(src)
- new /obj/item/gun/magic/wand/resurrection(src)
- new /obj/item/gun/magic/wand/polymorph(src)
- new /obj/item/gun/magic/wand/teleport(src)
- new /obj/item/gun/magic/wand/door(src)
- new /obj/item/gun/magic/wand/fireball(src)
-
- for(var/obj/item/gun/magic/wand/W in contents) //All wands in this pack come in the best possible condition
- W.max_charges = initial(W.max_charges)
- W.charges = W.max_charges
-
-/obj/item/storage/belt/janitor
- name = "janibelt"
- desc = "A belt used to hold most janitorial supplies."
- icon_state = "janibelt"
- item_state = "janibelt"
- storage_slots = 6
- max_w_class = WEIGHT_CLASS_BULKY // Set to this so the light replacer can fit.
- can_hold = list(
- /obj/item/grenade/chem_grenade,
- /obj/item/device/lightreplacer,
- /obj/item/device/flashlight,
- /obj/item/reagent_containers/spray,
- /obj/item/soap,
- /obj/item/holosign_creator,
- /obj/item/key/janitor,
- /obj/item/clothing/gloves
- )
-
-/obj/item/storage/belt/bandolier
- name = "bandolier"
- desc = "A bandolier for holding shotgun ammunition."
- icon_state = "bandolier"
- item_state = "bandolier"
- storage_slots = 18
- display_contents_with_number = TRUE
- can_hold = list(
- /obj/item/ammo_casing/shotgun
- )
-
-/obj/item/storage/belt/holster
- name = "shoulder holster"
- desc = "A holster to carry a handgun and ammo. WARNING: Badasses only."
- icon_state = "holster"
- item_state = "holster"
- storage_slots = 3
- max_w_class = WEIGHT_CLASS_NORMAL
- can_hold = list(
- /obj/item/gun/ballistic/automatic/pistol,
- /obj/item/gun/ballistic/revolver,
- /obj/item/ammo_box,
- )
- alternate_worn_layer = UNDER_SUIT_LAYER
-
-/obj/item/storage/belt/holster/full/PopulateContents()
- new /obj/item/gun/ballistic/revolver/detective(src)
- new /obj/item/ammo_box/c38(src)
- new /obj/item/ammo_box/c38(src)
-
-/obj/item/storage/belt/fannypack
- name = "fannypack"
- desc = "A dorky fannypack for keeping small items in."
- icon_state = "fannypack_leather"
- item_state = "fannypack_leather"
- storage_slots = 3
- max_w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/storage/belt/fannypack/black
- name = "black fannypack"
- icon_state = "fannypack_black"
- item_state = "fannypack_black"
-
-/obj/item/storage/belt/fannypack/red
- name = "red fannypack"
- icon_state = "fannypack_red"
- item_state = "fannypack_red"
-
-/obj/item/storage/belt/fannypack/purple
- name = "purple fannypack"
- icon_state = "fannypack_purple"
- item_state = "fannypack_purple"
-
-/obj/item/storage/belt/fannypack/blue
- name = "blue fannypack"
- icon_state = "fannypack_blue"
- item_state = "fannypack_blue"
-
-/obj/item/storage/belt/fannypack/orange
- name = "orange fannypack"
- icon_state = "fannypack_orange"
- item_state = "fannypack_orange"
-
-/obj/item/storage/belt/fannypack/white
- name = "white fannypack"
- icon_state = "fannypack_white"
- item_state = "fannypack_white"
-
-/obj/item/storage/belt/fannypack/green
- name = "green fannypack"
- icon_state = "fannypack_green"
- item_state = "fannypack_green"
-
-/obj/item/storage/belt/fannypack/pink
- name = "pink fannypack"
- icon_state = "fannypack_pink"
- item_state = "fannypack_pink"
-
-/obj/item/storage/belt/fannypack/cyan
- name = "cyan fannypack"
- icon_state = "fannypack_cyan"
- item_state = "fannypack_cyan"
-
-/obj/item/storage/belt/fannypack/yellow
- name = "yellow fannypack"
- icon_state = "fannypack_yellow"
- item_state = "fannypack_yellow"
-
-/obj/item/storage/belt/sabre
- name = "sabre sheath"
- desc = "An ornate sheath designed to hold an officer's blade."
- icon_state = "sheath"
- item_state = "sheath"
- storage_slots = 1
- rustle_jimmies = FALSE
- w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_BULKY
- can_hold = list(
- /obj/item/melee/sabre
- )
-
-/obj/item/storage/belt/sabre/examine(mob/user)
- ..()
- if(contents.len)
- to_chat(user, "Alt-click it to quickly draw the blade.")
-
-/obj/item/storage/belt/sabre/AltClick(mob/user)
- if(!ishuman(user) || !user.canUseTopic(src, be_close=TRUE))
- return
- if(contents.len)
- var/obj/item/I = contents[1]
- user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\
- )
- user.put_in_hands(I)
- update_icon()
- else
- to_chat(user, "[src] is empty.")
-
-/obj/item/storage/belt/sabre/update_icon()
- icon_state = "sheath"
- item_state = "sheath"
- if(contents.len)
- icon_state += "-sabre"
- item_state += "-sabre"
- if(loc && isliving(loc))
- var/mob/living/L = loc
- L.regenerate_icons()
- ..()
-
-
-/obj/item/storage/belt/sabre/PopulateContents()
- new /obj/item/melee/sabre(src)
- update_icon()
+/obj/item/storage/belt
+ name = "belt"
+ desc = "Can hold various things."
+ icon = 'icons/obj/clothing/belts.dmi'
+ icon_state = "utilitybelt"
+ item_state = "utility"
+ slot_flags = SLOT_BELT
+ attack_verb = list("whipped", "lashed", "disciplined")
+ max_integrity = 300
+ var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
+
+/obj/item/storage/belt/update_icon()
+ cut_overlays()
+ if(content_overlays)
+ for(var/obj/item/I in contents)
+ var/mutable_appearance/M = I.get_belt_overlay()
+ add_overlay(M)
+ ..()
+
+/obj/item/storage/belt/Initialize()
+ . = ..()
+ update_icon()
+
+/obj/item/storage/belt/utility
+ name = "toolbelt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
+ desc = "Holds tools."
+ icon_state = "utilitybelt"
+ item_state = "utility"
+ can_hold = list(
+ /obj/item/crowbar,
+ /obj/item/screwdriver,
+ /obj/item/weldingtool,
+ /obj/item/wirecutters,
+ /obj/item/wrench,
+ /obj/item/device/multitool,
+ /obj/item/device/flashlight,
+ /obj/item/stack/cable_coil,
+ /obj/item/device/t_scanner,
+ /obj/item/device/analyzer,
+ /obj/item/extinguisher/mini,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves
+ )
+ content_overlays = TRUE
+
+/obj/item/storage/belt/utility/chief
+ name = "\improper Chief Engineer's toolbelt" //"the Chief Engineer's toolbelt", because "Chief Engineer's toolbelt" is not a proper noun
+ desc = "Holds tools, looks snazzy."
+ icon_state = "utilitybelt_ce"
+ item_state = "utility_ce"
+
+/obj/item/storage/belt/utility/chief/full/PopulateContents()
+ new /obj/item/screwdriver/power(src)
+ new /obj/item/crowbar/power(src)
+ new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much
+ new /obj/item/device/multitool(src)
+ new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
+ new /obj/item/extinguisher/mini(src)
+ new /obj/item/device/analyzer(src)
+ //much roomier now that we've managed to remove two tools
+
+
+/obj/item/storage/belt/utility/full/PopulateContents()
+ new /obj/item/screwdriver(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/wirecutters(src)
+ new /obj/item/device/multitool(src)
+ new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
+
+/obj/item/storage/belt/utility/full/engi/PopulateContents()
+ new /obj/item/screwdriver(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool/largetank(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/wirecutters(src)
+ new /obj/item/device/multitool(src)
+ new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
+
+
+/obj/item/storage/belt/utility/atmostech/PopulateContents()
+ new /obj/item/screwdriver(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/wirecutters(src)
+ 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
+ name = "medical belt"
+ desc = "Can hold various medical equipment."
+ icon_state = "medicalbelt"
+ item_state = "medical"
+ max_w_class = WEIGHT_CLASS_BULKY
+ can_hold = list(
+ /obj/item/device/healthanalyzer,
+ /obj/item/dnainjector,
+ /obj/item/reagent_containers/dropper,
+ /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/pill,
+ /obj/item/reagent_containers/syringe,
+ /obj/item/lighter,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/storage/pill_bottle,
+ /obj/item/stack/medical,
+ /obj/item/device/flashlight/pen,
+ /obj/item/extinguisher/mini,
+ /obj/item/reagent_containers/hypospray,
+ /obj/item/device/sensor_device,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves/,
+ /obj/item/lazarus_injector,
+ /obj/item/bikehorn/rubberducky,
+ /obj/item/clothing/mask/surgical,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/mask/breath/medical,
+ /obj/item/surgical_drapes, //for true paramedics
+ /obj/item/scalpel,
+ /obj/item/circular_saw,
+ /obj/item/surgicaldrill,
+ /obj/item/retractor,
+ /obj/item/cautery,
+ /obj/item/hemostat,
+ /obj/item/device/geiger_counter,
+ /obj/item/clothing/neck/stethoscope,
+ /obj/item/stamp,
+ /obj/item/clothing/glasses,
+ /obj/item/wrench/medical,
+ /obj/item/clothing/mask/muzzle,
+ /obj/item/storage/bag/chemistry,
+ /obj/item/storage/bag/bio,
+ /obj/item/reagent_containers/blood,
+ /obj/item/tank/internals/emergency_oxygen
+ )
+
+
+/obj/item/storage/belt/security
+ name = "security belt"
+ desc = "Can hold security gear like handcuffs and flashes."
+ icon_state = "securitybelt"
+ item_state = "security"//Could likely use a better one.
+ storage_slots = 5
+ max_w_class = WEIGHT_CLASS_NORMAL //Because the baton wouldn't fit otherwise. - Neerti
+ can_hold = list(
+ /obj/item/melee/baton,
+ /obj/item/melee/classic_baton,
+ /obj/item/grenade,
+ /obj/item/reagent_containers/spray/pepper,
+ /obj/item/restraints/handcuffs,
+ /obj/item/device/assembly/flash/handheld,
+ /obj/item/clothing/glasses,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_box,
+ /obj/item/reagent_containers/food/snacks/donut,
+ /obj/item/reagent_containers/food/snacks/donut/jelly,
+ /obj/item/kitchen/knife/combat,
+ /obj/item/device/flashlight/seclite,
+ /obj/item/melee/classic_baton/telescopic,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves/,
+ /obj/item/restraints/legcuffs/bola
+ )
+ content_overlays = TRUE
+
+/obj/item/storage/belt/security/full/PopulateContents()
+ new /obj/item/reagent_containers/spray/pepper(src)
+ new /obj/item/restraints/handcuffs(src)
+ new /obj/item/grenade/flashbang(src)
+ new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/melee/baton/loaded(src)
+ update_icon()
+
+
+/obj/item/storage/belt/mining
+ name = "explorer's webbing"
+ desc = "A versatile chest rig, cherished by miners and hunters alike."
+ icon_state = "explorer1"
+ item_state = "explorer1"
+ storage_slots = 6
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_BULKY //Pickaxes are big.
+ max_combined_w_class = 20 //Not an issue with this whitelist, probably.
+ can_hold = list(
+ /obj/item/crowbar,
+ /obj/item/screwdriver,
+ /obj/item/weldingtool,
+ /obj/item/wirecutters,
+ /obj/item/wrench,
+ /obj/item/device/flashlight,
+ /obj/item/stack/cable_coil,
+ /obj/item/device/analyzer,
+ /obj/item/extinguisher/mini,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves,
+ /obj/item/resonator,
+ /obj/item/device/mining_scanner,
+ /obj/item/pickaxe,
+ /obj/item/stack/sheet/animalhide,
+ /obj/item/stack/sheet/sinew,
+ /obj/item/stack/sheet/bone,
+ /obj/item/lighter,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/reagent_containers/food/drinks/bottle,
+ /obj/item/stack/medical,
+ /obj/item/kitchen/knife,
+ /obj/item/reagent_containers/hypospray,
+ /obj/item/device/gps,
+ /obj/item/storage/bag/ore,
+ /obj/item/survivalcapsule,
+ /obj/item/device/t_scanner/adv_mining_scanner,
+ /obj/item/reagent_containers/pill,
+ /obj/item/storage/pill_bottle,
+ /obj/item/ore,
+ /obj/item/reagent_containers/food/drinks,
+ /obj/item/organ/regenerative_core,
+ /obj/item/device/wormhole_jaunter,
+ /obj/item/storage/bag/plants,
+ /obj/item/stack/marker_beacon
+ )
+
+
+/obj/item/storage/belt/mining/vendor
+ contents = newlist(/obj/item/survivalcapsule)
+
+/obj/item/storage/belt/mining/alt
+ icon_state = "explorer2"
+ item_state = "explorer2"
+
+/obj/item/storage/belt/mining/primitive
+ name = "hunter's belt"
+ desc = "A versatile belt, woven from sinew."
+ storage_slots = 5
+ icon_state = "ebelt"
+ item_state = "ebelt"
+
+/obj/item/storage/belt/soulstone
+ name = "soul stone belt"
+ desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
+ icon_state = "soulstonebelt"
+ item_state = "soulstonebelt"
+ storage_slots = 6
+ can_hold = list(
+ /obj/item/device/soulstone
+ )
+
+/obj/item/storage/belt/soulstone/full/PopulateContents()
+ for(var/i in 1 to 6)
+ new /obj/item/device/soulstone(src)
+
+/obj/item/storage/belt/champion
+ name = "championship belt"
+ desc = "Proves to the world that you are the strongest!"
+ icon_state = "championbelt"
+ item_state = "champion"
+ materials = list(MAT_GOLD=400)
+ storage_slots = 1
+ can_hold = list(
+ /obj/item/clothing/mask/luchador
+ )
+
+/obj/item/storage/belt/military
+ name = "chest rig"
+ desc = "A set of tactical webbing worn by Syndicate boarding parties."
+ icon_state = "militarywebbing"
+ item_state = "militarywebbing"
+ max_w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/storage/belt/military/abductor
+ name = "agent belt"
+ desc = "A belt used by abductor agents."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "belt"
+ item_state = "security"
+
+/obj/item/storage/belt/military/abductor/full/PopulateContents()
+ new /obj/item/screwdriver/abductor(src)
+ new /obj/item/wrench/abductor(src)
+ new /obj/item/weldingtool/abductor(src)
+ new /obj/item/crowbar/abductor(src)
+ new /obj/item/wirecutters/abductor(src)
+ new /obj/item/device/multitool/abductor(src)
+ new /obj/item/stack/cable_coil(src,30,"white")
+
+
+/obj/item/storage/belt/military/army
+ name = "army belt"
+ desc = "A belt used by military forces."
+ icon_state = "grenadebeltold"
+ item_state = "security"
+
+/obj/item/storage/belt/military/assault
+ name = "assault belt"
+ desc = "A tactical assault belt."
+ icon_state = "assaultbelt"
+ item_state = "security"
+ storage_slots = 6
+
+/obj/item/storage/belt/grenade
+ name = "grenadier belt"
+ desc = "A belt for holding grenades."
+ icon_state = "grenadebeltnew"
+ item_state = "security"
+ max_w_class = WEIGHT_CLASS_BULKY
+ display_contents_with_number = TRUE
+ storage_slots = 30
+ max_combined_w_class = 60 //needs to be this high
+ can_hold = list(
+ /obj/item/grenade,
+ /obj/item/screwdriver,
+ /obj/item/lighter,
+ /obj/item/device/multitool,
+ /obj/item/reagent_containers/food/drinks/bottle/molotov,
+ /obj/item/grenade/plastic/c4,
+ )
+/obj/item/storage/belt/grenade/full/PopulateContents()
+ new /obj/item/grenade/flashbang(src)
+ new /obj/item/grenade/smokebomb(src)
+ new /obj/item/grenade/smokebomb(src)
+ new /obj/item/grenade/smokebomb(src)
+ new /obj/item/grenade/smokebomb(src)
+ new /obj/item/grenade/empgrenade(src)
+ new /obj/item/grenade/empgrenade(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/gluon(src)
+ new /obj/item/grenade/gluon(src)
+ new /obj/item/grenade/gluon(src)
+ new /obj/item/grenade/gluon(src)
+ new /obj/item/grenade/chem_grenade/incendiary(src)
+ new /obj/item/grenade/chem_grenade/incendiary(src)
+ new /obj/item/grenade/chem_grenade/facid(src)
+ new /obj/item/grenade/syndieminibomb(src)
+ new /obj/item/grenade/syndieminibomb(src)
+ new /obj/item/screwdriver(src)
+ new /obj/item/device/multitool(src)
+
+/obj/item/storage/belt/wands
+ name = "wand belt"
+ desc = "A belt designed to hold various rods of power. A veritable fanny pack of exotic magic."
+ icon_state = "soulstonebelt"
+ item_state = "soulstonebelt"
+ storage_slots = 6
+ can_hold = list(
+ /obj/item/gun/magic/wand
+ )
+
+/obj/item/storage/belt/wands/full/PopulateContents()
+ new /obj/item/gun/magic/wand/death(src)
+ new /obj/item/gun/magic/wand/resurrection(src)
+ new /obj/item/gun/magic/wand/polymorph(src)
+ new /obj/item/gun/magic/wand/teleport(src)
+ new /obj/item/gun/magic/wand/door(src)
+ new /obj/item/gun/magic/wand/fireball(src)
+
+ for(var/obj/item/gun/magic/wand/W in contents) //All wands in this pack come in the best possible condition
+ W.max_charges = initial(W.max_charges)
+ W.charges = W.max_charges
+
+/obj/item/storage/belt/janitor
+ name = "janibelt"
+ desc = "A belt used to hold most janitorial supplies."
+ icon_state = "janibelt"
+ item_state = "janibelt"
+ storage_slots = 6
+ max_w_class = WEIGHT_CLASS_BULKY // Set to this so the light replacer can fit.
+ can_hold = list(
+ /obj/item/grenade/chem_grenade,
+ /obj/item/device/lightreplacer,
+ /obj/item/device/flashlight,
+ /obj/item/reagent_containers/spray,
+ /obj/item/soap,
+ /obj/item/holosign_creator,
+ /obj/item/key/janitor,
+ /obj/item/clothing/gloves
+ )
+
+/obj/item/storage/belt/bandolier
+ name = "bandolier"
+ desc = "A bandolier for holding shotgun ammunition."
+ icon_state = "bandolier"
+ item_state = "bandolier"
+ storage_slots = 18
+ display_contents_with_number = TRUE
+ can_hold = list(
+ /obj/item/ammo_casing/shotgun
+ )
+
+/obj/item/storage/belt/holster
+ name = "shoulder holster"
+ desc = "A holster to carry a handgun and ammo. WARNING: Badasses only."
+ icon_state = "holster"
+ item_state = "holster"
+ storage_slots = 3
+ max_w_class = WEIGHT_CLASS_NORMAL
+ can_hold = list(
+ /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/revolver,
+ /obj/item/ammo_box,
+ )
+ alternate_worn_layer = UNDER_SUIT_LAYER
+
+/obj/item/storage/belt/holster/full/PopulateContents()
+ new /obj/item/gun/ballistic/revolver/detective(src)
+ new /obj/item/ammo_box/c38(src)
+ new /obj/item/ammo_box/c38(src)
+
+/obj/item/storage/belt/fannypack
+ name = "fannypack"
+ desc = "A dorky fannypack for keeping small items in."
+ icon_state = "fannypack_leather"
+ item_state = "fannypack_leather"
+ storage_slots = 3
+ max_w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/storage/belt/fannypack/black
+ name = "black fannypack"
+ icon_state = "fannypack_black"
+ item_state = "fannypack_black"
+
+/obj/item/storage/belt/fannypack/red
+ name = "red fannypack"
+ icon_state = "fannypack_red"
+ item_state = "fannypack_red"
+
+/obj/item/storage/belt/fannypack/purple
+ name = "purple fannypack"
+ icon_state = "fannypack_purple"
+ item_state = "fannypack_purple"
+
+/obj/item/storage/belt/fannypack/blue
+ name = "blue fannypack"
+ icon_state = "fannypack_blue"
+ item_state = "fannypack_blue"
+
+/obj/item/storage/belt/fannypack/orange
+ name = "orange fannypack"
+ icon_state = "fannypack_orange"
+ item_state = "fannypack_orange"
+
+/obj/item/storage/belt/fannypack/white
+ name = "white fannypack"
+ icon_state = "fannypack_white"
+ item_state = "fannypack_white"
+
+/obj/item/storage/belt/fannypack/green
+ name = "green fannypack"
+ icon_state = "fannypack_green"
+ item_state = "fannypack_green"
+
+/obj/item/storage/belt/fannypack/pink
+ name = "pink fannypack"
+ icon_state = "fannypack_pink"
+ item_state = "fannypack_pink"
+
+/obj/item/storage/belt/fannypack/cyan
+ name = "cyan fannypack"
+ icon_state = "fannypack_cyan"
+ item_state = "fannypack_cyan"
+
+/obj/item/storage/belt/fannypack/yellow
+ name = "yellow fannypack"
+ icon_state = "fannypack_yellow"
+ item_state = "fannypack_yellow"
+
+/obj/item/storage/belt/sabre
+ name = "sabre sheath"
+ desc = "An ornate sheath designed to hold an officer's blade."
+ icon_state = "sheath"
+ item_state = "sheath"
+ storage_slots = 1
+ rustle_jimmies = FALSE
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_BULKY
+ can_hold = list(
+ /obj/item/melee/sabre
+ )
+
+/obj/item/storage/belt/sabre/examine(mob/user)
+ ..()
+ if(contents.len)
+ to_chat(user, "Alt-click it to quickly draw the blade.")
+
+/obj/item/storage/belt/sabre/AltClick(mob/user)
+ if(!ishuman(user) || !user.canUseTopic(src, be_close=TRUE))
+ return
+ if(contents.len)
+ var/obj/item/I = contents[1]
+ user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\
+ )
+ user.put_in_hands(I)
+ update_icon()
+ else
+ to_chat(user, "[src] is empty.")
+
+/obj/item/storage/belt/sabre/update_icon()
+ icon_state = "sheath"
+ item_state = "sheath"
+ if(contents.len)
+ icon_state += "-sabre"
+ item_state += "-sabre"
+ if(loc && isliving(loc))
+ var/mob/living/L = loc
+ L.regenerate_icons()
+ ..()
+
+
+/obj/item/storage/belt/sabre/PopulateContents()
+ new /obj/item/melee/sabre(src)
+ update_icon()
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index cc60c9ba9c..489f1c6bf0 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -731,17 +731,18 @@
/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
name = "ingredients box"
- illustration = "donk_kit"
+ illustration = "fruit"
+ var/theme_name
/obj/item/storage/box/ingredients/Initialize()
- ..()
- if(icon_state)
- name = "[name] ([icon_state])"
- desc = "A box containing supplementary ingredients for the aspiring chef. This box's theme is '[icon_state]'."
+ . = ..()
+ if(theme_name)
+ name = "[name] ([theme_name])"
+ desc = "A box containing supplementary ingredients for the aspiring chef. The box's theme is '[theme_name]'."
item_state = "syringe_kit"
/obj/item/storage/box/ingredients/wildcard
- icon_state = "wildcard"
+ theme_name = "wildcard"
/obj/item/storage/box/ingredients/wildcard/PopulateContents()
for(var/i in 1 to 7)
@@ -762,7 +763,7 @@
new randomFood(src)
/obj/item/storage/box/ingredients/fiesta
- icon_state = "fiesta"
+ theme_name = "fiesta"
/obj/item/storage/box/ingredients/fiesta/PopulateContents()
new /obj/item/reagent_containers/food/snacks/tortilla(src)
@@ -772,7 +773,7 @@
new /obj/item/reagent_containers/food/snacks/grown/chili(src)
/obj/item/storage/box/ingredients/italian
- icon_state = "italian"
+ theme_name = "italian"
/obj/item/storage/box/ingredients/italian/PopulateContents()
for(var/i in 1 to 3)
@@ -781,7 +782,7 @@
new /obj/item/reagent_containers/food/drinks/bottle/wine(src)
/obj/item/storage/box/ingredients/vegetarian
- icon_state = "vegetarian"
+ theme_name = "vegetarian"
/obj/item/storage/box/ingredients/vegetarian/PopulateContents()
for(var/i in 1 to 2)
@@ -793,7 +794,7 @@
new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
/obj/item/storage/box/ingredients/american
- icon_state = "american"
+ theme_name = "american"
/obj/item/storage/box/ingredients/american/PopulateContents()
for(var/i in 1 to 2)
@@ -803,7 +804,7 @@
new /obj/item/reagent_containers/food/snacks/faggot(src)
/obj/item/storage/box/ingredients/fruity
- icon_state = "fruity"
+ theme_name = "fruity"
/obj/item/storage/box/ingredients/fruity/PopulateContents()
for(var/i in 1 to 2)
@@ -814,7 +815,7 @@
new /obj/item/reagent_containers/food/snacks/grown/watermelon(src)
/obj/item/storage/box/ingredients/sweets
- icon_state = "sweets"
+ theme_name = "sweets"
/obj/item/storage/box/ingredients/sweets/PopulateContents()
for(var/i in 1 to 2)
@@ -825,7 +826,7 @@
new /obj/item/reagent_containers/food/snacks/grown/apple(src)
/obj/item/storage/box/ingredients/delights
- icon_state = "delights"
+ theme_name = "delights"
/obj/item/storage/box/ingredients/delights/PopulateContents()
for(var/i in 1 to 2)
@@ -836,7 +837,7 @@
new /obj/item/reagent_containers/food/snacks/grown/berries(src)
/obj/item/storage/box/ingredients/grains
- icon_state = "grains"
+ theme_name = "grains"
/obj/item/storage/box/ingredients/grains/PopulateContents()
for(var/i in 1 to 3)
@@ -847,7 +848,7 @@
new /obj/item/seeds/poppy(src)
/obj/item/storage/box/ingredients/carnivore
- icon_state = "carnivore"
+ theme_name = "carnivore"
/obj/item/storage/box/ingredients/carnivore/PopulateContents()
new /obj/item/reagent_containers/food/snacks/meat/slab/bear(src)
@@ -859,7 +860,7 @@
new /obj/item/reagent_containers/food/snacks/faggot(src)
/obj/item/storage/box/ingredients/exotic
- icon_state = "exotic"
+ theme_name = "exotic"
/obj/item/storage/box/ingredients/exotic/PopulateContents()
for(var/i in 1 to 2)
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index 8107c5a1f8..df40b2898c 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -1,57 +1,56 @@
-/obj/item/storage/briefcase
- name = "briefcase"
- desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
- icon_state = "briefcase"
- lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
- flags_1 = CONDUCT_1
- force = 8
- hitsound = "swing_hit"
- throw_speed = 2
- throw_range = 4
- w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_NORMAL
- max_combined_w_class = 21
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
- resistance_flags = FLAMMABLE
- max_integrity = 150
- var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New()
-
-/obj/item/storage/briefcase/PopulateContents()
- new /obj/item/pen(src)
- var/obj/item/folder/folder = new folder_path(src)
- for(var/i in 1 to 6)
- new /obj/item/paper(folder)
-
-/obj/item/storage/briefcase/lawyer
- folder_path = /obj/item/folder/blue
-
-/obj/item/storage/briefcase/lawyer/PopulateContents()
- new /obj/item/stamp/law(src)
- ..()
-
-/obj/item/storage/briefcase/sniperbundle
- name = "briefcase"
- desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps."
- icon_state = "briefcase"
- flags_1 = CONDUCT_1
- force = 10
- hitsound = "swing_hit"
- throw_speed = 2
- throw_range = 4
- w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_NORMAL
- max_combined_w_class = 21
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
- resistance_flags = FLAMMABLE
- max_integrity = 150
-
-/obj/item/storage/briefcase/sniperbundle/PopulateContents()
- ..() // in case you need any paperwork done after your rampage
- new /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate(src)
- new /obj/item/clothing/neck/tie/red(src)
- new /obj/item/clothing/under/syndicate/sniper(src)
- new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
- new /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage(src)
- new /obj/item/suppressor/specialoffer(src)
-
+/obj/item/storage/briefcase
+ name = "briefcase"
+ desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
+ icon_state = "briefcase"
+ lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
+ flags_1 = CONDUCT_1
+ force = 8
+ hitsound = "swing_hit"
+ throw_speed = 2
+ throw_range = 4
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_NORMAL
+ max_combined_w_class = 21
+ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+ resistance_flags = FLAMMABLE
+ max_integrity = 150
+ var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New()
+
+/obj/item/storage/briefcase/PopulateContents()
+ new /obj/item/pen(src)
+ var/obj/item/folder/folder = new folder_path(src)
+ for(var/i in 1 to 6)
+ new /obj/item/paper(folder)
+
+/obj/item/storage/briefcase/lawyer
+ folder_path = /obj/item/folder/blue
+
+/obj/item/storage/briefcase/lawyer/PopulateContents()
+ new /obj/item/stamp/law(src)
+ ..()
+
+/obj/item/storage/briefcase/sniperbundle
+ name = "briefcase"
+ desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps."
+ icon_state = "briefcase"
+ flags_1 = CONDUCT_1
+ force = 10
+ hitsound = "swing_hit"
+ throw_speed = 2
+ throw_range = 4
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_NORMAL
+ max_combined_w_class = 21
+ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+ resistance_flags = FLAMMABLE
+ max_integrity = 150
+
+/obj/item/storage/briefcase/sniperbundle/PopulateContents()
+ ..() // in case you need any paperwork done after your rampage
+ new /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate(src)
+ new /obj/item/clothing/neck/tie/red(src)
+ new /obj/item/clothing/under/syndicate/sniper(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
+ new /obj/item/suppressor/specialoffer(src)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 883641d43b..435bc64c41 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 8c7d0659bf..4dc90de6be 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -1,215 +1,217 @@
-/* First aid storage
- * Contains:
- * First Aid Kits
- * Pill Bottles
- * Dice Pack (in a pill bottle)
- */
-
-/*
- * First Aid Kits
- */
-/obj/item/storage/firstaid
- name = "first-aid kit"
- desc = "It's an emergency medical kit for those serious boo-boos."
- icon_state = "firstaid"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- throw_speed = 3
- throw_range = 7
- var/empty = 0
-
-/obj/item/storage/firstaid/regular
- icon_state = "firstaid"
- desc = "A first aid kit with the ability to heal common types of injuries."
-
-/obj/item/storage/firstaid/regular/PopulateContents()
- if(empty)
- return
- new /obj/item/stack/medical/gauze(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/ointment(src)
- new /obj/item/stack/medical/ointment(src)
- new /obj/item/reagent_containers/hypospray/medipen(src)
- new /obj/item/device/healthanalyzer(src)
-
-/obj/item/storage/firstaid/ancient
- icon_state = "firstaid"
- desc = "A first aid kit with the ability to heal common types of injuries."
-
-
-/obj/item/storage/firstaid/ancient/PopulateContents()
- if(empty)
- return
- new /obj/item/stack/medical/gauze(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/ointment(src)
- new /obj/item/stack/medical/ointment(src)
- new /obj/item/stack/medical/ointment(src)
-
-/obj/item/storage/firstaid/fire
- name = "burn treatment kit"
- desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down."
- icon_state = "ointment"
- item_state = "firstaid-ointment"
-
-/obj/item/storage/firstaid/fire/Initialize(mapload)
- ..()
- icon_state = pick("ointment","firefirstaid")
-
-/obj/item/storage/firstaid/fire/PopulateContents()
- if(empty)
- return
- for(var/i in 1 to 3)
- new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
- new /obj/item/reagent_containers/pill/oxandrolone(src)
- new /obj/item/reagent_containers/pill/oxandrolone(src)
- new /obj/item/reagent_containers/hypospray/medipen(src)
- new /obj/item/device/healthanalyzer(src)
-
-/obj/item/storage/firstaid/toxin
- name = "toxin treatment kit"
- desc = "Used to treat toxic blood content and radiation poisoning."
- icon_state = "antitoxin"
- item_state = "firstaid-toxin"
-
-/obj/item/storage/firstaid/toxin/Initialize(mapload)
- . = ..()
- icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
-
-/obj/item/storage/firstaid/toxin/PopulateContents()
- if(empty)
- return
- for(var/i in 1 to 4)
- new /obj/item/reagent_containers/syringe/charcoal(src)
- for(var/i in 1 to 2)
- new /obj/item/storage/pill_bottle/charcoal(src)
- new /obj/item/device/healthanalyzer(src)
-
-/obj/item/storage/firstaid/o2
- name = "oxygen deprivation treatment kit"
- desc = "A box full of oxygen goodies."
- icon_state = "o2"
- item_state = "firstaid-o2"
-
-/obj/item/storage/firstaid/o2/PopulateContents()
- if(empty)
- return
- for(var/i in 1 to 4)
- new /obj/item/reagent_containers/pill/salbutamol(src)
- new /obj/item/reagent_containers/hypospray/medipen(src)
- new /obj/item/reagent_containers/hypospray/medipen(src)
- new /obj/item/device/healthanalyzer(src)
-
-/obj/item/storage/firstaid/brute
- name = "brute trauma treatment kit"
- desc = "A first aid kit for when you get toolboxed."
- icon_state = "brute"
- item_state = "firstaid-brute"
-
-/obj/item/storage/firstaid/brute/PopulateContents()
- if(empty)
- return
- for(var/i in 1 to 4)
- new /obj/item/reagent_containers/pill/patch/styptic(src)
- new /obj/item/stack/medical/gauze(src)
- new /obj/item/stack/medical/gauze(src)
- new /obj/item/device/healthanalyzer(src)
-
-/obj/item/storage/firstaid/tactical
- name = "combat medical kit"
- desc = "I hope you've got insurance."
- icon_state = "bezerk"
- max_w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/storage/firstaid/tactical/PopulateContents()
- if(empty)
- return
- new /obj/item/stack/medical/gauze(src)
- new /obj/item/defibrillator/compact/combat/loaded(src)
- new /obj/item/reagent_containers/hypospray/combat(src)
- new /obj/item/reagent_containers/pill/patch/styptic(src)
- new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
- new /obj/item/reagent_containers/syringe/lethal/choral(src)
- new /obj/item/clothing/glasses/hud/health/night(src)
-
-
-/*
- * Pill Bottles
- */
-/obj/item/storage/pill_bottle
- name = "pill bottle"
- desc = "It's an airtight container for storing medication."
- icon_state = "pill_canister"
- icon = 'icons/obj/chemical.dmi'
- item_state = "contsolid"
- w_class = WEIGHT_CLASS_SMALL
- can_hold = list(/obj/item/reagent_containers/pill, /obj/item/dice)
- allow_quick_gather = 1
- use_to_pickup = 1
-
-/obj/item/storage/pill_bottle/MouseDrop(obj/over_object) //Quick pillbottle fix. -Agouri
-
- if(ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
- var/mob/M = usr
- if(!istype(over_object, /obj/screen) || !Adjacent(M))
- return ..()
- if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
- if(M.putItemFromInventoryInHandIfPossible(src, H.held_index))
- add_fingerprint(usr)
- if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
- if(usr.s_active)
- usr.s_active.close(usr)
- src.show_to(usr)
-
-/obj/item/storage/pill_bottle/charcoal
- name = "bottle of charcoal pills"
- desc = "Contains pills used to counter toxins."
-
-/obj/item/storage/pill_bottle/charcoal/PopulateContents()
- for(var/i in 1 to 7)
- new /obj/item/reagent_containers/pill/charcoal(src)
-
-/obj/item/storage/pill_bottle/epinephrine
- name = "bottle of epinephrine pills"
- desc = "Contains pills used to stabilize patients."
-
-/obj/item/storage/pill_bottle/epinephrine/PopulateContents()
- for(var/i in 1 to 7)
- new /obj/item/reagent_containers/pill/epinephrine(src)
-
-/obj/item/storage/pill_bottle/mutadone
- name = "bottle of mutadone pills"
- desc = "Contains pills used to treat genetic abnormalities."
-
-/obj/item/storage/pill_bottle/mutadone/PopulateContents()
- for(var/i in 1 to 7)
- new /obj/item/reagent_containers/pill/mutadone(src)
-
-/obj/item/storage/pill_bottle/mannitol
- name = "bottle of mannitol pills"
- desc = "Contains pills used to treat brain damage."
-
-/obj/item/storage/pill_bottle/mannitol/PopulateContents()
- for(var/i in 1 to 7)
- new /obj/item/reagent_containers/pill/mannitol(src)
-
-/obj/item/storage/pill_bottle/stimulant
- name = "bottle of stimulant pills"
- desc = "Guaranteed to give you that extra burst of energy during a long shift!"
-
-/obj/item/storage/pill_bottle/stimulant/PopulateContents()
- for(var/i in 1 to 5)
- new /obj/item/reagent_containers/pill/stimulant(src)
-
-/obj/item/storage/pill_bottle/mining
- name = "bottle of patches"
- desc = "Contains patches used to treat brute and burn damage."
-
-/obj/item/storage/pill_bottle/mining/PopulateContents()
- new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
- for(var/i in 1 to 3)
- new /obj/item/reagent_containers/pill/patch/styptic(src)
+/* First aid storage
+ * Contains:
+ * First Aid Kits
+ * Pill Bottles
+ * Dice Pack (in a pill bottle)
+ */
+
+/*
+ * First Aid Kits
+ */
+/obj/item/storage/firstaid
+ name = "first-aid kit"
+ desc = "It's an emergency medical kit for those serious boo-boos."
+ icon_state = "firstaid"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ throw_speed = 3
+ throw_range = 7
+ var/empty = 0
+
+/obj/item/storage/firstaid/regular
+ icon_state = "firstaid"
+ desc = "A first aid kit with the ability to heal common types of injuries."
+
+/obj/item/storage/firstaid/regular/PopulateContents()
+ if(empty)
+ return
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/stack/medical/bruise_pack(src)
+ new /obj/item/stack/medical/bruise_pack(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/reagent_containers/hypospray/medipen(src)
+ new /obj/item/device/healthanalyzer(src)
+
+/obj/item/storage/firstaid/ancient
+ icon_state = "firstaid"
+ desc = "A first aid kit with the ability to heal common types of injuries."
+
+
+/obj/item/storage/firstaid/ancient/PopulateContents()
+ if(empty)
+ return
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/stack/medical/bruise_pack(src)
+ new /obj/item/stack/medical/bruise_pack(src)
+ new /obj/item/stack/medical/bruise_pack(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/stack/medical/ointment(src)
+
+/obj/item/storage/firstaid/fire
+ name = "burn treatment kit"
+ desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down."
+ icon_state = "ointment"
+ item_state = "firstaid-ointment"
+
+/obj/item/storage/firstaid/fire/Initialize(mapload)
+ . = ..()
+ icon_state = pick("ointment","firefirstaid")
+
+/obj/item/storage/firstaid/fire/PopulateContents()
+ if(empty)
+ return
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
+ new /obj/item/reagent_containers/pill/oxandrolone(src)
+ new /obj/item/reagent_containers/pill/oxandrolone(src)
+ new /obj/item/reagent_containers/hypospray/medipen(src)
+ new /obj/item/device/healthanalyzer(src)
+
+/obj/item/storage/firstaid/toxin
+ name = "toxin treatment kit"
+ desc = "Used to treat toxic blood content and radiation poisoning."
+ icon_state = "antitoxin"
+ item_state = "firstaid-toxin"
+
+/obj/item/storage/firstaid/toxin/Initialize(mapload)
+ . = ..()
+ icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
+
+/obj/item/storage/firstaid/toxin/PopulateContents()
+ if(empty)
+ return
+ for(var/i in 1 to 4)
+ new /obj/item/reagent_containers/syringe/charcoal(src)
+ for(var/i in 1 to 2)
+ new /obj/item/storage/pill_bottle/charcoal(src)
+ new /obj/item/device/healthanalyzer(src)
+
+/obj/item/storage/firstaid/o2
+ name = "oxygen deprivation treatment kit"
+ desc = "A box full of oxygen goodies."
+ icon_state = "o2"
+ item_state = "firstaid-o2"
+
+/obj/item/storage/firstaid/o2/PopulateContents()
+ if(empty)
+ return
+ for(var/i in 1 to 4)
+ new /obj/item/reagent_containers/pill/salbutamol(src)
+ new /obj/item/reagent_containers/hypospray/medipen(src)
+ new /obj/item/reagent_containers/hypospray/medipen(src)
+ new /obj/item/device/healthanalyzer(src)
+
+/obj/item/storage/firstaid/brute
+ name = "brute trauma treatment kit"
+ desc = "A first aid kit for when you get toolboxed."
+ icon_state = "brute"
+ item_state = "firstaid-brute"
+
+/obj/item/storage/firstaid/brute/PopulateContents()
+ if(empty)
+ return
+ for(var/i in 1 to 4)
+ new /obj/item/reagent_containers/pill/patch/styptic(src)
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/device/healthanalyzer(src)
+
+/obj/item/storage/firstaid/tactical
+ name = "combat medical kit"
+ desc = "I hope you've got insurance."
+ icon_state = "bezerk"
+ max_w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/storage/firstaid/tactical/PopulateContents()
+ if(empty)
+ return
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/defibrillator/compact/combat/loaded(src)
+ new /obj/item/reagent_containers/hypospray/combat(src)
+ new /obj/item/reagent_containers/pill/patch/styptic(src)
+ new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
+ new /obj/item/reagent_containers/syringe/lethal/choral(src)
+ new /obj/item/clothing/glasses/hud/health/night(src)
+
+
+/*
+ * Pill Bottles
+ */
+/obj/item/storage/pill_bottle
+ name = "pill bottle"
+ desc = "It's an airtight container for storing medication."
+ icon_state = "pill_canister"
+ icon = 'icons/obj/chemical.dmi'
+ item_state = "contsolid"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ w_class = WEIGHT_CLASS_SMALL
+ can_hold = list(/obj/item/reagent_containers/pill, /obj/item/dice)
+ allow_quick_gather = 1
+ use_to_pickup = 1
+
+/obj/item/storage/pill_bottle/MouseDrop(obj/over_object) //Quick pillbottle fix. -Agouri
+
+ if(ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+ var/mob/M = usr
+ if(!istype(over_object, /obj/screen) || !Adjacent(M))
+ return ..()
+ if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
+ var/obj/screen/inventory/hand/H = over_object
+ if(M.putItemFromInventoryInHandIfPossible(src, H.held_index))
+ add_fingerprint(usr)
+ if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
+ if(usr.s_active)
+ usr.s_active.close(usr)
+ src.show_to(usr)
+
+/obj/item/storage/pill_bottle/charcoal
+ name = "bottle of charcoal pills"
+ desc = "Contains pills used to counter toxins."
+
+/obj/item/storage/pill_bottle/charcoal/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_containers/pill/charcoal(src)
+
+/obj/item/storage/pill_bottle/epinephrine
+ name = "bottle of epinephrine pills"
+ desc = "Contains pills used to stabilize patients."
+
+/obj/item/storage/pill_bottle/epinephrine/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_containers/pill/epinephrine(src)
+
+/obj/item/storage/pill_bottle/mutadone
+ name = "bottle of mutadone pills"
+ desc = "Contains pills used to treat genetic abnormalities."
+
+/obj/item/storage/pill_bottle/mutadone/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_containers/pill/mutadone(src)
+
+/obj/item/storage/pill_bottle/mannitol
+ name = "bottle of mannitol pills"
+ desc = "Contains pills used to treat brain damage."
+
+/obj/item/storage/pill_bottle/mannitol/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_containers/pill/mannitol(src)
+
+/obj/item/storage/pill_bottle/stimulant
+ name = "bottle of stimulant pills"
+ desc = "Guaranteed to give you that extra burst of energy during a long shift!"
+
+/obj/item/storage/pill_bottle/stimulant/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/reagent_containers/pill/stimulant(src)
+
+/obj/item/storage/pill_bottle/mining
+ name = "bottle of patches"
+ desc = "Contains patches used to treat brute and burn damage."
+
+/obj/item/storage/pill_bottle/mining/PopulateContents()
+ new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/pill/patch/styptic(src)
diff --git a/code/game/objects/items/storage/internal.dm b/code/game/objects/items/storage/internal.dm
index ace097cc80..cc982bb36c 100644
--- a/code/game/objects/items/storage/internal.dm
+++ b/code/game/objects/items/storage/internal.dm
@@ -27,7 +27,7 @@
if(quickdraw)
to_chat(user, "You discreetly slip [W] into [src]. Alt-click [src] to remove it.")
else
- to_chat(user, "You discreetly slip [W] into [src].")
+ to_chat(user, "You discreetly slip [W] into [src].")
/obj/item/storage/internal/pocket/big
max_w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index 346e9ba409..50898e72e1 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 6620ec5265..4d56b6a8e8 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 5a2b52184a..9a3769206c 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 e6fe6da34d..9ef47c6441 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -1,186 +1,190 @@
-/obj/item/storage/toolbox
- name = "toolbox"
- desc = "Danger. Very robust."
- icon_state = "red"
- item_state = "toolbox_red"
- lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
- flags_1 = CONDUCT_1
- force = 12
- throwforce = 12
- throw_speed = 2
- throw_range = 7
- w_class = WEIGHT_CLASS_BULKY
- materials = list(MAT_METAL = 500)
- origin_tech = "combat=1;engineering=1"
- attack_verb = list("robusted")
- hitsound = 'sound/weapons/smash.ogg'
- var/latches = "single_latch"
- var/has_latches = TRUE
-
-/obj/item/storage/toolbox/Initialize()
- ..()
- if(has_latches)
- if(prob(10))
- latches = "double_latch"
- if(prob(1))
- latches = "triple_latch"
- update_icon()
-
-/obj/item/storage/toolbox/update_icon()
- ..()
- cut_overlays()
- if(has_latches)
- add_overlay(latches)
-
-
-/obj/item/storage/toolbox/suicide_act(mob/user)
- user.visible_message("[user] robusts [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
- return (BRUTELOSS)
-
-/obj/item/storage/toolbox/emergency
- name = "emergency toolbox"
- icon_state = "red"
- item_state = "toolbox_red"
-
-/obj/item/storage/toolbox/emergency/PopulateContents()
- new /obj/item/crowbar/red(src)
- new /obj/item/weldingtool/mini(src)
- new /obj/item/extinguisher/mini(src)
- switch(rand(1,3))
- if(1)
- new /obj/item/device/flashlight(src)
- if(2)
- new /obj/item/device/flashlight/glowstick(src)
- if(3)
- new /obj/item/device/flashlight/flare(src)
- new /obj/item/device/radio/off(src)
-
-/obj/item/storage/toolbox/emergency/old
- name = "rusty red toolbox"
- icon_state = "toolbox_red_old"
- has_latches = FALSE
-
-/obj/item/storage/toolbox/mechanical
- name = "mechanical toolbox"
- icon_state = "blue"
- item_state = "toolbox_blue"
-
-/obj/item/storage/toolbox/mechanical/PopulateContents()
- new /obj/item/screwdriver(src)
- new /obj/item/wrench(src)
- new /obj/item/weldingtool(src)
- new /obj/item/crowbar(src)
- new /obj/item/device/analyzer(src)
- new /obj/item/wirecutters(src)
-
-/obj/item/storage/toolbox/mechanical/old
- name = "rusty blue toolbox"
- icon_state = "toolbox_blue_old"
- has_latches = FALSE
-
-/obj/item/storage/toolbox/electrical
- name = "electrical toolbox"
- icon_state = "yellow"
- item_state = "toolbox_yellow"
-
-/obj/item/storage/toolbox/electrical/PopulateContents()
- var/pickedcolor = pick("red","yellow","green","blue","pink","orange","cyan","white")
- new /obj/item/screwdriver(src)
- new /obj/item/wirecutters(src)
- new /obj/item/device/t_scanner(src)
- new /obj/item/crowbar(src)
- new /obj/item/stack/cable_coil(src,30,pickedcolor)
- new /obj/item/stack/cable_coil(src,30,pickedcolor)
- if(prob(5))
- new /obj/item/clothing/gloves/color/yellow(src)
- else
- new /obj/item/stack/cable_coil(src,30,pickedcolor)
-
-/obj/item/storage/toolbox/syndicate
- name = "suspicious looking toolbox"
- icon_state = "syndicate"
- item_state = "toolbox_syndi"
- origin_tech = "combat=2;syndicate=1;engineering=2"
- silent = 1
- force = 15
- throwforce = 18
-
-/obj/item/storage/toolbox/syndicate/PopulateContents()
- new /obj/item/screwdriver/nuke(src)
- new /obj/item/wrench(src)
- new /obj/item/weldingtool/largetank(src)
- new /obj/item/crowbar/red(src)
- new /obj/item/wirecutters(src, "red")
- new /obj/item/device/multitool(src)
- new /obj/item/clothing/gloves/combat(src)
-
-/obj/item/storage/toolbox/drone
- name = "mechanical toolbox"
- icon_state = "blue"
- item_state = "toolbox_blue"
-
-/obj/item/storage/toolbox/drone/PopulateContents()
- var/pickedcolor = pick("red","yellow","green","blue","pink","orange","cyan","white")
- new /obj/item/screwdriver(src)
- new /obj/item/wrench(src)
- new /obj/item/weldingtool(src)
- new /obj/item/crowbar(src)
- new /obj/item/stack/cable_coil(src,30,pickedcolor)
- new /obj/item/wirecutters(src)
- new /obj/item/device/multitool(src)
-
-/obj/item/storage/toolbox/brass
- name = "brass box"
- desc = "A huge brass box with several indentations in its surface."
- icon_state = "brassbox"
- item_state = null
- has_latches = FALSE
- resistance_flags = FIRE_PROOF | ACID_PROOF
- w_class = WEIGHT_CLASS_HUGE
- max_w_class = WEIGHT_CLASS_NORMAL
- max_combined_w_class = 28
- storage_slots = 28
- attack_verb = list("robusted", "crushed", "smashed")
- var/fabricator_type = /obj/item/clockwork/replica_fabricator/scarab
-
-/obj/item/storage/toolbox/brass/prefilled/PopulateContents()
- new fabricator_type(src)
- 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)
-
-/obj/item/storage/toolbox/brass/prefilled/ratvar
- var/slab_type = /obj/item/clockwork/slab
-
-/obj/item/storage/toolbox/brass/prefilled/ratvar/PopulateContents()
- ..()
- new slab_type(src)
-
-/obj/item/storage/toolbox/brass/prefilled/ratvar/admin
- slab_type = /obj/item/clockwork/slab/debug
- fabricator_type = /obj/item/clockwork/replica_fabricator/scarab/debug
-
-
-/obj/item/storage/toolbox/artistic
- name = "artistic toolbox"
- desc = "A toolbox painted bright green. Why anyone would store art supplies in a toolbox is beyond you, but it has plenty of extra space."
- icon_state = "green"
- item_state = "artistic_toolbox"
- max_combined_w_class = 20
- storage_slots = 10
- w_class = WEIGHT_CLASS_GIGANTIC //Holds more than a regular toolbox!
-
-/obj/item/storage/toolbox/artistic/PopulateContents()
- new/obj/item/storage/crayons(src)
- new/obj/item/crowbar(src)
- new/obj/item/stack/cable_coil/red(src)
- new/obj/item/stack/cable_coil/yellow(src)
- new/obj/item/stack/cable_coil/blue(src)
- new/obj/item/stack/cable_coil/green(src)
- new/obj/item/stack/cable_coil/pink(src)
- new/obj/item/stack/cable_coil/orange(src)
- new/obj/item/stack/cable_coil/cyan(src)
- new/obj/item/stack/cable_coil/white(src)
+/obj/item/storage/toolbox
+ name = "toolbox"
+ desc = "Danger. Very robust."
+ icon_state = "red"
+ item_state = "toolbox_red"
+ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
+ flags_1 = CONDUCT_1
+ force = 12
+ throwforce = 12
+ throw_speed = 2
+ throw_range = 7
+ w_class = WEIGHT_CLASS_BULKY
+ materials = list(MAT_METAL = 500)
+ origin_tech = "combat=1;engineering=1"
+ attack_verb = list("robusted")
+ hitsound = 'sound/weapons/smash.ogg'
+ var/latches = "single_latch"
+ var/has_latches = TRUE
+
+/obj/item/storage/toolbox/Initialize()
+ . = ..()
+ if(has_latches)
+ if(prob(10))
+ latches = "double_latch"
+ if(prob(1))
+ latches = "triple_latch"
+ update_icon()
+
+/obj/item/storage/toolbox/update_icon()
+ ..()
+ cut_overlays()
+ if(has_latches)
+ add_overlay(latches)
+
+
+/obj/item/storage/toolbox/suicide_act(mob/user)
+ user.visible_message("[user] robusts [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ return (BRUTELOSS)
+
+/obj/item/storage/toolbox/emergency
+ name = "emergency toolbox"
+ icon_state = "red"
+ item_state = "toolbox_red"
+
+/obj/item/storage/toolbox/emergency/PopulateContents()
+ new /obj/item/crowbar/red(src)
+ new /obj/item/weldingtool/mini(src)
+ new /obj/item/extinguisher/mini(src)
+ switch(rand(1,3))
+ if(1)
+ new /obj/item/device/flashlight(src)
+ if(2)
+ new /obj/item/device/flashlight/glowstick(src)
+ if(3)
+ new /obj/item/device/flashlight/flare(src)
+ new /obj/item/device/radio/off(src)
+
+/obj/item/storage/toolbox/emergency/old
+ name = "rusty red toolbox"
+ icon_state = "toolbox_red_old"
+ has_latches = FALSE
+
+/obj/item/storage/toolbox/mechanical
+ name = "mechanical toolbox"
+ icon_state = "blue"
+ item_state = "toolbox_blue"
+
+/obj/item/storage/toolbox/mechanical/PopulateContents()
+ new /obj/item/screwdriver(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/device/analyzer(src)
+ new /obj/item/wirecutters(src)
+
+/obj/item/storage/toolbox/mechanical/old
+ name = "rusty blue toolbox"
+ icon_state = "toolbox_blue_old"
+ has_latches = FALSE
+
+/obj/item/storage/toolbox/electrical
+ name = "electrical toolbox"
+ icon_state = "yellow"
+ item_state = "toolbox_yellow"
+
+/obj/item/storage/toolbox/electrical/PopulateContents()
+ var/pickedcolor = pick("red","yellow","green","blue","pink","orange","cyan","white")
+ new /obj/item/screwdriver(src)
+ new /obj/item/wirecutters(src)
+ new /obj/item/device/t_scanner(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/stack/cable_coil(src,30,pickedcolor)
+ new /obj/item/stack/cable_coil(src,30,pickedcolor)
+ if(prob(5))
+ new /obj/item/clothing/gloves/color/yellow(src)
+ else
+ new /obj/item/stack/cable_coil(src,30,pickedcolor)
+
+/obj/item/storage/toolbox/syndicate
+ name = "suspicious looking toolbox"
+ icon_state = "syndicate"
+ item_state = "toolbox_syndi"
+ origin_tech = "combat=2;syndicate=1;engineering=2"
+ silent = 1
+ force = 15
+ throwforce = 18
+
+/obj/item/storage/toolbox/syndicate/PopulateContents()
+ new /obj/item/screwdriver/nuke(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool/largetank(src)
+ new /obj/item/crowbar/red(src)
+ new /obj/item/wirecutters(src, "red")
+ new /obj/item/device/multitool(src)
+ new /obj/item/clothing/gloves/combat(src)
+
+/obj/item/storage/toolbox/drone
+ name = "mechanical toolbox"
+ icon_state = "blue"
+ item_state = "toolbox_blue"
+
+/obj/item/storage/toolbox/drone/PopulateContents()
+ var/pickedcolor = pick("red","yellow","green","blue","pink","orange","cyan","white")
+ new /obj/item/screwdriver(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/stack/cable_coil(src,30,pickedcolor)
+ new /obj/item/wirecutters(src)
+ new /obj/item/device/multitool(src)
+
+/obj/item/storage/toolbox/brass
+ name = "brass box"
+ desc = "A huge brass box with several indentations in its surface."
+ icon_state = "brassbox"
+ item_state = null
+ has_latches = FALSE
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ w_class = WEIGHT_CLASS_HUGE
+ max_w_class = WEIGHT_CLASS_NORMAL
+ max_combined_w_class = 28
+ storage_slots = 28
+ attack_verb = list("robusted", "crushed", "smashed")
+ var/fabricator_type = /obj/item/clockwork/replica_fabricator/scarab
+
+/obj/item/storage/toolbox/brass/prefilled/PopulateContents()
+ new fabricator_type(src)
+ 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)
+
+/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
+
+/obj/item/storage/toolbox/brass/prefilled/ratvar/PopulateContents()
+ ..()
+ new slab_type(src)
+
+/obj/item/storage/toolbox/brass/prefilled/ratvar/admin
+ slab_type = /obj/item/clockwork/slab/debug
+ fabricator_type = /obj/item/clockwork/replica_fabricator/scarab/debug
+
+
+/obj/item/storage/toolbox/artistic
+ name = "artistic toolbox"
+ desc = "A toolbox painted bright green. Why anyone would store art supplies in a toolbox is beyond you, but it has plenty of extra space."
+ icon_state = "green"
+ item_state = "artistic_toolbox"
+ max_combined_w_class = 20
+ storage_slots = 10
+ w_class = WEIGHT_CLASS_GIGANTIC //Holds more than a regular toolbox!
+
+/obj/item/storage/toolbox/artistic/PopulateContents()
+ new/obj/item/storage/crayons(src)
+ new/obj/item/crowbar(src)
+ new/obj/item/stack/cable_coil/red(src)
+ new/obj/item/stack/cable_coil/yellow(src)
+ new/obj/item/stack/cable_coil/blue(src)
+ new/obj/item/stack/cable_coil/green(src)
+ new/obj/item/stack/cable_coil/pink(src)
+ new/obj/item/stack/cable_coil/orange(src)
+ new/obj/item/stack/cable_coil/cyan(src)
+ new/obj/item/stack/cable_coil/white(src)
diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm
index 71a2c51dca..9892c35445 100644
--- a/code/game/objects/items/tanks/tank_types.dm
+++ b/code/game/objects/items/tanks/tank_types.dm
@@ -1,183 +1,184 @@
-/* Types of tanks!
- * Contains:
- * Oxygen
- * Anesthetic
- * Air
- * Plasma
- * Emergency Oxygen
- */
-
-/*
- * Oxygen
- */
-/obj/item/tank/internals/oxygen
- name = "oxygen tank"
- desc = "A tank of oxygen."
- icon_state = "oxygen"
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
- force = 10
- dog_fashion = /datum/dog_fashion/back
-
-
-/obj/item/tank/internals/oxygen/New()
- ..()
- air_contents.assert_gas("o2")
- air_contents.gases["o2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- return
-
-
-/obj/item/tank/internals/oxygen/yellow
- desc = "A tank of oxygen, this one is yellow."
- icon_state = "oxygen_f"
- dog_fashion = null
-
-/obj/item/tank/internals/oxygen/red
- desc = "A tank of oxygen, this one is red."
- icon_state = "oxygen_fr"
- dog_fashion = null
-
-
-/*
- * Anesthetic
- */
-/obj/item/tank/internals/anesthetic
- name = "anesthetic tank"
- desc = "A tank with an N2O/O2 gas mix."
- icon_state = "anesthetic"
- item_state = "an_tank"
- force = 10
-
-/obj/item/tank/internals/anesthetic/New()
- ..()
- air_contents.assert_gases("o2", "n2o")
- air_contents.gases["o2"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gases["n2o"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
- return
-
-/*
- * Air
- */
-/obj/item/tank/internals/air
- name = "air tank"
- desc = "Mixed anyone?"
- icon_state = "oxygen"
- force = 10
- dog_fashion = /datum/dog_fashion/back
-
-/obj/item/tank/internals/air/New()
- ..()
- air_contents.assert_gases("o2","n2")
- air_contents.gases["o2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gases["n2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
- return
-
-
-/*
- * Plasma
- */
-/obj/item/tank/internals/plasma
- name = "plasma tank"
- desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
- icon_state = "plasma"
- flags_1 = CONDUCT_1
- slot_flags = null //they have no straps!
- force = 8
-
-
-/obj/item/tank/internals/plasma/New()
- ..()
- air_contents.assert_gas("plasma")
- air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- return
-
-/obj/item/tank/internals/plasma/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/flamethrower))
- var/obj/item/flamethrower/F = W
- if ((!F.status)||(F.ptank))
- return
- if(!user.transferItemToLoc(src, F))
- return
- src.master = F
- F.ptank = src
- F.update_icon()
- else
- return ..()
-
-/obj/item/tank/internals/plasma/full/New()
- ..()
- air_contents.assert_gas("plasma")
- air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- return
-
-
-/*
- * Plasmaman Plasma Tank
- */
-
-/obj/item/tank/internals/plasmaman
- name = "plasma internals tank"
- desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this."
- icon_state = "plasmaman_tank"
- item_state = "plasmaman_tank"
- force = 10
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
-
-/obj/item/tank/internals/plasmaman/New()
- ..()
- air_contents.assert_gas("plasma")
- air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- return
-
-/obj/item/tank/internals/plasmaman/full/New()
- ..()
- air_contents.assert_gas("plasma")
- air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- return
-
-
-/obj/item/tank/internals/plasmaman/belt
- icon_state = "plasmaman_tank_belt"
- item_state = "plasmaman_tank_belt"
- slot_flags = SLOT_BELT
- force = 5
- volume = 6
- w_class = WEIGHT_CLASS_SMALL //thanks i forgot this
-
-/obj/item/tank/internals/plasmaman/belt/full/New()
- ..()
- air_contents.assert_gas("plasma")
- air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- return
-
-
-
-/*
- * Emergency Oxygen
- */
-/obj/item/tank/internals/emergency_oxygen
- name = "emergency oxygen tank"
- desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
- icon_state = "emergency"
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- force = 4
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
- volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
-
-
-/obj/item/tank/internals/emergency_oxygen/New()
- ..()
- air_contents.assert_gas("o2")
- air_contents.gases["o2"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- return
-
-/obj/item/tank/internals/emergency_oxygen/engi
- name = "extended-capacity emergency oxygen tank"
- icon_state = "emergency_engi"
- volume = 6
-
-/obj/item/tank/internals/emergency_oxygen/double
- name = "double emergency oxygen tank"
- icon_state = "emergency_engi"
- volume = 10
+/* Types of tanks!
+ * Contains:
+ * Oxygen
+ * Anesthetic
+ * Air
+ * Plasma
+ * Emergency Oxygen
+ */
+
+/*
+ * Oxygen
+ */
+/obj/item/tank/internals/oxygen
+ name = "oxygen tank"
+ desc = "A tank of oxygen."
+ icon_state = "oxygen"
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+ force = 10
+ dog_fashion = /datum/dog_fashion/back
+
+
+/obj/item/tank/internals/oxygen/New()
+ ..()
+ air_contents.assert_gas("o2")
+ air_contents.gases["o2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ return
+
+
+/obj/item/tank/internals/oxygen/yellow
+ desc = "A tank of oxygen, this one is yellow."
+ icon_state = "oxygen_f"
+ dog_fashion = null
+
+/obj/item/tank/internals/oxygen/red
+ desc = "A tank of oxygen, this one is red."
+ icon_state = "oxygen_fr"
+ dog_fashion = null
+
+
+/*
+ * Anesthetic
+ */
+/obj/item/tank/internals/anesthetic
+ name = "anesthetic tank"
+ desc = "A tank with an N2O/O2 gas mix."
+ icon_state = "anesthetic"
+ item_state = "an_tank"
+ force = 10
+
+/obj/item/tank/internals/anesthetic/New()
+ ..()
+ air_contents.assert_gases("o2", "n2o")
+ air_contents.gases["o2"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
+ air_contents.gases["n2o"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ return
+
+/*
+ * Air
+ */
+/obj/item/tank/internals/air
+ name = "air tank"
+ desc = "Mixed anyone?"
+ icon_state = "air"
+ item_state = "air"
+ force = 10
+ dog_fashion = /datum/dog_fashion/back
+
+/obj/item/tank/internals/air/New()
+ ..()
+ air_contents.assert_gases("o2","n2")
+ air_contents.gases["o2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
+ air_contents.gases["n2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ return
+
+
+/*
+ * Plasma
+ */
+/obj/item/tank/internals/plasma
+ name = "plasma tank"
+ desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
+ icon_state = "plasma"
+ flags_1 = CONDUCT_1
+ slot_flags = null //they have no straps!
+ force = 8
+
+
+/obj/item/tank/internals/plasma/New()
+ ..()
+ air_contents.assert_gas("plasma")
+ air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ return
+
+/obj/item/tank/internals/plasma/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/flamethrower))
+ var/obj/item/flamethrower/F = W
+ if ((!F.status)||(F.ptank))
+ return
+ if(!user.transferItemToLoc(src, F))
+ return
+ src.master = F
+ F.ptank = src
+ F.update_icon()
+ else
+ return ..()
+
+/obj/item/tank/internals/plasma/full/New()
+ ..()
+ air_contents.assert_gas("plasma")
+ air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ return
+
+
+/*
+ * Plasmaman Plasma Tank
+ */
+
+/obj/item/tank/internals/plasmaman
+ name = "plasma internals tank"
+ desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this."
+ icon_state = "plasmaman_tank"
+ item_state = "plasmaman_tank"
+ force = 10
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+
+/obj/item/tank/internals/plasmaman/New()
+ ..()
+ air_contents.assert_gas("plasma")
+ air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ return
+
+/obj/item/tank/internals/plasmaman/full/New()
+ ..()
+ air_contents.assert_gas("plasma")
+ air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ return
+
+
+/obj/item/tank/internals/plasmaman/belt
+ icon_state = "plasmaman_tank_belt"
+ item_state = "plasmaman_tank_belt"
+ slot_flags = SLOT_BELT
+ force = 5
+ volume = 6
+ w_class = WEIGHT_CLASS_SMALL //thanks i forgot this
+
+/obj/item/tank/internals/plasmaman/belt/full/New()
+ ..()
+ air_contents.assert_gas("plasma")
+ air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ return
+
+
+
+/*
+ * Emergency Oxygen
+ */
+/obj/item/tank/internals/emergency_oxygen
+ name = "emergency oxygen tank"
+ desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
+ icon_state = "emergency"
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ force = 4
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+ volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
+
+
+/obj/item/tank/internals/emergency_oxygen/New()
+ ..()
+ air_contents.assert_gas("o2")
+ air_contents.gases["o2"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ return
+
+/obj/item/tank/internals/emergency_oxygen/engi
+ name = "extended-capacity emergency oxygen tank"
+ icon_state = "emergency_engi"
+ volume = 6
+
+/obj/item/tank/internals/emergency_oxygen/double
+ name = "double emergency oxygen tank"
+ icon_state = "emergency_engi"
+ volume = 10
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index e565ab1a1f..7628617923 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -74,7 +74,7 @@
if (icon == src) to_chat(user, "If you want any more information you'll need to get closer.")
return
- to_chat(user, "The pressure gauge reads [src.air_contents.return_pressure()] kPa.")
+ to_chat(user, "The pressure gauge reads [round(src.air_contents.return_pressure(),0.01)] kPa.")
var/celsius_temperature = src.air_contents.temperature-T0C
var/descriptive
@@ -177,7 +177,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
@@ -236,7 +236,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()
@@ -245,7 +244,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))
@@ -254,7 +252,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)
@@ -266,7 +263,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/teleportation.dm b/code/game/objects/items/teleportation.dm
index 1b012468c8..bc1a4aa321 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -89,7 +89,7 @@ Frequency:
continue
else
var/mob/M = W.loc
- if (M.stat == 2)
+ if (M.stat == DEAD)
if (M.timeofdeath + 6000 < world.time)
continue
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index ba7141d77e..d4432e0257 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:
\
\
-
"
diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm
index 23f68ca93c..5f3150a63c 100644
--- a/code/game/objects/items/tools.dm
+++ b/code/game/objects/items/tools.dm
@@ -1,790 +1,790 @@
-#define WELDER_FUEL_BURN_INTERVAL 13
-
-/* Tools!
- * Note: Multitools are /obj/item/device
- *
- * Contains:
- * Wrench
- * Screwdriver
- * Wirecutters
- * Welding Tool
- * Crowbar
- */
-
-/*
- * Wrench
- */
-/obj/item/wrench
- name = "wrench"
- desc = "A wrench with common uses. Can be found in your hand."
- icon = 'icons/obj/tools.dmi'
- icon_state = "wrench"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- force = 5
- throwforce = 7
- w_class = WEIGHT_CLASS_SMALL
- usesound = 'sound/items/ratchet.ogg'
- materials = list(MAT_METAL=150)
- origin_tech = "materials=1;engineering=1"
- attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
- toolspeed = 1
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
-
-/obj/item/wrench/suicide_act(mob/user)
- user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
- playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
- return (BRUTELOSS)
-
-/obj/item/wrench/cyborg
- name = "automatic wrench"
- desc = "An advanced robotic wrench. Can be found in construction cyborgs."
- toolspeed = 0.5
-
-/obj/item/wrench/brass
- name = "brass wrench"
- desc = "A brass wrench. It's faintly warm to the touch."
- resistance_flags = FIRE_PROOF | ACID_PROOF
- icon_state = "wrench_brass"
- toolspeed = 0.5
-
-/obj/item/wrench/abductor
- name = "alien wrench"
- desc = "A polarized wrench. It causes anything placed between the jaws to turn."
- icon = 'icons/obj/abductor.dmi'
- icon_state = "wrench"
- usesound = 'sound/effects/empulse.ogg'
- toolspeed = 0.1
- origin_tech = "materials=5;engineering=5;abductor=3"
-
-/obj/item/wrench/power
- name = "hand drill"
- desc = "A simple powered hand drill. It's fitted with a bolt bit."
- icon_state = "drill_bolt"
- item_state = "drill"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- usesound = 'sound/items/drill_use.ogg'
- materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
- origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
- force = 8 //might or might not be too high, subject to change
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 8
- attack_verb = list("drilled", "screwed", "jabbed")
- toolspeed = 0.25
-
-/obj/item/wrench/power/attack_self(mob/user)
- playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
- var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power
- to_chat(user, "You attach the screw driver bit to [src].")
- qdel(src)
- user.put_in_active_hand(s_drill)
-
-/obj/item/wrench/power/suicide_act(mob/user)
- user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")
- return (BRUTELOSS)
-
-/obj/item/wrench/medical
- name = "medical wrench"
- desc = "A medical wrench with common(medical?) uses. Can be found in your hand."
- icon_state = "wrench_medical"
- force = 2 //MEDICAL
- throwforce = 4
- origin_tech = "materials=1;engineering=1;biotech=3"
- attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")
-
-/obj/item/wrench/medical/suicide_act(mob/living/user)
- user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!")
- // TODO Make them glow with the power of the M E D I C A L W R E N C H
- // during their ascension
-
- // Stun stops them from wandering off
- user.Stun(100, ignore_canstun = TRUE)
- playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1)
-
- // Let the sound effect finish playing
- sleep(20)
-
- if(!user)
- return
-
- for(var/obj/item/W in user)
- user.dropItemToGround(W)
-
- var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc)
- W.add_fingerprint(user)
- W.desc += " For some reason, it reminds you of [user.name]."
-
- if(!user)
- return
-
- user.dust()
-
- return OXYLOSS
-
-/*
- * Screwdriver
- */
-/obj/item/screwdriver
- name = "screwdriver"
- desc = "You can be totally screwy with this."
- icon = 'icons/obj/tools.dmi'
- icon_state = "screwdriver"
- item_state = "screwdriver"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- force = 5
- w_class = WEIGHT_CLASS_TINY
- throwforce = 5
- throw_speed = 3
- throw_range = 5
- materials = list(MAT_METAL=75)
- attack_verb = list("stabbed")
- hitsound = 'sound/weapons/bladeslice.ogg'
- usesound = 'sound/items/screwdriver.ogg'
- toolspeed = 1
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
- var/random_color = TRUE //if the screwdriver uses random coloring
- var/static/list/screwdriver_colors = list(\
- "blue" = rgb(24, 97, 213), \
- "red" = rgb(149, 23, 16), \
- "pink" = rgb(213, 24, 141), \
- "brown" = rgb(160, 82, 18), \
- "green" = rgb(14, 127, 27), \
- "cyan" = rgb(24, 162, 213), \
- "yellow" = rgb(213, 140, 24), \
- )
-
-/obj/item/screwdriver/suicide_act(mob/user)
- user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!")
- return(BRUTELOSS)
-
-/obj/item/screwdriver/Initialize()
- . = ..()
- if(random_color) //random colors!
- var/our_color = pick(screwdriver_colors)
- add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY)
- update_icon()
- if(prob(75))
- pixel_y = rand(0, 16)
-
-/obj/item/screwdriver/update_icon()
- if(!random_color) //icon override
- return
- cut_overlays()
- var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits")
- base_overlay.appearance_flags = RESET_COLOR
- add_overlay(base_overlay)
-
-/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file)
- . = list()
- if(isinhands && random_color)
- var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head")
- M.appearance_flags = RESET_COLOR
- . += M
-
-/obj/item/screwdriver/get_belt_overlay()
- if(random_color)
- var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver")
- var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head")
- body.color = color
- head.overlays += body
- return head
- else
- return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state)
-
-/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(!istype(M))
- return ..()
- if(user.zone_selected != "eyes" && user.zone_selected != "head")
- return ..()
- if(user.disabilities & CLUMSY && prob(50))
- M = user
- return eyestab(M,user)
-
-/obj/item/screwdriver/brass
- name = "brass screwdriver"
- desc = "A screwdriver made of brass. The handle feels freezing cold."
- resistance_flags = FIRE_PROOF | ACID_PROOF
- icon_state = "screwdriver_brass"
- item_state = "screwdriver_brass"
- toolspeed = 0.5
- random_color = FALSE
-
-/obj/item/screwdriver/abductor
- name = "alien screwdriver"
- desc = "An ultrasonic screwdriver."
- icon = 'icons/obj/abductor.dmi'
- icon_state = "screwdriver_a"
- item_state = "screwdriver_nuke"
- usesound = 'sound/items/pshoom.ogg'
- toolspeed = 0.1
- random_color = FALSE
-
-/obj/item/screwdriver/power
- name = "hand drill"
- desc = "A simple powered hand drill. It's fitted with a screw bit."
- icon_state = "drill_screw"
- item_state = "drill"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
- origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
- force = 8 //might or might not be too high, subject to change
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 8
- throw_speed = 2
- throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far
- attack_verb = list("drilled", "screwed", "jabbed","whacked")
- hitsound = 'sound/items/drill_hit.ogg'
- usesound = 'sound/items/drill_use.ogg'
- toolspeed = 0.25
- random_color = FALSE
-
-/obj/item/screwdriver/power/suicide_act(mob/user)
- user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!")
- return(BRUTELOSS)
-
-/obj/item/screwdriver/power/attack_self(mob/user)
- playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
- var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power
- to_chat(user, "You attach the bolt driver bit to [src].")
- qdel(src)
- user.put_in_active_hand(b_drill)
-
-/obj/item/screwdriver/cyborg
- name = "powered screwdriver"
- desc = "An electrical screwdriver, designed to be both precise and quick."
- usesound = 'sound/items/drill_use.ogg'
- toolspeed = 0.5
-
-/*
- * Wirecutters
- */
-/obj/item/wirecutters
- name = "wirecutters"
- desc = "This cuts wires."
- icon = 'icons/obj/tools.dmi'
- icon_state = null
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- force = 6
- throw_speed = 3
- throw_range = 7
- w_class = WEIGHT_CLASS_SMALL
- materials = list(MAT_METAL=80)
- attack_verb = list("pinched", "nipped")
- hitsound = 'sound/items/wirecutter.ogg'
- usesound = 'sound/items/wirecutter.ogg'
- origin_tech = "materials=1;engineering=1"
- toolspeed = 1
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
-
-
-/obj/item/wirecutters/New(loc, var/param_color = null)
- ..()
- if(!icon_state)
- if(!param_color)
- param_color = pick("yellow","red")
- icon_state = "cutters_[param_color]"
-
-/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user)
- if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable))
- user.visible_message("[user] cuts [C]'s restraints with [src]!")
- qdel(C.handcuffed)
- C.handcuffed = null
- if(C.buckled && C.buckled.buckle_requires_restraints)
- C.buckled.unbuckle_mob(C)
- C.update_handcuffed()
- return
- else
- ..()
-
-/obj/item/wirecutters/suicide_act(mob/user)
- user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
- playsound(loc, usesound, 50, 1, -1)
- return (BRUTELOSS)
-
-/obj/item/wirecutters/brass
- name = "brass wirecutters"
- desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch."
- resistance_flags = FIRE_PROOF | ACID_PROOF
- icon_state = "cutters_brass"
- toolspeed = 0.5
-
-/obj/item/wirecutters/abductor
- name = "alien wirecutters"
- desc = "Extremely sharp wirecutters, made out of a silvery-green metal."
- icon = 'icons/obj/abductor.dmi'
- icon_state = "cutters"
- toolspeed = 0.1
- origin_tech = "materials=5;engineering=4;abductor=3"
-
-/obj/item/wirecutters/cyborg
- name = "wirecutters"
- desc = "This cuts wires."
- toolspeed = 0.5
-
-/obj/item/wirecutters/power
- name = "jaws of life"
- desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head."
- icon_state = "jaws_cutter"
- item_state = "jawsoflife"
- origin_tech = "materials=2;engineering=2"
- materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
- usesound = 'sound/items/jaws_cut.ogg'
- toolspeed = 0.25
-
-/obj/item/wirecutters/power/suicide_act(mob/user)
- user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!")
- playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1)
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- var/obj/item/bodypart/BP = C.get_bodypart("head")
- if(BP)
- BP.drop_limb()
- playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1)
- return (BRUTELOSS)
-
-/obj/item/wirecutters/power/attack_self(mob/user)
- playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
- var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power
- to_chat(user, "You attach the pry jaws to [src].")
- qdel(src)
- user.put_in_active_hand(pryjaws)
-/*
- * Welding Tool
- */
-/obj/item/weldingtool
- name = "welding tool"
- desc = "A standard edition welder provided by NanoTrasen."
- icon = 'icons/obj/tools.dmi'
- icon_state = "welder"
- item_state = "welder"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- force = 3
- throwforce = 5
- hitsound = "swing_hit"
- usesound = 'sound/items/welder.ogg'
- var/acti_sound = 'sound/items/welderactivate.ogg'
- var/deac_sound = 'sound/items/welderdeactivate.ogg'
- throw_speed = 3
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
- resistance_flags = FIRE_PROOF
-
- materials = list(MAT_METAL=70, MAT_GLASS=30)
- origin_tech = "engineering=1;plasmatech=1"
- var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2)
- var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
- var/max_fuel = 20 //The max amount of fuel the welder can hold
- var/change_icons = 1
- var/can_off_process = 0
- var/light_intensity = 2 //how powerful the emitted light is when used.
- var/burned_fuel_for = 0 //when fuel was last removed
- heat = 3800
- toolspeed = 1
-
-/obj/item/weldingtool/Initialize()
- . = ..()
- create_reagents(max_fuel)
- reagents.add_reagent("welding_fuel", max_fuel)
- update_icon()
-
-
-/obj/item/weldingtool/proc/update_torch()
- if(welding)
- add_overlay("[initial(icon_state)]-on")
- item_state = "[initial(item_state)]1"
- else
- item_state = "[initial(item_state)]"
-
-
-/obj/item/weldingtool/update_icon()
- cut_overlays()
- if(change_icons)
- var/ratio = get_fuel() / max_fuel
- ratio = Ceiling(ratio*4) * 25
- add_overlay("[initial(icon_state)][ratio]")
- update_torch()
- return
-
-
-/obj/item/weldingtool/process()
- switch(welding)
- if(0)
- force = 3
- damtype = "brute"
- update_icon()
- if(!can_off_process)
- STOP_PROCESSING(SSobj, src)
- return
- //Welders left on now use up fuel, but lets not have them run out quite that fast
- if(1)
- force = 15
- damtype = "fire"
- ++burned_fuel_for
- if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL)
- remove_fuel(1)
- update_icon()
-
- //This is to start fires. process() is only called if the welder is on.
- open_flame()
-
-
-/obj/item/weldingtool/suicide_act(mob/user)
- user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!")
- return (FIRELOSS)
-
-
-/obj/item/weldingtool/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/screwdriver))
- flamethrower_screwdriver(I, user)
- else if(istype(I, /obj/item/stack/rods))
- flamethrower_rods(I, user)
- else
- return ..()
-
-
-/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user)
- if(!istype(H))
- return ..()
-
- var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected))
-
- if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM)
- if(src.remove_fuel(1))
- playsound(loc, usesound, 50, 1)
- if(user == H)
- user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].")
- if(!do_mob(user, H, 50))
- return
- item_heal_robotic(H, user, 15, 0)
- else
- return ..()
-
-
-/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity)
- if(!proximity) return
-
- if(welding)
- remove_fuel(1)
- var/turf/location = get_turf(user)
- location.hotspot_expose(700, 50, 1)
- if(get_fuel() <= 0)
- set_light(0)
-
- if(isliving(O))
- var/mob/living/L = O
- if(L.IgniteMob())
- message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire")
- log_game("[key_name(user)] set [key_name(L)] on fire")
-
-
-/obj/item/weldingtool/attack_self(mob/user)
- switched_on(user)
- if(welding)
- set_light(light_intensity)
-
- update_icon()
-
-
-//Returns the amount of fuel in the welder
-/obj/item/weldingtool/proc/get_fuel()
- return reagents.get_reagent_amount("welding_fuel")
-
-
-//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
-/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null)
- if(!welding || !check_fuel())
- return 0
- if(amount)
- burned_fuel_for = 0
- if(get_fuel() >= amount)
- reagents.remove_reagent("welding_fuel", amount)
- check_fuel()
- if(M)
- M.flash_act(light_intensity)
- return TRUE
- else
- if(M)
- to_chat(M, "You need more welding fuel to complete this task!")
- return FALSE
-
-
-//Turns off the welder if there is no more fuel (does this really need to be its own proc?)
-/obj/item/weldingtool/proc/check_fuel(mob/user)
- if(get_fuel() <= 0 && welding)
- switched_on(user)
- update_icon()
- //mob icon update
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_hands(0)
-
- return 0
- return 1
-
-//Switches the welder on
-/obj/item/weldingtool/proc/switched_on(mob/user)
- if(!status)
- to_chat(user, "[src] can't be turned on while unsecured!")
- return
- welding = !welding
- if(welding)
- if(get_fuel() >= 1)
- to_chat(user, "You switch [src] on.")
- playsound(loc, acti_sound, 50, 1)
- force = 15
- damtype = "fire"
- hitsound = 'sound/items/welder.ogg'
- update_icon()
- START_PROCESSING(SSobj, src)
- else
- to_chat(user, "You need more fuel!")
- switched_off(user)
- else
- to_chat(user, "You switch [src] off.")
- playsound(loc, deac_sound, 50, 1)
- switched_off(user)
-
-//Switches the welder off
-/obj/item/weldingtool/proc/switched_off(mob/user)
- welding = 0
- set_light(0)
-
- force = 3
- damtype = "brute"
- hitsound = "swing_hit"
- update_icon()
-
-
-/obj/item/weldingtool/examine(mob/user)
- ..()
- to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
-
-/obj/item/weldingtool/is_hot()
- return welding * heat
-
-//Returns whether or not the welding tool is currently on.
-/obj/item/weldingtool/proc/isOn()
- return welding
-
-
-/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user)
- if(welding)
- to_chat(user, "Turn it off first!")
- return
- status = !status
- if(status)
- to_chat(user, "You resecure [src].")
- else
- to_chat(user, "[src] can now be attached and modified.")
- add_fingerprint(user)
-
-/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
- if(!status)
- var/obj/item/stack/rods/R = I
- if (R.use(1))
- var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc)
- if(!remove_item_from_storage(F))
- user.transferItemToLoc(src, F, TRUE)
- F.weldtool = src
- add_fingerprint(user)
- to_chat(user, "You add a rod to a welder, starting to build a flamethrower.")
- user.put_in_hands(F)
- else
- to_chat(user, "You need one rod to start building a flamethrower!")
-
-/obj/item/weldingtool/ignition_effect(atom/A, mob/user)
- if(welding && remove_fuel(1, user))
- . = "[user] casually lights [A] with [src], what a badass."
- else
- . = ""
-
-/obj/item/weldingtool/largetank
- name = "industrial welding tool"
- desc = "A slightly larger welder with a larger tank."
- icon_state = "indwelder"
- max_fuel = 40
- materials = list(MAT_GLASS=60)
- origin_tech = "engineering=2;plasmatech=2"
-
-/obj/item/weldingtool/largetank/cyborg
- name = "integrated welding tool"
- desc = "An advanced welder designed to be used in robotic systems."
- toolspeed = 0.5
-
-/obj/item/weldingtool/largetank/flamethrower_screwdriver()
- return
-
-
-/obj/item/weldingtool/mini
- name = "emergency welding tool"
- desc = "A miniature welder used during emergencies."
- icon_state = "miniwelder"
- max_fuel = 10
- w_class = WEIGHT_CLASS_TINY
- materials = list(MAT_METAL=30, MAT_GLASS=10)
- change_icons = 0
-
-/obj/item/weldingtool/mini/flamethrower_screwdriver()
- return
-
-/obj/item/weldingtool/abductor
- name = "alien welding tool"
- desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
- icon = 'icons/obj/abductor.dmi'
- icon_state = "welder"
- toolspeed = 0.1
- light_intensity = 0
- change_icons = 0
- origin_tech = "plasmatech=5;engineering=5;abductor=3"
-
-/obj/item/weldingtool/abductor/process()
- if(get_fuel() <= max_fuel)
- reagents.add_reagent("welding_fuel", 1)
- ..()
-
-/obj/item/weldingtool/hugetank
- name = "upgraded industrial welding tool"
- desc = "An upgraded welder based of the industrial welder."
- icon_state = "upindwelder"
- item_state = "upindwelder"
- max_fuel = 80
- materials = list(MAT_METAL=70, MAT_GLASS=120)
- origin_tech = "engineering=3;plasmatech=2"
-
-/obj/item/weldingtool/experimental
- name = "experimental welding tool"
- desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
- icon_state = "exwelder"
- item_state = "exwelder"
- max_fuel = 40
- materials = list(MAT_METAL=70, MAT_GLASS=120)
- origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4"
- var/last_gen = 0
- change_icons = 0
- can_off_process = 1
- light_intensity = 1
- toolspeed = 0.5
- var/nextrefueltick = 0
-
-/obj/item/weldingtool/experimental/brass
- name = "brass welding tool"
- desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
- resistance_flags = FIRE_PROOF | ACID_PROOF
- icon_state = "brasswelder"
- item_state = "brasswelder"
-
-
-/obj/item/weldingtool/experimental/process()
- ..()
- if(get_fuel() < max_fuel && nextrefueltick < world.time)
- nextrefueltick = world.time + 10
- reagents.add_reagent("welding_fuel", 1)
-
-
-/*
- * Crowbar
- */
-
-/obj/item/crowbar
- name = "pocket crowbar"
- desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
- icon = 'icons/obj/tools.dmi'
- icon_state = "crowbar"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- usesound = 'sound/items/crowbar.ogg'
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- force = 5
- throwforce = 7
- w_class = WEIGHT_CLASS_SMALL
- materials = list(MAT_METAL=50)
- origin_tech = "engineering=1;combat=1"
- attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
- toolspeed = 1
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
-
-/obj/item/crowbar/suicide_act(mob/user)
- user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
- playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
- return (BRUTELOSS)
-
-/obj/item/crowbar/red
- icon_state = "crowbar_red"
- force = 8
-
-/obj/item/crowbar/brass
- name = "brass crowbar"
- desc = "A brass crowbar. It feels faintly warm to the touch."
- resistance_flags = FIRE_PROOF | ACID_PROOF
- icon_state = "crowbar_brass"
- toolspeed = 0.5
-
-/obj/item/crowbar/abductor
- name = "alien crowbar"
- desc = "A hard-light crowbar. It appears to pry by itself, without any effort required."
- icon = 'icons/obj/abductor.dmi'
- usesound = 'sound/weapons/sonic_jackhammer.ogg'
- icon_state = "crowbar"
- toolspeed = 0.1
- origin_tech = "combat=4;engineering=4;abductor=3"
-
-/obj/item/crowbar/large
- name = "crowbar"
- desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big."
- force = 12
- w_class = WEIGHT_CLASS_NORMAL
- throw_speed = 3
- throw_range = 3
- materials = list(MAT_METAL=70)
- icon_state = "crowbar_large"
- item_state = "crowbar"
- toolspeed = 0.5
-
-/obj/item/crowbar/cyborg
- name = "hydraulic crowbar"
- desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs."
- usesound = 'sound/items/jaws_pry.ogg'
- force = 10
- toolspeed = 0.5
-
-/obj/item/crowbar/power
- name = "jaws of life"
- desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head."
- icon_state = "jaws_pry"
- item_state = "jawsoflife"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
- origin_tech = "materials=2;engineering=2"
- usesound = 'sound/items/jaws_pry.ogg'
- force = 15
- toolspeed = 0.25
-
-/obj/item/crowbar/power/suicide_act(mob/user)
- user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!")
- playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1)
- return (BRUTELOSS)
-
-/obj/item/crowbar/power/attack_self(mob/user)
- playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
- var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power
- to_chat(user, "You attach the cutting jaws to [src].")
- qdel(src)
- user.put_in_active_hand(cutjaws)
-
-#undef WELDER_FUEL_BURN_INTERVAL
+#define WELDER_FUEL_BURN_INTERVAL 13
+
+/* Tools!
+ * Note: Multitools are /obj/item/device
+ *
+ * Contains:
+ * Wrench
+ * Screwdriver
+ * Wirecutters
+ * Welding Tool
+ * Crowbar
+ */
+
+/*
+ * Wrench
+ */
+/obj/item/wrench
+ name = "wrench"
+ desc = "A wrench with common uses. Can be found in your hand."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "wrench"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ force = 5
+ throwforce = 7
+ w_class = WEIGHT_CLASS_SMALL
+ usesound = 'sound/items/ratchet.ogg'
+ materials = list(MAT_METAL=150)
+ origin_tech = "materials=1;engineering=1"
+ attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
+ toolspeed = 1
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
+
+/obj/item/wrench/suicide_act(mob/user)
+ user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
+ return (BRUTELOSS)
+
+/obj/item/wrench/cyborg
+ name = "automatic wrench"
+ desc = "An advanced robotic wrench. Can be found in construction cyborgs."
+ toolspeed = 0.5
+
+/obj/item/wrench/brass
+ name = "brass wrench"
+ desc = "A brass wrench. It's faintly warm to the touch."
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ icon_state = "wrench_brass"
+ toolspeed = 0.5
+
+/obj/item/wrench/abductor
+ name = "alien wrench"
+ desc = "A polarized wrench. It causes anything placed between the jaws to turn."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "wrench"
+ usesound = 'sound/effects/empulse.ogg'
+ toolspeed = 0.1
+ origin_tech = "materials=5;engineering=5;abductor=3"
+
+/obj/item/wrench/power
+ name = "hand drill"
+ desc = "A simple powered hand drill. It's fitted with a bolt bit."
+ icon_state = "drill_bolt"
+ item_state = "drill"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ usesound = 'sound/items/drill_use.ogg'
+ materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
+ origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
+ force = 8 //might or might not be too high, subject to change
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 8
+ attack_verb = list("drilled", "screwed", "jabbed")
+ toolspeed = 0.25
+
+/obj/item/wrench/power/attack_self(mob/user)
+ playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
+ var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power
+ to_chat(user, "You attach the screw driver bit to [src].")
+ qdel(src)
+ user.put_in_active_hand(s_drill)
+
+/obj/item/wrench/power/suicide_act(mob/user)
+ user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")
+ return (BRUTELOSS)
+
+/obj/item/wrench/medical
+ name = "medical wrench"
+ desc = "A medical wrench with common(medical?) uses. Can be found in your hand."
+ icon_state = "wrench_medical"
+ force = 2 //MEDICAL
+ throwforce = 4
+ origin_tech = "materials=1;engineering=1;biotech=3"
+ attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")
+
+/obj/item/wrench/medical/suicide_act(mob/living/user)
+ user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!")
+ // TODO Make them glow with the power of the M E D I C A L W R E N C H
+ // during their ascension
+
+ // Stun stops them from wandering off
+ user.Stun(100, ignore_canstun = TRUE)
+ playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1)
+
+ // Let the sound effect finish playing
+ sleep(20)
+
+ if(!user)
+ return
+
+ for(var/obj/item/W in user)
+ user.dropItemToGround(W)
+
+ var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc)
+ W.add_fingerprint(user)
+ W.desc += " For some reason, it reminds you of [user.name]."
+
+ if(!user)
+ return
+
+ user.dust()
+
+ return OXYLOSS
+
+/*
+ * Screwdriver
+ */
+/obj/item/screwdriver
+ name = "screwdriver"
+ desc = "You can be totally screwy with this."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "screwdriver"
+ item_state = "screwdriver"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ force = 5
+ w_class = WEIGHT_CLASS_TINY
+ throwforce = 5
+ throw_speed = 3
+ throw_range = 5
+ materials = list(MAT_METAL=75)
+ attack_verb = list("stabbed")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ usesound = 'sound/items/screwdriver.ogg'
+ toolspeed = 1
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
+ var/random_color = TRUE //if the screwdriver uses random coloring
+ var/static/list/screwdriver_colors = list(\
+ "blue" = rgb(24, 97, 213), \
+ "red" = rgb(149, 23, 16), \
+ "pink" = rgb(213, 24, 141), \
+ "brown" = rgb(160, 82, 18), \
+ "green" = rgb(14, 127, 27), \
+ "cyan" = rgb(24, 162, 213), \
+ "yellow" = rgb(213, 140, 24), \
+ )
+
+/obj/item/screwdriver/suicide_act(mob/user)
+ user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!")
+ return(BRUTELOSS)
+
+/obj/item/screwdriver/Initialize()
+ . = ..()
+ if(random_color) //random colors!
+ var/our_color = pick(screwdriver_colors)
+ add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY)
+ update_icon()
+ if(prob(75))
+ pixel_y = rand(0, 16)
+
+/obj/item/screwdriver/update_icon()
+ if(!random_color) //icon override
+ return
+ cut_overlays()
+ var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits")
+ base_overlay.appearance_flags = RESET_COLOR
+ add_overlay(base_overlay)
+
+/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file)
+ . = list()
+ if(isinhands && random_color)
+ var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head")
+ M.appearance_flags = RESET_COLOR
+ . += M
+
+/obj/item/screwdriver/get_belt_overlay()
+ if(random_color)
+ var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver")
+ var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head")
+ body.color = color
+ head.overlays += body
+ return head
+ else
+ return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state)
+
+/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
+ if(!istype(M))
+ return ..()
+ if(user.zone_selected != "eyes" && user.zone_selected != "head")
+ return ..()
+ if(user.disabilities & CLUMSY && prob(50))
+ M = user
+ return eyestab(M,user)
+
+/obj/item/screwdriver/brass
+ name = "brass screwdriver"
+ desc = "A screwdriver made of brass. The handle feels freezing cold."
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ icon_state = "screwdriver_brass"
+ item_state = "screwdriver_brass"
+ toolspeed = 0.5
+ random_color = FALSE
+
+/obj/item/screwdriver/abductor
+ name = "alien screwdriver"
+ desc = "An ultrasonic screwdriver."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "screwdriver_a"
+ item_state = "screwdriver_nuke"
+ usesound = 'sound/items/pshoom.ogg'
+ toolspeed = 0.1
+ random_color = FALSE
+
+/obj/item/screwdriver/power
+ name = "hand drill"
+ desc = "A simple powered hand drill. It's fitted with a screw bit."
+ icon_state = "drill_screw"
+ item_state = "drill"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
+ origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
+ force = 8 //might or might not be too high, subject to change
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 8
+ throw_speed = 2
+ throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far
+ attack_verb = list("drilled", "screwed", "jabbed","whacked")
+ hitsound = 'sound/items/drill_hit.ogg'
+ usesound = 'sound/items/drill_use.ogg'
+ toolspeed = 0.25
+ random_color = FALSE
+
+/obj/item/screwdriver/power/suicide_act(mob/user)
+ user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!")
+ return(BRUTELOSS)
+
+/obj/item/screwdriver/power/attack_self(mob/user)
+ playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
+ var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power
+ to_chat(user, "You attach the bolt driver bit to [src].")
+ qdel(src)
+ user.put_in_active_hand(b_drill)
+
+/obj/item/screwdriver/cyborg
+ name = "powered screwdriver"
+ desc = "An electrical screwdriver, designed to be both precise and quick."
+ usesound = 'sound/items/drill_use.ogg'
+ toolspeed = 0.5
+
+/*
+ * Wirecutters
+ */
+/obj/item/wirecutters
+ name = "wirecutters"
+ desc = "This cuts wires."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = null
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ force = 6
+ throw_speed = 3
+ throw_range = 7
+ w_class = WEIGHT_CLASS_SMALL
+ materials = list(MAT_METAL=80)
+ attack_verb = list("pinched", "nipped")
+ hitsound = 'sound/items/wirecutter.ogg'
+ usesound = 'sound/items/wirecutter.ogg'
+ origin_tech = "materials=1;engineering=1"
+ toolspeed = 1
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
+
+
+/obj/item/wirecutters/New(loc, var/param_color = null)
+ ..()
+ if(!icon_state)
+ if(!param_color)
+ param_color = pick("yellow","red")
+ icon_state = "cutters_[param_color]"
+
+/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user)
+ if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable))
+ user.visible_message("[user] cuts [C]'s restraints with [src]!")
+ qdel(C.handcuffed)
+ C.handcuffed = null
+ if(C.buckled && C.buckled.buckle_requires_restraints)
+ C.buckled.unbuckle_mob(C)
+ C.update_handcuffed()
+ return
+ else
+ ..()
+
+/obj/item/wirecutters/suicide_act(mob/user)
+ user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ playsound(loc, usesound, 50, 1, -1)
+ return (BRUTELOSS)
+
+/obj/item/wirecutters/brass
+ name = "brass wirecutters"
+ desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch."
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ icon_state = "cutters_brass"
+ toolspeed = 0.5
+
+/obj/item/wirecutters/abductor
+ name = "alien wirecutters"
+ desc = "Extremely sharp wirecutters, made out of a silvery-green metal."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "cutters"
+ toolspeed = 0.1
+ origin_tech = "materials=5;engineering=4;abductor=3"
+
+/obj/item/wirecutters/cyborg
+ name = "wirecutters"
+ desc = "This cuts wires."
+ toolspeed = 0.5
+
+/obj/item/wirecutters/power
+ name = "jaws of life"
+ desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head."
+ icon_state = "jaws_cutter"
+ item_state = "jawsoflife"
+ origin_tech = "materials=2;engineering=2"
+ materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
+ usesound = 'sound/items/jaws_cut.ogg'
+ toolspeed = 0.25
+
+/obj/item/wirecutters/power/suicide_act(mob/user)
+ user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!")
+ playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1)
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ var/obj/item/bodypart/BP = C.get_bodypart("head")
+ if(BP)
+ BP.drop_limb()
+ playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1)
+ return (BRUTELOSS)
+
+/obj/item/wirecutters/power/attack_self(mob/user)
+ playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
+ var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power
+ to_chat(user, "You attach the pry jaws to [src].")
+ qdel(src)
+ user.put_in_active_hand(pryjaws)
+/*
+ * Welding Tool
+ */
+/obj/item/weldingtool
+ name = "welding tool"
+ desc = "A standard edition welder provided by Nanotrasen."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "welder"
+ item_state = "welder"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ force = 3
+ throwforce = 5
+ hitsound = "swing_hit"
+ usesound = 'sound/items/welder.ogg'
+ var/acti_sound = 'sound/items/welderactivate.ogg'
+ var/deac_sound = 'sound/items/welderdeactivate.ogg'
+ throw_speed = 3
+ throw_range = 5
+ w_class = WEIGHT_CLASS_SMALL
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
+ resistance_flags = FIRE_PROOF
+
+ materials = list(MAT_METAL=70, MAT_GLASS=30)
+ origin_tech = "engineering=1;plasmatech=1"
+ var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2)
+ var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
+ var/max_fuel = 20 //The max amount of fuel the welder can hold
+ var/change_icons = 1
+ var/can_off_process = 0
+ var/light_intensity = 2 //how powerful the emitted light is when used.
+ var/burned_fuel_for = 0 //when fuel was last removed
+ heat = 3800
+ toolspeed = 1
+
+/obj/item/weldingtool/Initialize()
+ . = ..()
+ create_reagents(max_fuel)
+ reagents.add_reagent("welding_fuel", max_fuel)
+ update_icon()
+
+
+/obj/item/weldingtool/proc/update_torch()
+ if(welding)
+ add_overlay("[initial(icon_state)]-on")
+ item_state = "[initial(item_state)]1"
+ else
+ item_state = "[initial(item_state)]"
+
+
+/obj/item/weldingtool/update_icon()
+ cut_overlays()
+ if(change_icons)
+ var/ratio = get_fuel() / max_fuel
+ ratio = Ceiling(ratio*4) * 25
+ add_overlay("[initial(icon_state)][ratio]")
+ update_torch()
+ return
+
+
+/obj/item/weldingtool/process()
+ switch(welding)
+ if(0)
+ force = 3
+ damtype = "brute"
+ update_icon()
+ if(!can_off_process)
+ STOP_PROCESSING(SSobj, src)
+ return
+ //Welders left on now use up fuel, but lets not have them run out quite that fast
+ if(1)
+ force = 15
+ damtype = "fire"
+ ++burned_fuel_for
+ if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL)
+ remove_fuel(1)
+ update_icon()
+
+ //This is to start fires. process() is only called if the welder is on.
+ open_flame()
+
+
+/obj/item/weldingtool/suicide_act(mob/user)
+ user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!")
+ return (FIRELOSS)
+
+
+/obj/item/weldingtool/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/screwdriver))
+ flamethrower_screwdriver(I, user)
+ else if(istype(I, /obj/item/stack/rods))
+ flamethrower_rods(I, user)
+ else
+ return ..()
+
+
+/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user)
+ if(!istype(H))
+ return ..()
+
+ var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected))
+
+ if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM)
+ if(src.remove_fuel(1))
+ playsound(loc, usesound, 50, 1)
+ if(user == H)
+ user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].")
+ if(!do_mob(user, H, 50))
+ return
+ item_heal_robotic(H, user, 15, 0)
+ else
+ return ..()
+
+
+/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity)
+ if(!proximity) return
+
+ if(welding)
+ remove_fuel(1)
+ var/turf/location = get_turf(user)
+ location.hotspot_expose(700, 50, 1)
+ if(get_fuel() <= 0)
+ set_light(0)
+
+ if(isliving(O))
+ var/mob/living/L = O
+ if(L.IgniteMob())
+ message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire")
+ log_game("[key_name(user)] set [key_name(L)] on fire")
+
+
+/obj/item/weldingtool/attack_self(mob/user)
+ switched_on(user)
+ if(welding)
+ set_light(light_intensity)
+
+ update_icon()
+
+
+//Returns the amount of fuel in the welder
+/obj/item/weldingtool/proc/get_fuel()
+ return reagents.get_reagent_amount("welding_fuel")
+
+
+//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
+/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null)
+ if(!welding || !check_fuel())
+ return 0
+ if(amount)
+ burned_fuel_for = 0
+ if(get_fuel() >= amount)
+ reagents.remove_reagent("welding_fuel", amount)
+ check_fuel()
+ if(M)
+ M.flash_act(light_intensity)
+ return TRUE
+ else
+ if(M)
+ to_chat(M, "You need more welding fuel to complete this task!")
+ return FALSE
+
+
+//Turns off the welder if there is no more fuel (does this really need to be its own proc?)
+/obj/item/weldingtool/proc/check_fuel(mob/user)
+ if(get_fuel() <= 0 && welding)
+ switched_on(user)
+ update_icon()
+ //mob icon update
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_hands(0)
+
+ return 0
+ return 1
+
+//Switches the welder on
+/obj/item/weldingtool/proc/switched_on(mob/user)
+ if(!status)
+ to_chat(user, "[src] can't be turned on while unsecured!")
+ return
+ welding = !welding
+ if(welding)
+ if(get_fuel() >= 1)
+ to_chat(user, "You switch [src] on.")
+ playsound(loc, acti_sound, 50, 1)
+ force = 15
+ damtype = "fire"
+ hitsound = 'sound/items/welder.ogg'
+ update_icon()
+ START_PROCESSING(SSobj, src)
+ else
+ to_chat(user, "You need more fuel!")
+ switched_off(user)
+ else
+ to_chat(user, "You switch [src] off.")
+ playsound(loc, deac_sound, 50, 1)
+ switched_off(user)
+
+//Switches the welder off
+/obj/item/weldingtool/proc/switched_off(mob/user)
+ welding = 0
+ set_light(0)
+
+ force = 3
+ damtype = "brute"
+ hitsound = "swing_hit"
+ update_icon()
+
+
+/obj/item/weldingtool/examine(mob/user)
+ ..()
+ to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
+
+/obj/item/weldingtool/is_hot()
+ return welding * heat
+
+//Returns whether or not the welding tool is currently on.
+/obj/item/weldingtool/proc/isOn()
+ return welding
+
+
+/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user)
+ if(welding)
+ to_chat(user, "Turn it off first!")
+ return
+ status = !status
+ if(status)
+ to_chat(user, "You resecure [src].")
+ else
+ to_chat(user, "[src] can now be attached and modified.")
+ add_fingerprint(user)
+
+/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
+ if(!status)
+ var/obj/item/stack/rods/R = I
+ if (R.use(1))
+ var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc)
+ if(!remove_item_from_storage(F))
+ user.transferItemToLoc(src, F, TRUE)
+ F.weldtool = src
+ add_fingerprint(user)
+ to_chat(user, "You add a rod to a welder, starting to build a flamethrower.")
+ user.put_in_hands(F)
+ else
+ to_chat(user, "You need one rod to start building a flamethrower!")
+
+/obj/item/weldingtool/ignition_effect(atom/A, mob/user)
+ if(welding && remove_fuel(1, user))
+ . = "[user] casually lights [A] with [src], what a badass."
+ else
+ . = ""
+
+/obj/item/weldingtool/largetank
+ name = "industrial welding tool"
+ desc = "A slightly larger welder with a larger tank."
+ icon_state = "indwelder"
+ max_fuel = 40
+ materials = list(MAT_GLASS=60)
+ origin_tech = "engineering=2;plasmatech=2"
+
+/obj/item/weldingtool/largetank/cyborg
+ name = "integrated welding tool"
+ desc = "An advanced welder designed to be used in robotic systems."
+ toolspeed = 0.5
+
+/obj/item/weldingtool/largetank/flamethrower_screwdriver()
+ return
+
+
+/obj/item/weldingtool/mini
+ name = "emergency welding tool"
+ desc = "A miniature welder used during emergencies."
+ icon_state = "miniwelder"
+ max_fuel = 10
+ w_class = WEIGHT_CLASS_TINY
+ materials = list(MAT_METAL=30, MAT_GLASS=10)
+ change_icons = 0
+
+/obj/item/weldingtool/mini/flamethrower_screwdriver()
+ return
+
+/obj/item/weldingtool/abductor
+ name = "alien welding tool"
+ desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "welder"
+ toolspeed = 0.1
+ light_intensity = 0
+ change_icons = 0
+ origin_tech = "plasmatech=5;engineering=5;abductor=3"
+
+/obj/item/weldingtool/abductor/process()
+ if(get_fuel() <= max_fuel)
+ reagents.add_reagent("welding_fuel", 1)
+ ..()
+
+/obj/item/weldingtool/hugetank
+ name = "upgraded industrial welding tool"
+ desc = "An upgraded welder based of the industrial welder."
+ icon_state = "upindwelder"
+ item_state = "upindwelder"
+ max_fuel = 80
+ materials = list(MAT_METAL=70, MAT_GLASS=120)
+ origin_tech = "engineering=3;plasmatech=2"
+
+/obj/item/weldingtool/experimental
+ name = "experimental welding tool"
+ desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
+ icon_state = "exwelder"
+ item_state = "exwelder"
+ max_fuel = 40
+ materials = list(MAT_METAL=70, MAT_GLASS=120)
+ origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4"
+ var/last_gen = 0
+ change_icons = 0
+ can_off_process = 1
+ light_intensity = 1
+ toolspeed = 0.5
+ var/nextrefueltick = 0
+
+/obj/item/weldingtool/experimental/brass
+ name = "brass welding tool"
+ desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ icon_state = "brasswelder"
+ item_state = "brasswelder"
+
+
+/obj/item/weldingtool/experimental/process()
+ ..()
+ if(get_fuel() < max_fuel && nextrefueltick < world.time)
+ nextrefueltick = world.time + 10
+ reagents.add_reagent("welding_fuel", 1)
+
+
+/*
+ * Crowbar
+ */
+
+/obj/item/crowbar
+ name = "pocket crowbar"
+ desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "crowbar"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ usesound = 'sound/items/crowbar.ogg'
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ force = 5
+ throwforce = 7
+ w_class = WEIGHT_CLASS_SMALL
+ materials = list(MAT_METAL=50)
+ origin_tech = "engineering=1;combat=1"
+ attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
+ toolspeed = 1
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
+
+/obj/item/crowbar/suicide_act(mob/user)
+ user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
+ return (BRUTELOSS)
+
+/obj/item/crowbar/red
+ icon_state = "crowbar_red"
+ force = 8
+
+/obj/item/crowbar/brass
+ name = "brass crowbar"
+ desc = "A brass crowbar. It feels faintly warm to the touch."
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ icon_state = "crowbar_brass"
+ toolspeed = 0.5
+
+/obj/item/crowbar/abductor
+ name = "alien crowbar"
+ desc = "A hard-light crowbar. It appears to pry by itself, without any effort required."
+ icon = 'icons/obj/abductor.dmi'
+ usesound = 'sound/weapons/sonic_jackhammer.ogg'
+ icon_state = "crowbar"
+ toolspeed = 0.1
+ origin_tech = "combat=4;engineering=4;abductor=3"
+
+/obj/item/crowbar/large
+ name = "crowbar"
+ desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big."
+ force = 12
+ w_class = WEIGHT_CLASS_NORMAL
+ throw_speed = 3
+ throw_range = 3
+ materials = list(MAT_METAL=70)
+ icon_state = "crowbar_large"
+ item_state = "crowbar"
+ toolspeed = 0.5
+
+/obj/item/crowbar/cyborg
+ name = "hydraulic crowbar"
+ desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs."
+ usesound = 'sound/items/jaws_pry.ogg'
+ force = 10
+ toolspeed = 0.5
+
+/obj/item/crowbar/power
+ name = "jaws of life"
+ desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head."
+ icon_state = "jaws_pry"
+ item_state = "jawsoflife"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
+ origin_tech = "materials=2;engineering=2"
+ usesound = 'sound/items/jaws_pry.ogg'
+ force = 15
+ toolspeed = 0.25
+
+/obj/item/crowbar/power/suicide_act(mob/user)
+ user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!")
+ playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1)
+ return (BRUTELOSS)
+
+/obj/item/crowbar/power/attack_self(mob/user)
+ playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
+ var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power
+ to_chat(user, "You attach the cutting jaws to [src].")
+ qdel(src)
+ user.put_in_active_hand(cutjaws)
+
+#undef WELDER_FUEL_BURN_INTERVAL
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 648047ab62..a683902a6c 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -14,7 +14,6 @@
* Cards
* Toy nuke
* Fake meteor
- * Carp plushie
* Foam armblade
* Toy big red button
* Beach ball
@@ -41,6 +40,7 @@
icon_state = "waterballoon-e"
item_state = "balloon-empty"
+
/obj/item/toy/balloon/New()
create_reagents(10)
..()
@@ -278,6 +278,8 @@
icon = 'icons/obj/toy.dmi'
icon_state = "foamblade"
item_state = "arm_blade"
+ lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
attack_verb = list("pricked", "absorbed", "gored")
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
@@ -288,6 +290,8 @@
desc = "A replica toolbox that rumbles when you turn the key"
icon_state = "his_grace"
item_state = "artistic_toolbox"
+ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
var/active = FALSE
icon = 'icons/obj/items_and_weapons.dmi'
attack_verb = list("robusted")
@@ -547,6 +551,8 @@
desc = "A tool to help you write fictional devils!"
icon = 'icons/obj/library.dmi'
icon_state = "demonomicon"
+ lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
recharge_time = 60
@@ -980,32 +986,6 @@
shake_camera(M, 3, 1)
qdel(src)
-/*
- * Carp plushie
- */
-
-/obj/item/toy/carpplushie
- name = "space carp plushie"
- desc = "An adorable stuffed toy that resembles a space carp."
- icon = 'icons/obj/toy.dmi'
- icon_state = "carpplushie"
- item_state = "carp_plushie"
- w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("bitten", "eaten", "fin slapped")
- resistance_flags = FLAMMABLE
- var/bitesound = 'sound/weapons/bite.ogg'
-
-//Attack mob
-/obj/item/toy/carpplushie/attack(mob/M, mob/user)
- playsound(loc, bitesound, 20, 1) //Play bite sound in local area
- return ..()
-
-//Attack self
-/obj/item/toy/carpplushie/attack_self(mob/user)
- playsound(src.loc, bitesound, 20, 1)
- to_chat(user, "You pet [src]. D'awww.")
- return ..()
-
/*
* Toy big red button
*/
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 323527fc88..048184578a 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -427,6 +427,11 @@
var/obj/item/grenade/explosive = null
var/war_cry = "AAAAARGH!!!"
+/obj/item/twohanded/spear/examine(mob/user)
+ ..()
+ if(explosive)
+ to_chat(user, "Alt-click to set your war cry.")
+
/obj/item/twohanded/spear/update_icon()
if(explosive)
icon_state = "spearbomb[wielded]"
@@ -475,7 +480,7 @@
if(G)
explosive = G
name = "explosive lance"
- desc = "A makeshift spear with [G] attached to it. Alt+click on the spear to set your war cry!"
+ desc = "A makeshift spear with [G] attached to it."
update_icon()
// CHAINSAW
@@ -487,7 +492,7 @@
righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
flags_1 = CONDUCT_1
force = 13
- var/force_on = 21
+ var/force_on = 24
w_class = WEIGHT_CLASS_HUGE
throwforce = 13
throw_speed = 2
@@ -500,6 +505,18 @@
actions_types = list(/datum/action/item_action/startchainsaw)
var/on = FALSE
+/obj/item/twohanded/required/chainsaw/suicide_act(mob/living/carbon/user)
+ if(on)
+ user.visible_message("[user] begins to tear [user.p_their()] head off with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ playsound(src, 'sound/weapons/chainsawhit.ogg', 100, 1)
+ var/obj/item/bodypart/head/myhead = user.get_bodypart("head")
+ if(myhead)
+ myhead.dismember()
+ else
+ user.visible_message("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! It looks like [user.p_theyre()] trying to commit suicide!")
+ playsound(src, 'sound/weapons/genhit1.ogg', 100, 1)
+ return(BRUTELOSS)
+
/obj/item/twohanded/required/chainsaw/attack_self(mob/user)
on = !on
to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
diff --git a/code/game/objects/items/vending_items.dm b/code/game/objects/items/vending_items.dm
index 3227228127..e84295f8ed 100644
--- a/code/game/objects/items/vending_items.dm
+++ b/code/game/objects/items/vending_items.dm
@@ -1,81 +1,88 @@
-/obj/item/vending_refill
- name = "resupply canister"
- var/machine_name = "Generic"
-
- icon = 'icons/obj/vending_restock.dmi'
- icon_state = "refill_snack"
- item_state = "restock_unit"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- flags_1 = CONDUCT_1
- force = 7
- throwforce = 10
- throw_speed = 1
- throw_range = 7
- w_class = WEIGHT_CLASS_BULKY
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 30)
- var/charges = list(0, 0, 0) //how many restocking "charges" the refill has for standard/contraband/coin products
- var/init_charges = list(0, 0, 0)
-
-
-/obj/item/vending_refill/New(amt = -1)
- ..()
- name = "\improper [machine_name] restocking unit"
- if(isnum(amt) && amt > -1)
- charges[1] = amt
-
-/obj/item/vending_refill/examine(mob/user)
- ..()
- if(charges[1] > 0)
- to_chat(user, "It can restock [charges[1]+charges[2]+charges[3]] item(s).")
- else
- to_chat(user, "It's empty!")
-
-//NOTE I decided to go for about 1/3 of a machine's capacity
-
-/obj/item/vending_refill/boozeomat
- machine_name = "Booze-O-Mat"
- icon_state = "refill_booze"
- charges = list(54, 4, 0)//of 159 standard, 12 contraband
- init_charges = list(54, 4, 0)
-
-/obj/item/vending_refill/coffee
- machine_name = "Solar's Best Hot Drinks"
- icon_state = "refill_joe"
- charges = list(25, 4, 0)//of 75 standard, 12 contraband
- init_charges = list(25, 4, 0)
-
-/obj/item/vending_refill/snack
- machine_name = "Getmore Chocolate Corp"
- charges = list(12, 2, 0)//of 36 standard, 6 contraband
- init_charges = list(12, 2, 0)
-
-/obj/item/vending_refill/cola
- machine_name = "Robust Softdrinks"
- icon_state = "refill_cola"
- charges = list(30, 4, 1)//of 90 standard, 12 contraband, 1 premium
- init_charges = list(30, 4, 1)
-
-/obj/item/vending_refill/cigarette
- machine_name = "ShadyCigs Deluxe"
- icon_state = "refill_smoke"
- charges = list(12, 3, 2)// of 36 standard, 9 contraband, 6 premium
- init_charges = list(12, 3, 2)
-
-/obj/item/vending_refill/autodrobe
- machine_name = "AutoDrobe"
- icon_state = "refill_costume"
- charges = list(32, 2, 3)// of 96 standard, 6 contraband, 9 premium
- init_charges = list(32, 2, 3)
-
-/obj/item/vending_refill/clothing
- machine_name = "ClothesMate"
- icon_state = "refill_clothes"
- charges = list(37, 4, 4)// of 111 standard, 12 contraband, 10 premium(?)
- init_charges = list(37, 4, 4)
-
-/obj/item/vending_refill/medical
- machine_name = "NanoMed"
- icon_state = "refill_medical"
- charges = list(26, 5, 3)// of 76 standard, 13 contraband, 8 premium
- init_charges = list(26, 5, 3)
+/obj/item/vending_refill
+ name = "resupply canister"
+ var/machine_name = "Generic"
+
+ icon = 'icons/obj/vending_restock.dmi'
+ icon_state = "refill_snack"
+ item_state = "restock_unit"
+ desc = "A vending machine restock cart."
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ flags_1 = CONDUCT_1
+ force = 7
+ throwforce = 10
+ throw_speed = 1
+ throw_range = 7
+ w_class = WEIGHT_CLASS_BULKY
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 30)
+ var/charges = list(0, 0, 0) //how many restocking "charges" the refill has for standard/contraband/coin products
+ var/init_charges = list(0, 0, 0)
+
+
+/obj/item/vending_refill/New(amt = -1)
+ ..()
+ name = "\improper [machine_name] restocking unit"
+ if(isnum(amt) && amt > -1)
+ charges[1] = amt
+
+/obj/item/vending_refill/examine(mob/user)
+ ..()
+ if(charges[1] > 0)
+ to_chat(user, "It can restock [charges[1]+charges[2]+charges[3]] item(s).")
+ else
+ to_chat(user, "It's empty!")
+
+//NOTE I decided to go for about 1/3 of a machine's capacity
+
+/obj/item/vending_refill/boozeomat
+ machine_name = "Booze-O-Mat"
+ icon_state = "refill_booze"
+ charges = list(54, 4, 0)//of 159 standard, 12 contraband
+ init_charges = list(54, 4, 0)
+
+/obj/item/vending_refill/coffee
+ machine_name = "Solar's Best Hot Drinks"
+ icon_state = "refill_joe"
+ charges = list(25, 4, 0)//of 75 standard, 12 contraband
+ init_charges = list(25, 4, 0)
+
+/obj/item/vending_refill/snack
+ machine_name = "Getmore Chocolate Corp"
+ charges = list(12, 2, 0)//of 36 standard, 6 contraband
+ init_charges = list(12, 2, 0)
+
+/obj/item/vending_refill/cola
+ machine_name = "Robust Softdrinks"
+ icon_state = "refill_cola"
+ charges = list(30, 4, 1)//of 90 standard, 12 contraband, 1 premium
+ init_charges = list(30, 4, 1)
+
+/obj/item/vending_refill/cigarette
+ machine_name = "ShadyCigs Deluxe"
+ icon_state = "refill_smoke"
+ charges = list(12, 3, 2)// of 36 standard, 9 contraband, 6 premium
+ init_charges = list(12, 3, 2)
+
+/obj/item/vending_refill/autodrobe
+ machine_name = "AutoDrobe"
+ icon_state = "refill_costume"
+ charges = list(32, 2, 3)// of 96 standard, 6 contraband, 9 premium
+ init_charges = list(32, 2, 3)
+
+/obj/item/vending_refill/clothing
+ machine_name = "ClothesMate"
+ icon_state = "refill_clothes"
+ charges = list(37, 4, 4)// of 111 standard, 12 contraband, 10 premium(?)
+ init_charges = list(37, 4, 4)
+
+/obj/item/vending_refill/medical
+ machine_name = "NanoMed"
+ icon_state = "refill_medical"
+ charges = list(26, 5, 3)// of 76 standard, 13 contraband, 8 premium
+ init_charges = list(26, 5, 3)
+
+/obj/item/vending_refill/donksoft
+ machine_name = "Donksoft Toy Vendor"
+ icon_state = "refill_donksoft"
+ charges = list(32,28,0)// of 90 standard, 75 contraband, 0 premium
+ init_charges = list(32,28,0)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 13acf7e990..17bbb0a12f 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -1,592 +1,592 @@
-/obj/item/banhammer
- desc = "A banhammer"
- name = "banhammer"
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "toyhammer"
- slot_flags = SLOT_BELT
- throwforce = 0
- w_class = WEIGHT_CLASS_TINY
- throw_speed = 3
- throw_range = 7
- attack_verb = list("banned")
- max_integrity = 200
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
- resistance_flags = FIRE_PROOF
-
-/obj/item/banhammer/suicide_act(mob/user)
- user.visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.")
- return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
-
-/obj/item/banhammer/attack(mob/M, mob/user)
+/obj/item/banhammer
+ desc = "A banhammer"
+ name = "banhammer"
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "toyhammer"
+ slot_flags = SLOT_BELT
+ throwforce = 0
+ w_class = WEIGHT_CLASS_TINY
+ throw_speed = 3
+ throw_range = 7
+ attack_verb = list("banned")
+ max_integrity = 200
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
+ resistance_flags = FIRE_PROOF
+
+/obj/item/banhammer/suicide_act(mob/user)
+ user.visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.")
+ return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
+
+/obj/item/banhammer/attack(mob/M, mob/user)
if(user.zone_selected == "head")
M.visible_message("[user] are stroking the head of [M] with a bangammer", "[user] are stroking the head with a bangammer", "you hear a bangammer stroking a head");
else
M.visible_message("[M] has been banned FOR NO REISIN by [user]", "You have been banned FOR NO REISIN by [user]", "you hear a banhammer banning someone")
- playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
-
-/obj/item/sord
- name = "\improper SORD"
- desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
- icon_state = "sord"
- item_state = "sord"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- slot_flags = SLOT_BELT
- force = 2
- throwforce = 1
- w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-
-/obj/item/sord/suicide_act(mob/user)
- user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \
- "You try to impale yourself with [src], but it's USELESS...")
- return SHAME
-
-/obj/item/claymore
- name = "claymore"
- desc = "What are you standing around staring at this for? Get to killing!"
- icon_state = "claymore"
- item_state = "claymore"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- hitsound = 'sound/weapons/bladeslice.ogg'
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT | SLOT_BACK
- force = 40
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- block_chance = 50
- sharpness = IS_SHARP
- max_integrity = 200
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
- resistance_flags = FIRE_PROOF
-
-/obj/item/claymore/suicide_act(mob/user)
- user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!")
- return(BRUTELOSS)
-
-/obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS
- desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim."
- flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1
- slot_flags = null
- block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY
- luminosity = 3
- attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS
- var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
- var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK
-
-/obj/item/claymore/highlander/Initialize()
- . = ..()
- START_PROCESSING(SSobj, src)
-
-/obj/item/claymore/highlander/Destroy()
- if(nuke_disk)
- nuke_disk.forceMove(get_turf(src))
- nuke_disk.visible_message("The nuke disk is vulnerable!")
- nuke_disk = null
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/claymore/highlander/process()
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS)
- H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS
- else
- if(!admin_spawned)
- qdel(src)
-
-
-/obj/item/claymore/highlander/pickup(mob/living/user)
- to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.")
- user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!")
- user.status_flags += IGNORESLOWDOWN
-
-/obj/item/claymore/highlander/dropped(mob/living/user)
- user.status_flags -= IGNORESLOWDOWN
- qdel(src) //If this ever happens, it's because you lost an arm
-
-/obj/item/claymore/highlander/examine(mob/user)
- ..()
- to_chat(user, "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade.")
- if(nuke_disk)
- to_chat(user, "It's holding the nuke disk!")
-
-/obj/item/claymore/highlander/attack(mob/living/target, mob/living/user)
- . = ..()
- if(target && target.stat == DEAD && target.mind && target.mind.special_role == "highlander")
- user.fully_heal() //STEAL THE LIFE OF OUR FALLEN FOES
- add_notch(user)
- target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!")
- target.dust()
-
-/obj/item/claymore/highlander/attack_self(mob/living/user)
- var/closest_victim
- var/closest_distance = 255
- for(var/mob/living/carbon/human/H in GLOB.player_list - user)
- if(H.client && H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance))
- closest_victim = H
- if(!closest_victim)
- to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.")
- return
- to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].")
-
-/obj/item/claymore/highlander/IsReflect()
- return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME?
-
-/obj/item/claymore/highlander/proc/add_notch(mob/living/user) //DYNAMIC CLAYMORE PROGRESSION SYSTEM - THIS IS THE FUTURE
- notches++
- force++
- var/new_name = name
- switch(notches)
- if(1)
- to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.")
- to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!")
- new_name = "notched claymore"
- if(2)
- to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.")
- new_name = "double-notched claymore"
- add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY)
- if(3)
- to_chat(user, "You're beginning to relish the thrill of battle.")
- new_name = "triple-notched claymore"
- add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY)
- if(4)
- to_chat(user, "You've lost count of how many you've killed.")
- new_name = "many-notched claymore"
- add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY)
- if(5)
- to_chat(user, "Five voices now echo in your mind, cheering the slaughter.")
- new_name = "battle-tested claymore"
- add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY)
- if(6)
- to_chat(user, "Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.")
- new_name = "battle-scarred claymore"
- add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY)
- if(7)
- to_chat(user, "Kill. Butcher. Conquer.")
- new_name = "vicious claymore"
- add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY)
- if(8)
- to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.")
- new_name = "bloodthirsty claymore"
- add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY)
- if(9)
- to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.")
- new_name = "gore-stained claymore"
- add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY)
- if(10)
- user.visible_message("[user]'s eyes light up with a vengeful fire!", \
- "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!")
- user.update_icons()
- new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]"
- icon_state = "claymore_valhalla"
- item_state = "cultblade"
- remove_atom_colour(ADMIN_COLOUR_PRIORITY)
-
- name = new_name
- playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
-
-/obj/item/katana
- name = "katana"
- desc = "Woefully underpowered in D20"
- icon_state = "katana"
- item_state = "katana"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT | SLOT_BACK
- force = 40
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- block_chance = 50
- sharpness = IS_SHARP
- max_integrity = 200
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
- resistance_flags = FIRE_PROOF
-
-/obj/item/katana/cursed
- slot_flags = null
-
-/obj/item/katana/suicide_act(mob/user)
- user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!")
- return(BRUTELOSS)
-
-/obj/item/wirerod
- name = "wired rod"
- desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
- icon_state = "wiredrod"
- item_state = "rods"
- flags_1 = CONDUCT_1
- force = 9
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- materials = list(MAT_METAL=1150, MAT_GLASS=75)
- attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
-
-/obj/item/wirerod/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/shard))
- var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear
-
- remove_item_from_storage(user)
- qdel(I)
- qdel(src)
-
- user.put_in_hands(S)
- to_chat(user, "You fasten the glass shard to the top of the rod with the cable.")
-
- else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1))
- var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod
-
- remove_item_from_storage(user)
-
- to_chat(user, "You fasten [I] to the top of the rod with the cable.")
-
- qdel(I)
- qdel(src)
-
- user.put_in_hands(P)
- else
- return ..()
-
-
-/obj/item/throwing_star
- name = "throwing star"
- desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts"
- icon_state = "throwingstar"
- item_state = "eshield0"
- lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
- force = 2
- throwforce = 20 //This is never used on mobs since this has a 100% embed chance.
- throw_speed = 4
- embedded_pain_multiplier = 4
- w_class = WEIGHT_CLASS_SMALL
- embed_chance = 100
- embedded_fall_chance = 0 //Hahaha!
- sharpness = IS_SHARP
- materials = list(MAT_METAL=500, MAT_GLASS=500)
- resistance_flags = FIRE_PROOF
-
-
-/obj/item/switchblade
- name = "switchblade"
- icon_state = "switchblade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- desc = "A sharp, concealable, spring-loaded knife."
- flags_1 = CONDUCT_1
- force = 3
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 5
- throw_speed = 3
- throw_range = 6
- materials = list(MAT_METAL=12000)
- origin_tech = "engineering=3;combat=2"
- hitsound = 'sound/weapons/genhit.ogg'
- attack_verb = list("stubbed", "poked")
- resistance_flags = FIRE_PROOF
- var/extended = 0
-
-/obj/item/switchblade/attack_self(mob/user)
- extended = !extended
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
- if(extended)
- force = 20
- w_class = WEIGHT_CLASS_NORMAL
- throwforce = 23
- icon_state = "switchblade_ext"
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- else
- force = 3
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 5
- icon_state = "switchblade"
- attack_verb = list("stubbed", "poked")
- hitsound = 'sound/weapons/genhit.ogg'
- sharpness = IS_BLUNT
-
-/obj/item/switchblade/suicide_act(mob/user)
- user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
- return (BRUTELOSS)
-
-/obj/item/phone
- name = "red phone"
- desc = "Should anything ever go wrong..."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "red_phone"
- force = 3
- throwforce = 2
- throw_speed = 3
- throw_range = 4
- w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("called", "rang")
- hitsound = 'sound/weapons/ring.ogg'
-
-/obj/item/phone/suicide_act(mob/user)
- if(locate(/obj/structure/chair/stool) in user.loc)
- user.visible_message("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!")
- else
- user.visible_message("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!")
- return(OXYLOSS)
-
-/obj/item/cane
- name = "cane"
- desc = "A cane used by a true gentleman. Or a clown."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "cane"
- item_state = "stick"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 5
- throwforce = 5
- w_class = WEIGHT_CLASS_SMALL
- materials = list(MAT_METAL=50)
- attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
-
-/obj/item/staff
- name = "wizard staff"
- desc = "Apparently a staff used by the wizard."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "staff"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
- force = 3
- throwforce = 5
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
- armour_penetration = 100
- attack_verb = list("bludgeoned", "whacked", "disciplined")
- resistance_flags = FLAMMABLE
-
-/obj/item/staff/broom
- name = "broom"
- desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "broom"
- resistance_flags = FLAMMABLE
-
-/obj/item/staff/stick
- name = "stick"
- desc = "A great tool to drag someone else's drinks across the bar."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "stick"
- item_state = "stick"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 3
- throwforce = 5
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/ectoplasm
- name = "ectoplasm"
- desc = "spooky"
- gender = PLURAL
- icon = 'icons/obj/wizard.dmi'
- icon_state = "ectoplasm"
-
-/obj/item/ectoplasm/suicide_act(mob/user)
- user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane.")
- return (OXYLOSS)
-
-/obj/item/mounted_chainsaw
- name = "mounted chainsaw"
- desc = "A chainsaw that has replaced your arm."
- icon_state = "chainsaw_on"
- item_state = "mounted_chainsaw"
- lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
- flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1
- w_class = WEIGHT_CLASS_HUGE
- force = 21
- throwforce = 0
- throw_range = 0
- throw_speed = 0
- sharpness = IS_SHARP
- attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
- hitsound = 'sound/weapons/chainsawhit.ogg'
-
-/obj/item/mounted_chainsaw/Destroy()
- var/obj/item/bodypart/part
- new /obj/item/twohanded/required/chainsaw(get_turf(src))
- if(iscarbon(loc))
- var/mob/living/carbon/holder = loc
- var/index = holder.get_held_index_of_item(src)
- if(index)
- part = holder.hand_bodyparts[index]
- . = ..()
- if(part)
- part.drop_limb()
-
-/obj/item/statuebust
- name = "bust"
- desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it
- icon = 'icons/obj/statue.dmi'
- icon_state = "bust"
- force = 15
- throwforce = 10
- throw_speed = 5
- throw_range = 2
- attack_verb = list("busted")
-
-/obj/item/tailclub
- name = "tail club"
- desc = "For the beating to death of lizards with their own tails."
- icon_state = "tailclub"
- force = 14
- throwforce = 1 // why are you throwing a club do you even weapon
- throw_speed = 1
- throw_range = 1
- attack_verb = list("clubbed", "bludgeoned")
-
-/obj/item/melee/chainofcommand/tailwhip
- name = "liz o' nine tails"
- desc = "A whip fashioned from the severed tails of lizards."
- icon_state = "tailwhip"
- origin_tech = "engineering=3;combat=3;biotech=3"
- needs_permit = 0
-
-/obj/item/melee/chainofcommand/tailwhip/kitty
- name = "cat o' nine tails"
- desc = "A whip fashioned from the severed tails of cats."
- icon_state = "catwhip"
-
-/obj/item/melee/skateboard
- name = "skateboard"
- desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
- icon_state = "skateboard"
- item_state = "skateboard"
- force = 12
- throwforce = 4
- w_class = WEIGHT_CLASS_HUGE
- attack_verb = list("smacked", "whacked", "slammed", "smashed")
-
-/obj/item/melee/skateboard/attack_self(mob/user)
- new /obj/vehicle/scooter/skateboard(get_turf(user))
- qdel(src)
-
-/obj/item/melee/baseball_bat
- name = "baseball bat"
- desc = "There ain't a skull in the league that can withstand a swatter."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "baseball_bat"
- item_state = "baseball_bat"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 10
- throwforce = 12
- attack_verb = list("beat", "smacked")
- w_class = WEIGHT_CLASS_HUGE
- var/homerun_ready = 0
- var/homerun_able = 0
-
-/obj/item/melee/baseball_bat/homerun
- name = "home run bat"
- desc = "This thing looks dangerous... Dangerously good at baseball, that is."
- homerun_able = 1
-
-/obj/item/melee/baseball_bat/attack_self(mob/user)
- if(!homerun_able)
- ..()
- return
- if(homerun_ready)
- to_chat(user, "You're already ready to do a home run!")
- ..()
- return
- to_chat(user, "You begin gathering strength...")
- playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1)
- if(do_after(user, 90, target = src))
- to_chat(user, "You gather power! Time for a home run!")
- homerun_ready = 1
- ..()
-
-/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user)
- . = ..()
- var/atom/throw_target = get_edge_target_turf(target, user.dir)
- if(homerun_ready)
- user.visible_message("It's a home run!")
- target.throw_at(throw_target, rand(8,10), 14, user)
- target.ex_act(EXPLODE_HEAVY)
- playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
- homerun_ready = 0
- return
- else if(!target.anchored)
- target.throw_at(throw_target, rand(1,2), 7, user)
-
-/obj/item/melee/baseball_bat/ablative
- name = "metal baseball bat"
- desc = "This bat is made of highly reflective, highly armored material."
- icon_state = "baseball_bat_metal"
- item_state = "baseball_bat_metal"
- force = 12
- throwforce = 15
-
-/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers
- var/picksound = rand(1,2)
- var/turf = get_turf(src)
- if(picksound == 1)
- playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, 1)
- if(picksound == 2)
- playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, 1)
- return 1
-
-/obj/item/melee/flyswatter
- name = "flyswatter"
- desc = "Useful for killing insects of all sizes."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "flyswatter"
- item_state = "flyswatter"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 1
- throwforce = 1
- attack_verb = list("swatted", "smacked")
- hitsound = 'sound/effects/snap.ogg'
- w_class = WEIGHT_CLASS_SMALL
- //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
- var/list/strong_against
-
-/obj/item/melee/flyswatter/Initialize()
- . = ..()
- strong_against = typecacheof(list(
- /mob/living/simple_animal/hostile/poison/bees/,
- /mob/living/simple_animal/butterfly,
- /mob/living/simple_animal/cockroach,
- /obj/item/queen_bee
- ))
-
-
-/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
- if(proximity_flag)
- if(is_type_in_typecache(target, strong_against))
- new /obj/effect/decal/cleanable/deadcockroach(get_turf(target))
- to_chat(user, "You easily splat the [target].")
- if(istype(target, /mob/living/))
- var/mob/living/bug = target
- bug.death(1)
- else
- qdel(target)
-
-/obj/item/circlegame
- name = "circled hand"
- desc = "If somebody looks at this while it's below your waist, you get to bop them."
- icon_state = "madeyoulook"
- force = 0
- throwforce = 0
- flags_1 = DROPDEL_1 | ABSTRACT_1
- attack_verb = list("bopped")
-
-/obj/item/proc/can_trigger_gun(mob/living/user)
- if(!user.can_use_guns(src))
- return FALSE
+ playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
+
+/obj/item/sord
+ name = "\improper SORD"
+ desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
+ icon_state = "sord"
+ item_state = "sord"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ slot_flags = SLOT_BELT
+ force = 2
+ throwforce = 1
+ w_class = WEIGHT_CLASS_NORMAL
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/sord/suicide_act(mob/user)
+ user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \
+ "You try to impale yourself with [src], but it's USELESS...")
+ return SHAME
+
+/obj/item/claymore
+ name = "claymore"
+ desc = "What are you standing around staring at this for? Get to killing!"
+ icon_state = "claymore"
+ item_state = "claymore"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT | SLOT_BACK
+ force = 40
+ throwforce = 10
+ w_class = WEIGHT_CLASS_NORMAL
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ block_chance = 50
+ sharpness = IS_SHARP
+ max_integrity = 200
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
+ resistance_flags = FIRE_PROOF
+
+/obj/item/claymore/suicide_act(mob/user)
+ user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ return(BRUTELOSS)
+
+/obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS
+ desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim."
+ flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1
+ slot_flags = null
+ block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY
+ luminosity = 3
+ attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS
+ var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
+ var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK
+
+/obj/item/claymore/highlander/Initialize()
+ . = ..()
+ START_PROCESSING(SSobj, src)
+
+/obj/item/claymore/highlander/Destroy()
+ if(nuke_disk)
+ nuke_disk.forceMove(get_turf(src))
+ nuke_disk.visible_message("The nuke disk is vulnerable!")
+ nuke_disk = null
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/item/claymore/highlander/process()
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS)
+ H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS
+ else
+ if(!admin_spawned)
+ qdel(src)
+
+
+/obj/item/claymore/highlander/pickup(mob/living/user)
+ to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.")
+ user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!")
+ user.status_flags += IGNORESLOWDOWN
+
+/obj/item/claymore/highlander/dropped(mob/living/user)
+ user.status_flags -= IGNORESLOWDOWN
+ qdel(src) //If this ever happens, it's because you lost an arm
+
+/obj/item/claymore/highlander/examine(mob/user)
+ ..()
+ to_chat(user, "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade.")
+ if(nuke_disk)
+ to_chat(user, "It's holding the nuke disk!")
+
+/obj/item/claymore/highlander/attack(mob/living/target, mob/living/user)
+ . = ..()
+ if(!QDELETED(target) && iscarbon(target) && target.stat == DEAD && target.mind && target.mind.special_role == "highlander")
+ user.fully_heal() //STEAL THE LIFE OF OUR FALLEN FOES
+ add_notch(user)
+ target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!")
+ target.dust()
+
+/obj/item/claymore/highlander/attack_self(mob/living/user)
+ var/closest_victim
+ var/closest_distance = 255
+ for(var/mob/living/carbon/human/H in GLOB.player_list - user)
+ if(H.client && H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance))
+ closest_victim = H
+ if(!closest_victim)
+ to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.")
+ return
+ to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].")
+
+/obj/item/claymore/highlander/IsReflect()
+ return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME?
+
+/obj/item/claymore/highlander/proc/add_notch(mob/living/user) //DYNAMIC CLAYMORE PROGRESSION SYSTEM - THIS IS THE FUTURE
+ notches++
+ force++
+ var/new_name = name
+ switch(notches)
+ if(1)
+ to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.")
+ to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!")
+ new_name = "notched claymore"
+ if(2)
+ to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.")
+ new_name = "double-notched claymore"
+ add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY)
+ if(3)
+ to_chat(user, "You're beginning to relish the thrill of battle.")
+ new_name = "triple-notched claymore"
+ add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY)
+ if(4)
+ to_chat(user, "You've lost count of how many you've killed.")
+ new_name = "many-notched claymore"
+ add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY)
+ if(5)
+ to_chat(user, "Five voices now echo in your mind, cheering the slaughter.")
+ new_name = "battle-tested claymore"
+ add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY)
+ if(6)
+ to_chat(user, "Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.")
+ new_name = "battle-scarred claymore"
+ add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY)
+ if(7)
+ to_chat(user, "Kill. Butcher. Conquer.")
+ new_name = "vicious claymore"
+ add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY)
+ if(8)
+ to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.")
+ new_name = "bloodthirsty claymore"
+ add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY)
+ if(9)
+ to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.")
+ new_name = "gore-stained claymore"
+ add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY)
+ if(10)
+ user.visible_message("[user]'s eyes light up with a vengeful fire!", \
+ "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!")
+ user.update_icons()
+ new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]"
+ icon_state = "claymore_valhalla"
+ item_state = "cultblade"
+ remove_atom_colour(ADMIN_COLOUR_PRIORITY)
+
+ name = new_name
+ playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
+
+/obj/item/katana
+ name = "katana"
+ desc = "Woefully underpowered in D20"
+ icon_state = "katana"
+ item_state = "katana"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT | SLOT_BACK
+ force = 40
+ throwforce = 10
+ w_class = WEIGHT_CLASS_NORMAL
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ block_chance = 50
+ sharpness = IS_SHARP
+ max_integrity = 200
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
+ resistance_flags = FIRE_PROOF
+
+/obj/item/katana/cursed
+ slot_flags = null
+
+/obj/item/katana/suicide_act(mob/user)
+ user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!")
+ return(BRUTELOSS)
+
+/obj/item/wirerod
+ name = "wired rod"
+ desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
+ icon_state = "wiredrod"
+ item_state = "rods"
+ flags_1 = CONDUCT_1
+ force = 9
+ throwforce = 10
+ w_class = WEIGHT_CLASS_NORMAL
+ materials = list(MAT_METAL=1150, MAT_GLASS=75)
+ attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
+
+/obj/item/wirerod/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/shard))
+ var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear
+
+ remove_item_from_storage(user)
+ qdel(I)
+ qdel(src)
+
+ user.put_in_hands(S)
+ to_chat(user, "You fasten the glass shard to the top of the rod with the cable.")
+
+ else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1))
+ var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod
+
+ remove_item_from_storage(user)
+
+ to_chat(user, "You fasten [I] to the top of the rod with the cable.")
+
+ qdel(I)
+ qdel(src)
+
+ user.put_in_hands(P)
+ else
+ return ..()
+
+
+/obj/item/throwing_star
+ name = "throwing star"
+ desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts"
+ icon_state = "throwingstar"
+ item_state = "eshield0"
+ lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+ force = 2
+ throwforce = 20 //This is never used on mobs since this has a 100% embed chance.
+ throw_speed = 4
+ embedded_pain_multiplier = 4
+ w_class = WEIGHT_CLASS_SMALL
+ embed_chance = 100
+ embedded_fall_chance = 0 //Hahaha!
+ sharpness = IS_SHARP
+ materials = list(MAT_METAL=500, MAT_GLASS=500)
+ resistance_flags = FIRE_PROOF
+
+
+/obj/item/switchblade
+ name = "switchblade"
+ icon_state = "switchblade"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ desc = "A sharp, concealable, spring-loaded knife."
+ flags_1 = CONDUCT_1
+ force = 3
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 5
+ throw_speed = 3
+ throw_range = 6
+ materials = list(MAT_METAL=12000)
+ origin_tech = "engineering=3;combat=2"
+ hitsound = 'sound/weapons/genhit.ogg'
+ attack_verb = list("stubbed", "poked")
+ resistance_flags = FIRE_PROOF
+ var/extended = 0
+
+/obj/item/switchblade/attack_self(mob/user)
+ extended = !extended
+ playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
+ if(extended)
+ force = 20
+ w_class = WEIGHT_CLASS_NORMAL
+ throwforce = 23
+ icon_state = "switchblade_ext"
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ sharpness = IS_SHARP
+ else
+ force = 3
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 5
+ icon_state = "switchblade"
+ attack_verb = list("stubbed", "poked")
+ hitsound = 'sound/weapons/genhit.ogg'
+ sharpness = IS_BLUNT
+
+/obj/item/switchblade/suicide_act(mob/user)
+ user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ return (BRUTELOSS)
+
+/obj/item/phone
+ name = "red phone"
+ desc = "Should anything ever go wrong..."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "red_phone"
+ force = 3
+ throwforce = 2
+ throw_speed = 3
+ throw_range = 4
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("called", "rang")
+ hitsound = 'sound/weapons/ring.ogg'
+
+/obj/item/phone/suicide_act(mob/user)
+ if(locate(/obj/structure/chair/stool) in user.loc)
+ user.visible_message("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!")
+ else
+ user.visible_message("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!")
+ return(OXYLOSS)
+
+/obj/item/cane
+ name = "cane"
+ desc = "A cane used by a true gentleman. Or a clown."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "cane"
+ item_state = "stick"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ force = 5
+ throwforce = 5
+ w_class = WEIGHT_CLASS_SMALL
+ materials = list(MAT_METAL=50)
+ attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
+
+/obj/item/staff
+ name = "wizard staff"
+ desc = "Apparently a staff used by the wizard."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "staff"
+ lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+ force = 3
+ throwforce = 5
+ throw_speed = 2
+ throw_range = 5
+ w_class = WEIGHT_CLASS_SMALL
+ armour_penetration = 100
+ attack_verb = list("bludgeoned", "whacked", "disciplined")
+ resistance_flags = FLAMMABLE
+
+/obj/item/staff/broom
+ name = "broom"
+ desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "broom"
+ resistance_flags = FLAMMABLE
+
+/obj/item/staff/stick
+ name = "stick"
+ desc = "A great tool to drag someone else's drinks across the bar."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "stick"
+ item_state = "stick"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ force = 3
+ throwforce = 5
+ throw_speed = 2
+ throw_range = 5
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/ectoplasm
+ name = "ectoplasm"
+ desc = "spooky"
+ gender = PLURAL
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "ectoplasm"
+
+/obj/item/ectoplasm/suicide_act(mob/user)
+ user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane.")
+ return (OXYLOSS)
+
+/obj/item/mounted_chainsaw
+ name = "mounted chainsaw"
+ desc = "A chainsaw that has replaced your arm."
+ icon_state = "chainsaw_on"
+ item_state = "mounted_chainsaw"
+ lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
+ flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1
+ w_class = WEIGHT_CLASS_HUGE
+ force = 21
+ throwforce = 0
+ throw_range = 0
+ throw_speed = 0
+ sharpness = IS_SHARP
+ attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
+ hitsound = 'sound/weapons/chainsawhit.ogg'
+
+/obj/item/mounted_chainsaw/Destroy()
+ var/obj/item/bodypart/part
+ new /obj/item/twohanded/required/chainsaw(get_turf(src))
+ if(iscarbon(loc))
+ var/mob/living/carbon/holder = loc
+ var/index = holder.get_held_index_of_item(src)
+ if(index)
+ part = holder.hand_bodyparts[index]
+ . = ..()
+ if(part)
+ part.drop_limb()
+
+/obj/item/statuebust
+ name = "bust"
+ desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it
+ icon = 'icons/obj/statue.dmi'
+ icon_state = "bust"
+ force = 15
+ throwforce = 10
+ throw_speed = 5
+ throw_range = 2
+ attack_verb = list("busted")
+
+/obj/item/tailclub
+ name = "tail club"
+ desc = "For the beating to death of lizards with their own tails."
+ icon_state = "tailclub"
+ force = 14
+ throwforce = 1 // why are you throwing a club do you even weapon
+ throw_speed = 1
+ throw_range = 1
+ attack_verb = list("clubbed", "bludgeoned")
+
+/obj/item/melee/chainofcommand/tailwhip
+ name = "liz o' nine tails"
+ desc = "A whip fashioned from the severed tails of lizards."
+ icon_state = "tailwhip"
+ origin_tech = "engineering=3;combat=3;biotech=3"
+ needs_permit = 0
+
+/obj/item/melee/chainofcommand/tailwhip/kitty
+ name = "cat o' nine tails"
+ desc = "A whip fashioned from the severed tails of cats."
+ icon_state = "catwhip"
+
+/obj/item/melee/skateboard
+ name = "skateboard"
+ desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
+ icon_state = "skateboard"
+ item_state = "skateboard"
+ force = 12
+ throwforce = 4
+ w_class = WEIGHT_CLASS_HUGE
+ attack_verb = list("smacked", "whacked", "slammed", "smashed")
+
+/obj/item/melee/skateboard/attack_self(mob/user)
+ new /obj/vehicle/scooter/skateboard(get_turf(user))
+ qdel(src)
+
+/obj/item/melee/baseball_bat
+ name = "baseball bat"
+ desc = "There ain't a skull in the league that can withstand a swatter."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "baseball_bat"
+ item_state = "baseball_bat"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ force = 10
+ throwforce = 12
+ attack_verb = list("beat", "smacked")
+ w_class = WEIGHT_CLASS_HUGE
+ var/homerun_ready = 0
+ var/homerun_able = 0
+
+/obj/item/melee/baseball_bat/homerun
+ name = "home run bat"
+ desc = "This thing looks dangerous... Dangerously good at baseball, that is."
+ homerun_able = 1
+
+/obj/item/melee/baseball_bat/attack_self(mob/user)
+ if(!homerun_able)
+ ..()
+ return
+ if(homerun_ready)
+ to_chat(user, "You're already ready to do a home run!")
+ ..()
+ return
+ to_chat(user, "You begin gathering strength...")
+ playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1)
+ if(do_after(user, 90, target = src))
+ to_chat(user, "You gather power! Time for a home run!")
+ homerun_ready = 1
+ ..()
+
+/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user)
+ . = ..()
+ var/atom/throw_target = get_edge_target_turf(target, user.dir)
+ if(homerun_ready)
+ user.visible_message("It's a home run!")
+ target.throw_at(throw_target, rand(8,10), 14, user)
+ target.ex_act(EXPLODE_HEAVY)
+ playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
+ homerun_ready = 0
+ return
+ else if(!target.anchored)
+ target.throw_at(throw_target, rand(1,2), 7, user)
+
+/obj/item/melee/baseball_bat/ablative
+ name = "metal baseball bat"
+ desc = "This bat is made of highly reflective, highly armored material."
+ icon_state = "baseball_bat_metal"
+ item_state = "baseball_bat_metal"
+ force = 12
+ throwforce = 15
+
+/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers
+ var/picksound = rand(1,2)
+ var/turf = get_turf(src)
+ if(picksound == 1)
+ playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, 1)
+ if(picksound == 2)
+ playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, 1)
+ return 1
+
+/obj/item/melee/flyswatter
+ name = "flyswatter"
+ desc = "Useful for killing insects of all sizes."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "flyswatter"
+ item_state = "flyswatter"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ force = 1
+ throwforce = 1
+ attack_verb = list("swatted", "smacked")
+ hitsound = 'sound/effects/snap.ogg'
+ w_class = WEIGHT_CLASS_SMALL
+ //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
+ var/list/strong_against
+
+/obj/item/melee/flyswatter/Initialize()
+ . = ..()
+ strong_against = typecacheof(list(
+ /mob/living/simple_animal/hostile/poison/bees/,
+ /mob/living/simple_animal/butterfly,
+ /mob/living/simple_animal/cockroach,
+ /obj/item/queen_bee
+ ))
+
+
+/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
+ if(proximity_flag)
+ if(is_type_in_typecache(target, strong_against))
+ new /obj/effect/decal/cleanable/deadcockroach(get_turf(target))
+ to_chat(user, "You easily splat the [target].")
+ if(istype(target, /mob/living/))
+ var/mob/living/bug = target
+ bug.death(1)
+ else
+ qdel(target)
+
+/obj/item/circlegame
+ name = "circled hand"
+ desc = "If somebody looks at this while it's below your waist, you get to bop them."
+ icon_state = "madeyoulook"
+ force = 0
+ throwforce = 0
+ flags_1 = DROPDEL_1 | ABSTRACT_1
+ attack_verb = list("bopped")
+
+/obj/item/proc/can_trigger_gun(mob/living/user)
+ if(!user.can_use_guns(src))
+ return FALSE
return TRUE
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
new file mode 100644
index 0000000000..f8a020b677
--- /dev/null
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -0,0 +1,531 @@
+/obj/item/weapon/storage/belt
+ name = "belt"
+ desc = "Can hold various things."
+ icon = 'icons/obj/clothing/belts.dmi'
+ icon_state = "utilitybelt"
+ item_state = "utility"
+ slot_flags = SLOT_BELT
+ attack_verb = list("whipped", "lashed", "disciplined")
+ max_integrity = 300
+ var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
+
+/obj/item/weapon/storage/belt/update_icon()
+ cut_overlays()
+ if(content_overlays)
+ for(var/obj/item/I in contents)
+ var/mutable_appearance/M = I.get_belt_overlay()
+ add_overlay(M)
+ ..()
+
+/obj/item/weapon/storage/belt/Initialize()
+ . = ..()
+ update_icon()
+
+/obj/item/weapon/storage/belt/utility
+ name = "toolbelt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
+ desc = "Holds tools."
+ icon_state = "utilitybelt"
+ item_state = "utility"
+ can_hold = list(
+ /obj/item/weapon/crowbar,
+ /obj/item/weapon/screwdriver,
+ /obj/item/weapon/weldingtool,
+ /obj/item/weapon/wirecutters,
+ /obj/item/weapon/wrench,
+ /obj/item/device/multitool,
+ /obj/item/device/flashlight,
+ /obj/item/stack/cable_coil,
+ /obj/item/device/t_scanner,
+ /obj/item/device/analyzer,
+ /obj/item/weapon/extinguisher/mini,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves
+ )
+ content_overlays = TRUE
+
+/obj/item/weapon/storage/belt/utility/chief
+ name = "\improper Chief Engineer's toolbelt" //"the Chief Engineer's toolbelt", because "Chief Engineer's toolbelt" is not a proper noun
+ desc = "Holds tools, looks snazzy."
+ icon_state = "utilitybelt_ce"
+ item_state = "utility_ce"
+
+/obj/item/weapon/storage/belt/utility/chief/full/PopulateContents()
+ new /obj/item/weapon/screwdriver/power(src)
+ new /obj/item/weapon/crowbar/power(src)
+ new /obj/item/weapon/weldingtool/experimental(src)//This can be changed if this is too much
+ new /obj/item/device/multitool(src)
+ new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
+ new /obj/item/weapon/extinguisher/mini(src)
+ new /obj/item/device/analyzer(src)
+ //much roomier now that we've managed to remove two tools
+
+
+/obj/item/weapon/storage/belt/utility/full/PopulateContents()
+ new /obj/item/weapon/screwdriver(src)
+ new /obj/item/weapon/wrench(src)
+ new /obj/item/weapon/weldingtool(src)
+ new /obj/item/weapon/crowbar(src)
+ new /obj/item/weapon/wirecutters(src)
+ new /obj/item/device/multitool(src)
+ new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
+
+/obj/item/weapon/storage/belt/utility/full/engi/PopulateContents()
+ new /obj/item/weapon/screwdriver(src)
+ new /obj/item/weapon/wrench(src)
+ new /obj/item/weapon/weldingtool/largetank(src)
+ new /obj/item/weapon/crowbar(src)
+ new /obj/item/weapon/wirecutters(src)
+ new /obj/item/device/multitool(src)
+ new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
+
+
+/obj/item/weapon/storage/belt/utility/atmostech/PopulateContents()
+ new /obj/item/weapon/screwdriver(src)
+ new /obj/item/weapon/wrench(src)
+ new /obj/item/weapon/weldingtool(src)
+ new /obj/item/weapon/crowbar(src)
+ new /obj/item/weapon/wirecutters(src)
+ new /obj/item/device/t_scanner(src)
+ new /obj/item/weapon/extinguisher/mini(src)
+
+
+/obj/item/weapon/storage/belt/utility/servant/PopulateContents()
+ new /obj/item/weapon/screwdriver/brass(src)
+ new /obj/item/weapon/wirecutters/brass(src)
+ new /obj/item/weapon/wrench/brass(src)
+ new /obj/item/weapon/crowbar/brass(src)
+ new /obj/item/weapon/weldingtool/experimental/brass(src)
+ new /obj/item/device/multitool(src)
+ new /obj/item/stack/cable_coil(src, 30, "yellow")
+
+
+/obj/item/weapon/storage/belt/medical
+ name = "medical belt"
+ desc = "Can hold various medical equipment."
+ icon_state = "medicalbelt"
+ item_state = "medical"
+ max_w_class = WEIGHT_CLASS_BULKY
+ can_hold = list(
+ /obj/item/device/healthanalyzer,
+ /obj/item/weapon/dnainjector,
+ /obj/item/weapon/reagent_containers/dropper,
+ /obj/item/weapon/reagent_containers/glass/beaker,
+ /obj/item/weapon/reagent_containers/glass/bottle,
+ /obj/item/weapon/reagent_containers/pill,
+ /obj/item/weapon/reagent_containers/syringe,
+ /obj/item/weapon/lighter,
+ /obj/item/weapon/storage/fancy/cigarettes,
+ /obj/item/weapon/storage/pill_bottle,
+ /obj/item/stack/medical,
+ /obj/item/device/flashlight/pen,
+ /obj/item/weapon/extinguisher/mini,
+ /obj/item/weapon/reagent_containers/hypospray,
+ /obj/item/device/sensor_device,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves/,
+ /obj/item/weapon/lazarus_injector,
+ /obj/item/weapon/bikehorn/rubberducky,
+ /obj/item/clothing/mask/surgical,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/mask/breath/medical,
+ /obj/item/weapon/surgical_drapes, //for true paramedics
+ /obj/item/weapon/scalpel,
+ /obj/item/weapon/circular_saw,
+ /obj/item/weapon/surgicaldrill,
+ /obj/item/weapon/retractor,
+ /obj/item/weapon/cautery,
+ /obj/item/weapon/hemostat,
+ /obj/item/device/geiger_counter,
+ /obj/item/clothing/neck/stethoscope,
+ /obj/item/weapon/stamp,
+ /obj/item/clothing/glasses,
+ /obj/item/weapon/wrench/medical,
+ /obj/item/clothing/mask/muzzle,
+ /obj/item/weapon/storage/bag/chemistry,
+ /obj/item/weapon/storage/bag/bio,
+ /obj/item/weapon/reagent_containers/blood,
+ /obj/item/weapon/tank/internals/emergency_oxygen
+ )
+
+
+/obj/item/weapon/storage/belt/security
+ name = "security belt"
+ desc = "Can hold security gear like handcuffs and flashes."
+ icon_state = "securitybelt"
+ item_state = "security"//Could likely use a better one.
+ storage_slots = 5
+ max_w_class = WEIGHT_CLASS_NORMAL //Because the baton wouldn't fit otherwise. - Neerti
+ can_hold = list(
+ /obj/item/weapon/melee/baton,
+ /obj/item/weapon/melee/classic_baton,
+ /obj/item/weapon/grenade,
+ /obj/item/weapon/reagent_containers/spray/pepper,
+ /obj/item/weapon/restraints/handcuffs,
+ /obj/item/device/assembly/flash/handheld,
+ /obj/item/clothing/glasses,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_box,
+ /obj/item/weapon/reagent_containers/food/snacks/donut,
+ /obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
+ /obj/item/weapon/kitchen/knife/combat,
+ /obj/item/device/flashlight/seclite,
+ /obj/item/weapon/melee/classic_baton/telescopic,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves/,
+ /obj/item/weapon/restraints/legcuffs/bola
+ )
+ content_overlays = TRUE
+
+/obj/item/weapon/storage/belt/security/full/PopulateContents()
+ new /obj/item/weapon/reagent_containers/spray/pepper(src)
+ new /obj/item/weapon/restraints/handcuffs(src)
+ new /obj/item/weapon/grenade/flashbang(src)
+ new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/weapon/melee/baton/loaded(src)
+ update_icon()
+
+
+/obj/item/weapon/storage/belt/mining
+ name = "explorer's webbing"
+ desc = "A versatile chest rig, cherished by miners and hunters alike."
+ icon_state = "explorer1"
+ item_state = "explorer1"
+ storage_slots = 6
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_BULKY //Pickaxes are big.
+ max_combined_w_class = 20 //Not an issue with this whitelist, probably.
+ can_hold = list(
+ /obj/item/weapon/crowbar,
+ /obj/item/weapon/screwdriver,
+ /obj/item/weapon/weldingtool,
+ /obj/item/weapon/wirecutters,
+ /obj/item/weapon/wrench,
+ /obj/item/device/flashlight,
+ /obj/item/stack/cable_coil,
+ /obj/item/device/analyzer,
+ /obj/item/weapon/extinguisher/mini,
+ /obj/item/device/radio,
+ /obj/item/clothing/gloves,
+ /obj/item/weapon/resonator,
+ /obj/item/device/mining_scanner,
+ /obj/item/weapon/pickaxe,
+ /obj/item/stack/sheet/animalhide,
+ /obj/item/stack/sheet/sinew,
+ /obj/item/stack/sheet/bone,
+ /obj/item/weapon/lighter,
+ /obj/item/weapon/storage/fancy/cigarettes,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle,
+ /obj/item/stack/medical,
+ /obj/item/weapon/kitchen/knife,
+ /obj/item/weapon/reagent_containers/hypospray,
+ /obj/item/device/gps,
+ /obj/item/weapon/storage/bag/ore,
+ /obj/item/weapon/survivalcapsule,
+ /obj/item/device/t_scanner/adv_mining_scanner,
+ /obj/item/weapon/reagent_containers/pill,
+ /obj/item/weapon/storage/pill_bottle,
+ /obj/item/weapon/ore,
+ /obj/item/weapon/reagent_containers/food/drinks,
+ /obj/item/organ/regenerative_core,
+ /obj/item/device/wormhole_jaunter,
+ /obj/item/weapon/storage/bag/plants,
+ /obj/item/stack/marker_beacon
+ )
+
+
+/obj/item/weapon/storage/belt/mining/vendor
+ contents = newlist(/obj/item/weapon/survivalcapsule)
+
+/obj/item/weapon/storage/belt/mining/alt
+ icon_state = "explorer2"
+ item_state = "explorer2"
+
+/obj/item/weapon/storage/belt/mining/primitive
+ name = "hunter's belt"
+ desc = "A versatile belt, woven from sinew."
+ storage_slots = 5
+ icon_state = "ebelt"
+ item_state = "ebelt"
+
+/obj/item/weapon/storage/belt/soulstone
+ name = "soul stone belt"
+ desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
+ icon_state = "soulstonebelt"
+ item_state = "soulstonebelt"
+ storage_slots = 6
+ can_hold = list(
+ /obj/item/device/soulstone
+ )
+
+/obj/item/weapon/storage/belt/soulstone/full/PopulateContents()
+ for(var/i in 1 to 6)
+ new /obj/item/device/soulstone(src)
+
+/obj/item/weapon/storage/belt/champion
+ name = "championship belt"
+ desc = "Proves to the world that you are the strongest!"
+ icon_state = "championbelt"
+ item_state = "champion"
+ materials = list(MAT_GOLD=400)
+ storage_slots = 1
+ can_hold = list(
+ /obj/item/clothing/mask/luchador
+ )
+
+/obj/item/weapon/storage/belt/military
+ name = "chest rig"
+ desc = "A set of tactical webbing worn by Syndicate boarding parties."
+ icon_state = "militarywebbing"
+ item_state = "militarywebbing"
+ max_w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/weapon/storage/belt/military/abductor
+ name = "agent belt"
+ desc = "A belt used by abductor agents."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "belt"
+ item_state = "security"
+
+/obj/item/weapon/storage/belt/military/abductor/full/PopulateContents()
+ new /obj/item/weapon/screwdriver/abductor(src)
+ new /obj/item/weapon/wrench/abductor(src)
+ new /obj/item/weapon/weldingtool/abductor(src)
+ new /obj/item/weapon/crowbar/abductor(src)
+ new /obj/item/weapon/wirecutters/abductor(src)
+ new /obj/item/device/multitool/abductor(src)
+ new /obj/item/stack/cable_coil(src,30,"white")
+
+
+/obj/item/weapon/storage/belt/military/army
+ name = "army belt"
+ desc = "A belt used by military forces."
+ icon_state = "grenadebeltold"
+ item_state = "security"
+
+/obj/item/weapon/storage/belt/military/assault
+ name = "assault belt"
+ desc = "A tactical assault belt."
+ icon_state = "assaultbelt"
+ item_state = "security"
+ storage_slots = 6
+
+/obj/item/weapon/storage/belt/grenade
+ name = "grenadier belt"
+ desc = "A belt for holding grenades."
+ icon_state = "grenadebeltnew"
+ item_state = "security"
+ max_w_class = WEIGHT_CLASS_BULKY
+ display_contents_with_number = TRUE
+ storage_slots = 30
+ max_combined_w_class = 60 //needs to be this high
+ can_hold = list(
+ /obj/item/weapon/grenade,
+ /obj/item/weapon/screwdriver,
+ /obj/item/weapon/lighter,
+ /obj/item/device/multitool,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/molotov,
+ /obj/item/weapon/grenade/plastic/c4,
+ )
+/obj/item/weapon/storage/belt/grenade/full/PopulateContents()
+ new /obj/item/weapon/grenade/flashbang(src)
+ new /obj/item/weapon/grenade/smokebomb(src)
+ new /obj/item/weapon/grenade/smokebomb(src)
+ new /obj/item/weapon/grenade/smokebomb(src)
+ new /obj/item/weapon/grenade/smokebomb(src)
+ new /obj/item/weapon/grenade/empgrenade(src)
+ new /obj/item/weapon/grenade/empgrenade(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/weapon/grenade/gluon(src)
+ new /obj/item/weapon/grenade/gluon(src)
+ new /obj/item/weapon/grenade/gluon(src)
+ new /obj/item/weapon/grenade/gluon(src)
+ new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+ new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+ new /obj/item/weapon/grenade/chem_grenade/facid(src)
+ new /obj/item/weapon/grenade/syndieminibomb(src)
+ new /obj/item/weapon/grenade/syndieminibomb(src)
+ new /obj/item/weapon/screwdriver(src)
+ new /obj/item/device/multitool(src)
+
+/obj/item/weapon/storage/belt/wands
+ name = "wand belt"
+ desc = "A belt designed to hold various rods of power. A veritable fanny pack of exotic magic."
+ icon_state = "soulstonebelt"
+ item_state = "soulstonebelt"
+ storage_slots = 6
+ can_hold = list(
+ /obj/item/weapon/gun/magic/wand
+ )
+
+/obj/item/weapon/storage/belt/wands/full/PopulateContents()
+ new /obj/item/weapon/gun/magic/wand/death(src)
+ new /obj/item/weapon/gun/magic/wand/resurrection(src)
+ new /obj/item/weapon/gun/magic/wand/polymorph(src)
+ new /obj/item/weapon/gun/magic/wand/teleport(src)
+ new /obj/item/weapon/gun/magic/wand/door(src)
+ new /obj/item/weapon/gun/magic/wand/fireball(src)
+
+ for(var/obj/item/weapon/gun/magic/wand/W in contents) //All wands in this pack come in the best possible condition
+ W.max_charges = initial(W.max_charges)
+ W.charges = W.max_charges
+
+/obj/item/weapon/storage/belt/janitor
+ name = "janibelt"
+ desc = "A belt used to hold most janitorial supplies."
+ icon_state = "janibelt"
+ item_state = "janibelt"
+ storage_slots = 6
+ max_w_class = WEIGHT_CLASS_BULKY // Set to this so the light replacer can fit.
+ can_hold = list(
+ /obj/item/weapon/grenade/chem_grenade,
+ /obj/item/device/lightreplacer,
+ /obj/item/device/flashlight,
+ /obj/item/weapon/reagent_containers/spray,
+ /obj/item/weapon/soap,
+ /obj/item/weapon/holosign_creator,
+ /obj/item/key/janitor,
+ /obj/item/clothing/gloves
+ )
+
+/obj/item/weapon/storage/belt/bandolier
+ name = "bandolier"
+ desc = "A bandolier for holding shotgun ammunition."
+ icon_state = "bandolier"
+ item_state = "bandolier"
+ storage_slots = 18
+ display_contents_with_number = TRUE
+ can_hold = list(
+ /obj/item/ammo_casing/shotgun
+ )
+
+/obj/item/weapon/storage/belt/holster
+ name = "shoulder holster"
+ desc = "A holster to carry a handgun and ammo. WARNING: Badasses only."
+ icon_state = "holster"
+ item_state = "holster"
+ storage_slots = 3
+ max_w_class = WEIGHT_CLASS_NORMAL
+ can_hold = list(
+ /obj/item/weapon/gun/ballistic/automatic/pistol,
+ /obj/item/weapon/gun/ballistic/revolver,
+ /obj/item/ammo_box,
+ )
+ alternate_worn_layer = UNDER_SUIT_LAYER
+
+/obj/item/weapon/storage/belt/holster/full/PopulateContents()
+ new /obj/item/weapon/gun/ballistic/revolver/detective(src)
+ new /obj/item/ammo_box/c38(src)
+ new /obj/item/ammo_box/c38(src)
+
+/obj/item/weapon/storage/belt/fannypack
+ name = "fannypack"
+ desc = "A dorky fannypack for keeping small items in."
+ icon_state = "fannypack_leather"
+ item_state = "fannypack_leather"
+ storage_slots = 3
+ max_w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/weapon/storage/belt/fannypack/black
+ name = "black fannypack"
+ icon_state = "fannypack_black"
+ item_state = "fannypack_black"
+
+/obj/item/weapon/storage/belt/fannypack/red
+ name = "red fannypack"
+ icon_state = "fannypack_red"
+ item_state = "fannypack_red"
+
+/obj/item/weapon/storage/belt/fannypack/purple
+ name = "purple fannypack"
+ icon_state = "fannypack_purple"
+ item_state = "fannypack_purple"
+
+/obj/item/weapon/storage/belt/fannypack/blue
+ name = "blue fannypack"
+ icon_state = "fannypack_blue"
+ item_state = "fannypack_blue"
+
+/obj/item/weapon/storage/belt/fannypack/orange
+ name = "orange fannypack"
+ icon_state = "fannypack_orange"
+ item_state = "fannypack_orange"
+
+/obj/item/weapon/storage/belt/fannypack/white
+ name = "white fannypack"
+ icon_state = "fannypack_white"
+ item_state = "fannypack_white"
+
+/obj/item/weapon/storage/belt/fannypack/green
+ name = "green fannypack"
+ icon_state = "fannypack_green"
+ item_state = "fannypack_green"
+
+/obj/item/weapon/storage/belt/fannypack/pink
+ name = "pink fannypack"
+ icon_state = "fannypack_pink"
+ item_state = "fannypack_pink"
+
+/obj/item/weapon/storage/belt/fannypack/cyan
+ name = "cyan fannypack"
+ icon_state = "fannypack_cyan"
+ item_state = "fannypack_cyan"
+
+/obj/item/weapon/storage/belt/fannypack/yellow
+ name = "yellow fannypack"
+ icon_state = "fannypack_yellow"
+ item_state = "fannypack_yellow"
+
+/obj/item/weapon/storage/belt/sabre
+ name = "sabre sheath"
+ desc = "An ornate sheath designed to hold an officer's blade."
+ icon_state = "sheath"
+ item_state = "sheath"
+ storage_slots = 1
+ rustle_jimmies = FALSE
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_BULKY
+ can_hold = list(
+ /obj/item/weapon/melee/sabre
+ )
+
+/obj/item/weapon/storage/belt/sabre/examine(mob/user)
+ ..()
+ if(contents.len)
+ to_chat(user, "Alt-click it to quickly draw the blade.")
+
+/obj/item/weapon/storage/belt/sabre/AltClick(mob/user)
+ if(!ishuman(user) || !user.canUseTopic(src, be_close=TRUE))
+ return
+ if(contents.len)
+ var/obj/item/I = contents[1]
+ user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\
+ )
+ user.put_in_hands(I)
+ update_icon()
+ else
+ to_chat(user, "[src] is empty.")
+
+/obj/item/weapon/storage/belt/sabre/update_icon()
+ icon_state = "sheath"
+ item_state = "sheath"
+ if(contents.len)
+ icon_state += "-sabre"
+ item_state += "-sabre"
+ if(loc && isliving(loc))
+ var/mob/living/L = loc
+ L.regenerate_icons()
+ ..()
+
+
+/obj/item/weapon/storage/belt/sabre/PopulateContents()
+ new /obj/item/weapon/melee/sabre(src)
+ update_icon()
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 1f3668f283..dffa22670c 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -169,6 +169,7 @@
return
/obj/singularity_pull(S, current_size)
+ ..()
if(!anchored || current_size >= STAGE_FIVE)
step_towards(src,S)
@@ -198,7 +199,7 @@
/obj/vv_get_dropdown()
. = ..()
- .["Delete all of type"] = "?_src_=vars;delall=\ref[src]"
+ .["Delete all of type"] = "?_src_=vars;[HrefToken()];delall=\ref[src]"
/obj/examine(mob/user)
..()
@@ -225,6 +226,3 @@
current_skin = choice
icon_state = unique_reskin[choice]
to_chat(M, "[src] is now skinned as '[choice].'")
-
-/obj/proc/gang_contraband_value()
- return 0
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index 326b945fd5..d01cd5a191 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -4,6 +4,7 @@
name = "\improper AI core"
icon = 'icons/mob/ai.dmi'
icon_state = "0"
+ desc = "The framework for an artificial intelligence core."
max_integrity = 500
var/state = 0
var/datum/ai_laws/laws = new()
@@ -45,14 +46,13 @@
switch(state)
if(EMPTY_CORE)
if(istype(P, /obj/item/circuitboard/aicore))
- if(!user.drop_item())
+ if(!user.transferItemToLoc(P, src))
return
playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
to_chat(user, "You place the circuit board inside the frame.")
update_icon()
state = CIRCUIT_CORE
circuit = P
- P.forceMove(src)
return
if(CIRCUIT_CORE)
if(istype(P, /obj/item/screwdriver))
@@ -135,7 +135,7 @@
to_chat(user, "Sticking an inactive [M.name] into the frame would sort of defeat the purpose.")
return
- if((config) && (!config.allow_ai) || jobban_isbanned(M.brainmob, "AI"))
+ if(!CONFIG_GET(flag/allow_ai) || jobban_isbanned(M.brainmob, "AI"))
to_chat(user, "This [M.name] does not seem to fit!")
return
@@ -143,10 +143,9 @@
to_chat(user, "This [M.name] is mindless!")
return
- if(!user.drop_item())
+ if(!user.transferItemToLoc(M,src))
return
- M.forceMove(src)
brain = M
to_chat(user, "You add [M.name] to the frame.")
update_icon()
@@ -176,7 +175,14 @@
SSticker.mode.remove_antag_for_borging(brain.brainmob.mind)
if(!istype(brain.laws, /datum/ai_laws/ratvar))
remove_servant_of_ratvar(brain.brainmob, TRUE)
- var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
+
+ var/mob/living/silicon/ai/A = null
+
+ if (brain.overrides_aicore_laws)
+ A = new /mob/living/silicon/ai(loc, brain.laws, brain.brainmob)
+ else
+ A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
+
if(brain.force_replace_ai_name)
A.fully_replace_character_name(A.name, brain.replacement_ai_name())
SSblackbox.inc("cyborg_ais_created",1)
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index df3f2ad9fa..ae79c7e86d 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -127,7 +127,7 @@
/obj/structure/alien/weeds/Initialize()
pixel_x = -4
pixel_y = -4 //so the sprites line up right in the map editor
- ..()
+ . = ..()
if(!blacklisted_turfs)
blacklisted_turfs = typecacheof(list(
@@ -178,7 +178,7 @@
/obj/structure/alien/weeds/node/Initialize()
icon = 'icons/obj/smooth_structures/alien/weednode.dmi'
- ..()
+ . = ..()
set_light(lon_range)
var/obj/structure/alien/weeds/W = locate(/obj/structure/alien/weeds) in loc
if(W && W != src)
@@ -223,7 +223,7 @@
var/obj/item/clothing/mask/facehugger/child
/obj/structure/alien/egg/Initialize(mapload)
- ..()
+ . = ..()
update_icon()
if(status == GROWING || status == GROWN)
child = new(src)
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index e34278e51b..aed1679322 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -15,7 +15,7 @@
layer = OBJ_LAYER
/obj/structure/chair/Initialize()
- ..()
+ . = ..()
if(!anchored) //why would you put these on the shuttle?
addtimer(CALLBACK(src, .proc/RemoveFromLatejoin), 0)
@@ -40,6 +40,11 @@
W.setDir(dir)
qdel(src)
+/obj/structure/chair/ratvar_act()
+ var/obj/structure/chair/brass/B = new(get_turf(src))
+ B.setDir(dir)
+ qdel(src)
+
/obj/structure/chair/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
playsound(src.loc, W.usesound, 50, 1)
@@ -93,7 +98,7 @@
set category = "Object"
set src in oview(1)
- if(config.ghost_interaction)
+ if(CONFIG_GET(flag/ghost_interaction))
spin()
else
if(!usr || !isturf(usr.loc))
@@ -331,3 +336,34 @@
desc = "You sit in this. Either by will or force. Looks REALLY uncomfortable."
icon_state = "chairold"
item_chair = null
+
+/obj/structure/chair/brass
+ name = "brass chair"
+ desc = "A spinny chair made of brass. It looks uncomfortable."
+ icon_state = "brass_chair"
+ max_integrity = 150
+ buildstacktype = /obj/item/stack/tile/brass
+ buildstackamount = 1
+
+/obj/structure/chair/brass/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ . = ..()
+
+/obj/structure/chair/brass/process()
+ spin()
+ playsound(src, 'sound/effects/servostep.ogg', 50, FALSE)
+
+/obj/structure/chair/brass/ratvar_act()
+ return
+
+/obj/structure/chair/brass/AltClick(mob/living/user)
+ if(!user.canUseTopic(src, be_close = TRUE))
+ return
+ if(!isprocessing)
+ user.visible_message("[user] spins [src] around, and Ratvarian technology keeps it spinning FOREVER.", \
+ "Automated spinny chairs. The pinnacle of Ratvarian technology.")
+ START_PROCESSING(SSfastprocess, src)
+ else
+ user.visible_message("[user] stops [src]'s uncontrollable spinning.", \
+ "You grab [src] and stop its wild spinning.")
+ STOP_PROCESSING(SSfastprocess, src)
diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm
new file mode 100644
index 0000000000..69d0f4b8d8
--- /dev/null
+++ b/code/game/objects/structures/beds_chairs/sofa.dm
@@ -0,0 +1,12 @@
+/obj/structure/chair/sofa
+ name = "old ratty sofa"
+ icon_state = "sofamiddle"
+ icon = 'icons/obj/sofa.dmi'
+ buildstackamount = 1
+
+/obj/structure/chair/sofa/left
+ icon_state = "sofaend_left"
+/obj/structure/chair/sofa/right
+ icon_state = "sofaend_right"
+/obj/structure/chair/sofa/corner
+ icon_state = "sofacorner"
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 78e672e49d..c7b63be32b 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -15,8 +15,8 @@
max_integrity = 200
integrity_failure = 50
armor = list(melee = 20, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 60)
- var/breakout_time = 2
- var/lastbang
+ var/breakout_time = 1200
+ var/message_cooldown
var/can_weld_shut = TRUE
var/horizontal = FALSE
var/allow_objects = FALSE
@@ -300,14 +300,12 @@
/obj/structure/closet/relaymove(mob/user)
if(user.stat || !isturf(loc) || !isliving(user))
return
- var/mob/living/L = user
- if(!open())
- if(L.last_special <= world.time)
- container_resist(L)
- if(world.time > lastbang+5)
- lastbang = world.time
- for(var/mob/M in get_hearers_in_view(src, null))
- M.show_message("BANG, bang!", 2)
+ if(locked)
+ if(message_cooldown <= world.time)
+ message_cooldown = world.time + 50
+ to_chat(user, "[src]'s door won't budge!")
+ return
+ container_resist()
/obj/structure/closet/attack_hand(mob/user)
..()
@@ -367,9 +365,10 @@
//okay, so the closet is either welded or locked... resist!!!
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
- to_chat(user, "You lean on the back of [src] and start pushing the door open.")
- visible_message("[src] begins to shake violently!")
- if(do_after(user,(breakout_time * 60 * 10), target = src)) //minutes * 60seconds * 10deciseconds
+ user.visible_message("[src] begins to shake violently!", \
+ "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \
+ "You hear banging from [src].")
+ if(do_after(user,(breakout_time), target = src))
if(!user || user.stat != CONSCIOUS || user.loc != src || opened || (!locked && !welded) )
return
//we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting
@@ -388,7 +387,7 @@
/obj/structure/closet/AltClick(mob/user)
..()
- if(!user.canUseTopic(src, be_close=TRUE))
+ if(!user.canUseTopic(src, be_close=TRUE) || !isturf(loc))
to_chat(user, "You can't do that right now!")
return
if(opened || !secure)
@@ -451,3 +450,7 @@
/obj/structure/closet/AllowDrop()
return TRUE
+
+
+/obj/structure/closet/return_temperature()
+ return
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index a920a53c7f..1bf7daf2e2 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -23,7 +23,7 @@
return
move_delay = 1
if(step(src, direction))
- spawn(config.walk_speed*move_speed_multiplier)
+ spawn(CONFIG_GET(number/walk_delay) * move_speed_multiplier)
move_delay = 0
else
move_delay = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 77723e3e41..4e83a709b9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -1,19 +1,20 @@
-/obj/structure/closet/secure_closet/quartermaster
- name = "\proper quartermaster's locker"
+/obj/structure/closet/secure_closet/quartermaster
+ name = "\proper quartermaster's locker"
req_access = list(ACCESS_QM)
- icon_state = "qm"
-
-/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
- ..()
- new /obj/item/clothing/neck/cloak/qm(src)
- new /obj/item/clothing/under/rank/cargo(src)
- new /obj/item/clothing/shoes/sneakers/brown(src)
- new /obj/item/device/radio/headset/headset_cargo(src)
- new /obj/item/clothing/suit/fire/firefighter(src)
- new /obj/item/clothing/gloves/fingerless(src)
- new /obj/item/device/megaphone/cargo(src)
- new /obj/item/tank/internals/emergency_oxygen(src)
- new /obj/item/clothing/mask/gas(src)
- new /obj/item/clothing/head/soft(src)
- new /obj/item/device/export_scanner(src)
- new /obj/item/door_remote/quartermaster(src)
+ icon_state = "qm"
+
+/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
+ ..()
+ new /obj/item/clothing/neck/cloak/qm(src)
+ new /obj/item/storage/lockbox/medal/cargo/(src)
+ new /obj/item/clothing/under/rank/cargo(src)
+ new /obj/item/clothing/shoes/sneakers/brown(src)
+ new /obj/item/device/radio/headset/headset_cargo(src)
+ new /obj/item/clothing/suit/fire/firefighter(src)
+ new /obj/item/clothing/gloves/fingerless(src)
+ new /obj/item/device/megaphone/cargo(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/clothing/mask/gas(src)
+ new /obj/item/clothing/head/soft(src)
+ new /obj/item/device/export_scanner(src)
+ new /obj/item/door_remote/quartermaster(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 11f087d052..087f58c89f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -1,72 +1,79 @@
-/obj/structure/closet/secure_closet/freezer
- icon_state = "freezer"
-
-/obj/structure/closet/secure_closet/freezer/kitchen
- name = "kitchen Cabinet"
+/obj/structure/closet/secure_closet/freezer
+ icon_state = "freezer"
+ var/jones = FALSE
+
+/obj/structure/closet/secure_closet/freezer/ex_act()
+ if(!jones)
+ jones = TRUE
+ else
+ ..()
+
+/obj/structure/closet/secure_closet/freezer/kitchen
+ name = "kitchen Cabinet"
req_access = list(ACCESS_KITCHEN)
-
-/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
- ..()
- for(var/i = 0, i < 3, i++)
- new /obj/item/reagent_containers/food/condiment/flour(src)
- new /obj/item/reagent_containers/food/condiment/rice(src)
- new /obj/item/reagent_containers/food/condiment/sugar(src)
-
-/obj/structure/closet/secure_closet/freezer/kitchen/maintenance
- name = "maintenance refrigerator"
- desc = "This refrigerator looks quite dusty, is there anything edible still inside?"
- req_access = list()
-
-/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
- ..()
- for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/milk(src)
- for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
- for(var/i = 0, i < 2, i++)
- new /obj/item/storage/fancy/egg_box(src)
-
-/obj/structure/closet/secure_closet/freezer/kitchen/mining
- req_access = list()
-
-/obj/structure/closet/secure_closet/freezer/meat
- name = "meat fridge"
-
-/obj/structure/closet/secure_closet/freezer/meat/PopulateContents()
- ..()
- for(var/i = 0, i < 4, i++)
- new /obj/item/reagent_containers/food/snacks/meat/slab/monkey(src)
-/obj/structure/closet/secure_closet/freezer/fridge
- name = "refrigerator"
-
-/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
- ..()
- for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/milk(src)
- for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
- for(var/i = 0, i < 2, i++)
- new /obj/item/storage/fancy/egg_box(src)
-
-/obj/structure/closet/secure_closet/freezer/money
- name = "freezer"
- desc = "This contains cold hard cash."
+
+/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
+ ..()
+ for(var/i = 0, i < 3, i++)
+ new /obj/item/reagent_containers/food/condiment/flour(src)
+ new /obj/item/reagent_containers/food/condiment/rice(src)
+ new /obj/item/reagent_containers/food/condiment/sugar(src)
+
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance
+ name = "maintenance refrigerator"
+ desc = "This refrigerator looks quite dusty, is there anything edible still inside?"
+ req_access = list()
+
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
+ ..()
+ for(var/i = 0, i < 5, i++)
+ new /obj/item/reagent_containers/food/condiment/milk(src)
+ for(var/i = 0, i < 5, i++)
+ new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ for(var/i = 0, i < 2, i++)
+ new /obj/item/storage/fancy/egg_box(src)
+
+/obj/structure/closet/secure_closet/freezer/kitchen/mining
+ req_access = list()
+
+/obj/structure/closet/secure_closet/freezer/meat
+ name = "meat fridge"
+
+/obj/structure/closet/secure_closet/freezer/meat/PopulateContents()
+ ..()
+ for(var/i = 0, i < 4, i++)
+ new /obj/item/reagent_containers/food/snacks/meat/slab/monkey(src)
+/obj/structure/closet/secure_closet/freezer/fridge
+ name = "refrigerator"
+
+/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
+ ..()
+ for(var/i = 0, i < 5, i++)
+ new /obj/item/reagent_containers/food/condiment/milk(src)
+ for(var/i = 0, i < 5, i++)
+ new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ for(var/i = 0, i < 2, i++)
+ new /obj/item/storage/fancy/egg_box(src)
+
+/obj/structure/closet/secure_closet/freezer/money
+ name = "freezer"
+ desc = "This contains cold hard cash."
req_access = list(ACCESS_HEADS_VAULT)
-
-/obj/structure/closet/secure_closet/freezer/money/PopulateContents()
- ..()
- for(var/i = 0, i < 3, i++)
- new /obj/item/stack/spacecash/c1000(src)
- for(var/i = 0, i < 5, i++)
- new /obj/item/stack/spacecash/c500(src)
- for(var/i = 0, i < 6, i++)
- new /obj/item/stack/spacecash/c200(src)
-
-/obj/structure/closet/secure_closet/freezer/cream_pie
- name = "cream pie closet"
- desc = "Contains pies filled with cream and/or custard, you sickos."
+
+/obj/structure/closet/secure_closet/freezer/money/PopulateContents()
+ ..()
+ for(var/i = 0, i < 3, i++)
+ new /obj/item/stack/spacecash/c1000(src)
+ for(var/i = 0, i < 5, i++)
+ new /obj/item/stack/spacecash/c500(src)
+ for(var/i = 0, i < 6, i++)
+ new /obj/item/stack/spacecash/c200(src)
+
+/obj/structure/closet/secure_closet/freezer/cream_pie
+ name = "cream pie closet"
+ desc = "Contains pies filled with cream and/or custard, you sickos."
req_access = list(ACCESS_THEATRE)
-
-/obj/structure/closet/secure_closet/freezer/pie/PopulateContents()
- ..()
- new /obj/item/reagent_containers/food/snacks/pie/cream(src)
+
+/obj/structure/closet/secure_closet/freezer/pie/PopulateContents()
+ ..()
+ new /obj/item/reagent_containers/food/snacks/pie/cream(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index a2a055f464..ee9ecfc908 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -1,93 +1,94 @@
-/obj/structure/closet/secure_closet/medical1
- name = "medicine closet"
- desc = "Filled to the brim with medical junk."
- icon_state = "med"
+/obj/structure/closet/secure_closet/medical1
+ name = "medicine closet"
+ desc = "Filled to the brim with medical junk."
+ icon_state = "med"
req_access = list(ACCESS_MEDICAL)
-
-/obj/structure/closet/secure_closet/medical1/PopulateContents()
- ..()
- new /obj/item/reagent_containers/glass/beaker(src)
- new /obj/item/reagent_containers/glass/beaker(src)
- new /obj/item/reagent_containers/dropper(src)
- new /obj/item/reagent_containers/dropper(src)
- new /obj/item/storage/belt/medical(src)
- new /obj/item/storage/box/syringes(src)
- new /obj/item/reagent_containers/glass/bottle/toxin(src)
- new /obj/item/reagent_containers/glass/bottle/morphine(src)
- new /obj/item/reagent_containers/glass/bottle/morphine(src)
- for(var/i in 1 to 3)
- new /obj/item/reagent_containers/glass/bottle/epinephrine(src)
- for(var/i in 1 to 3)
- new /obj/item/reagent_containers/glass/bottle/charcoal(src)
- new /obj/item/storage/box/rxglasses(src)
-
-/obj/structure/closet/secure_closet/medical2
- name = "anesthetic closet"
- desc = "Used to knock people out."
+
+/obj/structure/closet/secure_closet/medical1/PopulateContents()
+ ..()
+ new /obj/item/reagent_containers/glass/beaker(src)
+ new /obj/item/reagent_containers/glass/beaker(src)
+ new /obj/item/reagent_containers/dropper(src)
+ new /obj/item/reagent_containers/dropper(src)
+ new /obj/item/storage/belt/medical(src)
+ new /obj/item/storage/box/syringes(src)
+ new /obj/item/reagent_containers/glass/bottle/toxin(src)
+ new /obj/item/reagent_containers/glass/bottle/morphine(src)
+ new /obj/item/reagent_containers/glass/bottle/morphine(src)
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/glass/bottle/epinephrine(src)
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/glass/bottle/charcoal(src)
+ new /obj/item/storage/box/rxglasses(src)
+
+/obj/structure/closet/secure_closet/medical2
+ name = "anesthetic closet"
+ desc = "Used to knock people out."
req_access = list(ACCESS_SURGERY)
-
-/obj/structure/closet/secure_closet/medical2/PopulateContents()
- ..()
- for(var/i in 1 to 3)
- new /obj/item/tank/internals/anesthetic(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/mask/breath/medical(src)
-
-/obj/structure/closet/secure_closet/medical3
- name = "medical doctor's locker"
+
+/obj/structure/closet/secure_closet/medical2/PopulateContents()
+ ..()
+ for(var/i in 1 to 3)
+ new /obj/item/tank/internals/anesthetic(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/mask/breath/medical(src)
+
+/obj/structure/closet/secure_closet/medical3
+ name = "medical doctor's locker"
req_access = list(ACCESS_SURGERY)
- icon_state = "med_secure"
-
-/obj/structure/closet/secure_closet/medical3/PopulateContents()
- ..()
- new /obj/item/device/radio/headset/headset_med(src)
- new /obj/item/defibrillator/loaded(src)
- new /obj/item/clothing/gloves/color/latex/nitrile(src)
- new /obj/item/storage/belt/medical(src)
- new /obj/item/clothing/glasses/hud/health(src)
- return
-
-/obj/structure/closet/secure_closet/CMO
- name = "\proper chief medical officer's locker"
+ icon_state = "med_secure"
+
+/obj/structure/closet/secure_closet/medical3/PopulateContents()
+ ..()
+ new /obj/item/device/radio/headset/headset_med(src)
+ new /obj/item/defibrillator/loaded(src)
+ new /obj/item/clothing/gloves/color/latex/nitrile(src)
+ new /obj/item/storage/belt/medical(src)
+ new /obj/item/clothing/glasses/hud/health(src)
+ return
+
+/obj/structure/closet/secure_closet/CMO
+ name = "\proper chief medical officer's locker"
req_access = list(ACCESS_CMO)
- icon_state = "cmo"
-
-/obj/structure/closet/secure_closet/CMO/PopulateContents()
- ..()
- new /obj/item/clothing/neck/cloak/cmo(src)
- new /obj/item/storage/backpack/duffelbag/med(src)
- new /obj/item/clothing/suit/bio_suit/cmo(src)
- new /obj/item/clothing/head/bio_hood/cmo(src)
- new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
- new /obj/item/clothing/under/rank/chief_medical_officer(src)
- new /obj/item/clothing/shoes/sneakers/brown (src)
- new /obj/item/cartridge/cmo(src)
- new /obj/item/device/radio/headset/heads/cmo(src)
- new /obj/item/device/megaphone/command(src)
- new /obj/item/defibrillator/compact/loaded(src)
- new /obj/item/clothing/gloves/color/latex/nitrile(src)
- new /obj/item/storage/belt/medical(src)
- new /obj/item/device/assembly/flash/handheld(src)
- new /obj/item/reagent_containers/hypospray/CMO(src)
- new /obj/item/device/autosurgeon/cmo(src)
- new /obj/item/door_remote/chief_medical_officer(src)
-
-/obj/structure/closet/secure_closet/animal
- name = "animal control"
+ icon_state = "cmo"
+
+/obj/structure/closet/secure_closet/CMO/PopulateContents()
+ ..()
+ new /obj/item/clothing/neck/cloak/cmo(src)
+ new /obj/item/storage/backpack/duffelbag/med(src)
+ new /obj/item/clothing/suit/bio_suit/cmo(src)
+ new /obj/item/clothing/head/bio_hood/cmo(src)
+ new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
+ new /obj/item/clothing/under/rank/chief_medical_officer(src)
+ new /obj/item/clothing/shoes/sneakers/brown (src)
+ new /obj/item/cartridge/cmo(src)
+ new /obj/item/device/radio/headset/heads/cmo(src)
+ new /obj/item/device/megaphone/command(src)
+ new /obj/item/defibrillator/compact/loaded(src)
+ new /obj/item/clothing/gloves/color/latex/nitrile(src)
+ new /obj/item/storage/belt/medical(src)
+ new /obj/item/device/healthanalyzer/advanced(src)
+ new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/reagent_containers/hypospray/CMO(src)
+ new /obj/item/device/autosurgeon/cmo(src)
+ new /obj/item/door_remote/chief_medical_officer(src)
+
+/obj/structure/closet/secure_closet/animal
+ name = "animal control"
req_access = list(ACCESS_SURGERY)
-
-/obj/structure/closet/secure_closet/animal/PopulateContents()
- ..()
- new /obj/item/device/assembly/signaler(src)
- for(var/i in 1 to 3)
- new /obj/item/device/electropack(src)
-
-/obj/structure/closet/secure_closet/chemical
- name = "chemical closet"
- desc = "Store dangerous chemicals in here."
- icon_door = "chemical"
-
-/obj/structure/closet/secure_closet/chemical/PopulateContents()
- ..()
- new /obj/item/storage/box/pillbottles(src)
- new /obj/item/storage/box/pillbottles(src)
+
+/obj/structure/closet/secure_closet/animal/PopulateContents()
+ ..()
+ new /obj/item/device/assembly/signaler(src)
+ for(var/i in 1 to 3)
+ new /obj/item/device/electropack(src)
+
+/obj/structure/closet/secure_closet/chemical
+ name = "chemical closet"
+ desc = "Store dangerous chemicals in here."
+ icon_door = "chemical"
+
+/obj/structure/closet/secure_closet/chemical/PopulateContents()
+ ..()
+ new /obj/item/storage/box/pillbottles(src)
+ new /obj/item/storage/box/pillbottles(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index cefd972aaf..aeacf17598 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -83,7 +83,7 @@
new /obj/item/storage/belt/security/full(src)
new /obj/item/gun/energy/e_gun/hos(src)
new /obj/item/device/flashlight/seclite(src)
- new /obj/item/pinpointer(src)
+ new /obj/item/pinpointer/nuke(src)
/obj/structure/closet/secure_closet/warden
name = "\proper warden's locker"
@@ -108,6 +108,7 @@
new /obj/item/clothing/gloves/krav_maga/sec(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
+ new /obj/item/pinpointer/crew(src)
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
@@ -183,6 +184,7 @@
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/clothing/suit/armor/vest/det_suit(src)
new /obj/item/storage/belt/holster/full(src)
+ new /obj/item/pinpointer/crew(src)
new /obj/item/device/mass_spectrometer(src)
/obj/structure/closet/secure_closet/injection
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 8290a2cd1c..56359d4492 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -1,147 +1,147 @@
-/obj/structure/closet/crate
- name = "crate"
- desc = "A rectangular steel crate."
- icon = 'icons/obj/crates.dmi'
- icon_state = "crate"
- req_access = null
- can_weld_shut = FALSE
- horizontal = TRUE
- allow_objects = TRUE
- allow_dense = TRUE
- dense_when_open = TRUE
- climbable = TRUE
- climb_time = 10 //real fast, because let's be honest stepping into or onto a crate is easy
- climb_stun = 0 //climbing onto crates isn't hard, guys
- delivery_icon = "deliverycrate"
+/obj/structure/closet/crate
+ name = "crate"
+ desc = "A rectangular steel crate."
+ icon = 'icons/obj/crates.dmi'
+ icon_state = "crate"
+ req_access = null
+ can_weld_shut = FALSE
+ horizontal = TRUE
+ allow_objects = TRUE
+ allow_dense = TRUE
+ dense_when_open = TRUE
+ climbable = TRUE
+ climb_time = 10 //real fast, because let's be honest stepping into or onto a crate is easy
+ climb_stun = 0 //climbing onto crates isn't hard, guys
+ delivery_icon = "deliverycrate"
var/obj/item/paper/fluff/jobs/cargo/manifest/manifest
-
-/obj/structure/closet/crate/New()
- ..()
- update_icon()
-
+
+/obj/structure/closet/crate/New()
+ ..()
+ update_icon()
+
/obj/structure/closet/crate/CanPass(atom/movable/mover, turf/target)
- if(!istype(mover, /obj/structure/closet))
- var/obj/structure/closet/crate/locatedcrate = locate(/obj/structure/closet/crate) in get_turf(mover)
- if(locatedcrate) //you can walk on it like tables, if you're not in an open crate trying to move to a closed crate
- if(opened) //if we're open, allow entering regardless of located crate openness
- return 1
- if(!locatedcrate.opened) //otherwise, if the located crate is closed, allow entering
- return 1
- return !density
-
-/obj/structure/closet/crate/update_icon()
- icon_state = "[initial(icon_state)][opened ? "open" : ""]"
-
- cut_overlays()
- if(manifest)
- add_overlay("manifest")
-
-/obj/structure/closet/crate/attack_hand(mob/user)
- if(manifest)
- tear_manifest(user)
- return
- ..()
-
-/obj/structure/closet/crate/open(mob/living/user)
- . = ..()
- if(. && manifest)
- to_chat(user, "The manifest is torn off [src].")
- playsound(src, 'sound/items/poster_ripped.ogg', 75, 1)
- manifest.forceMove(get_turf(src))
- manifest = null
- update_icon()
-
-/obj/structure/closet/crate/proc/tear_manifest(mob/user)
- to_chat(user, "You tear the manifest off of [src].")
- playsound(src, 'sound/items/poster_ripped.ogg', 75, 1)
-
- manifest.forceMove(loc)
- if(ishuman(user))
- user.put_in_hands(manifest)
- manifest = null
- update_icon()
-
-/obj/structure/closet/crate/internals
- desc = "A internals crate."
- name = "internals crate"
- icon_state = "o2crate"
-
-/obj/structure/closet/crate/trashcart
- desc = "A heavy, metal trashcart with wheels."
- name = "trash cart"
- icon_state = "trashcart"
-
-/obj/structure/closet/crate/medical
- desc = "A medical crate."
- name = "medical crate"
- icon_state = "medicalcrate"
-
-/obj/structure/closet/crate/freezer
- desc = "A freezer."
- name = "freezer"
- icon_state = "freezer"
-
-/obj/structure/closet/crate/freezer/blood
- name = "blood freezer"
- desc = "A freezer containing packs of blood."
-
-/obj/structure/closet/crate/freezer/blood/PopulateContents()
- . = ..()
- new /obj/item/reagent_containers/blood/empty(src)
- new /obj/item/reagent_containers/blood/empty(src)
- new /obj/item/reagent_containers/blood/AMinus(src)
- new /obj/item/reagent_containers/blood/BMinus(src)
- new /obj/item/reagent_containers/blood/BPlus(src)
- new /obj/item/reagent_containers/blood/OMinus(src)
- new /obj/item/reagent_containers/blood/OPlus(src)
- new /obj/item/reagent_containers/blood/lizard(src)
- for(var/i in 1 to 3)
- new /obj/item/reagent_containers/blood/random(src)
-
-/obj/structure/closet/crate/freezer/surplus_limbs
- name = "surplus prosthetic limbs"
- desc = "A crate containing an assortment of cheap prosthetic limbs."
-
-/obj/structure/closet/crate/freezer/surplus_limbs/PopulateContents()
- . = ..()
- new /obj/item/bodypart/l_arm/robot/surplus(src)
- new /obj/item/bodypart/l_arm/robot/surplus(src)
- new /obj/item/bodypart/r_arm/robot/surplus(src)
- new /obj/item/bodypart/r_arm/robot/surplus(src)
- new /obj/item/bodypart/l_leg/robot/surplus(src)
- new /obj/item/bodypart/l_leg/robot/surplus(src)
- new /obj/item/bodypart/r_leg/robot/surplus(src)
- new /obj/item/bodypart/r_leg/robot/surplus(src)
-
-/obj/structure/closet/crate/radiation
- desc = "A crate with a radiation sign on it."
- name = "radiation crate"
- icon_state = "radiation"
-
-/obj/structure/closet/crate/hydroponics
- name = "hydroponics crate"
- desc = "All you need to destroy those pesky weeds and pests."
- icon_state = "hydrocrate"
-
-/obj/structure/closet/crate/engineering
- name = "engineering crate"
- icon_state = "engi_crate"
-
-/obj/structure/closet/crate/engineering/electrical
- icon_state = "engi_e_crate"
-
-/obj/structure/closet/crate/rcd
- desc = "A crate for the storage of an RCD."
- name = "\improper RCD crate"
- icon_state = "engi_crate"
-
-/obj/structure/closet/crate/rcd/PopulateContents()
- ..()
- for(var/i in 1 to 4)
- new /obj/item/rcd_ammo(src)
- new /obj/item/construction/rcd(src)
-
-/obj/structure/closet/crate/science
- name = "science crate"
- desc = "A science crate."
- icon_state = "scicrate"
+ if(!istype(mover, /obj/structure/closet))
+ var/obj/structure/closet/crate/locatedcrate = locate(/obj/structure/closet/crate) in get_turf(mover)
+ if(locatedcrate) //you can walk on it like tables, if you're not in an open crate trying to move to a closed crate
+ if(opened) //if we're open, allow entering regardless of located crate openness
+ return 1
+ if(!locatedcrate.opened) //otherwise, if the located crate is closed, allow entering
+ return 1
+ return !density
+
+/obj/structure/closet/crate/update_icon()
+ icon_state = "[initial(icon_state)][opened ? "open" : ""]"
+
+ cut_overlays()
+ if(manifest)
+ add_overlay("manifest")
+
+/obj/structure/closet/crate/attack_hand(mob/user)
+ if(manifest)
+ tear_manifest(user)
+ return
+ ..()
+
+/obj/structure/closet/crate/open(mob/living/user)
+ . = ..()
+ if(. && manifest)
+ to_chat(user, "The manifest is torn off [src].")
+ playsound(src, 'sound/items/poster_ripped.ogg', 75, 1)
+ manifest.forceMove(get_turf(src))
+ manifest = null
+ update_icon()
+
+/obj/structure/closet/crate/proc/tear_manifest(mob/user)
+ to_chat(user, "You tear the manifest off of [src].")
+ playsound(src, 'sound/items/poster_ripped.ogg', 75, 1)
+
+ manifest.forceMove(loc)
+ if(ishuman(user))
+ user.put_in_hands(manifest)
+ manifest = null
+ update_icon()
+
+/obj/structure/closet/crate/internals
+ desc = "An internals crate."
+ name = "internals crate"
+ icon_state = "o2crate"
+
+/obj/structure/closet/crate/trashcart
+ desc = "A heavy, metal trashcart with wheels."
+ name = "trash cart"
+ icon_state = "trashcart"
+
+/obj/structure/closet/crate/medical
+ desc = "A medical crate."
+ name = "medical crate"
+ icon_state = "medicalcrate"
+
+/obj/structure/closet/crate/freezer
+ desc = "A freezer."
+ name = "freezer"
+ icon_state = "freezer"
+
+/obj/structure/closet/crate/freezer/blood
+ name = "blood freezer"
+ desc = "A freezer containing packs of blood."
+
+/obj/structure/closet/crate/freezer/blood/PopulateContents()
+ . = ..()
+ new /obj/item/reagent_containers/blood/empty(src)
+ new /obj/item/reagent_containers/blood/empty(src)
+ new /obj/item/reagent_containers/blood/AMinus(src)
+ new /obj/item/reagent_containers/blood/BMinus(src)
+ new /obj/item/reagent_containers/blood/BPlus(src)
+ new /obj/item/reagent_containers/blood/OMinus(src)
+ new /obj/item/reagent_containers/blood/OPlus(src)
+ new /obj/item/reagent_containers/blood/lizard(src)
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/blood/random(src)
+
+/obj/structure/closet/crate/freezer/surplus_limbs
+ name = "surplus prosthetic limbs"
+ desc = "A crate containing an assortment of cheap prosthetic limbs."
+
+/obj/structure/closet/crate/freezer/surplus_limbs/PopulateContents()
+ . = ..()
+ new /obj/item/bodypart/l_arm/robot/surplus(src)
+ new /obj/item/bodypart/l_arm/robot/surplus(src)
+ new /obj/item/bodypart/r_arm/robot/surplus(src)
+ new /obj/item/bodypart/r_arm/robot/surplus(src)
+ new /obj/item/bodypart/l_leg/robot/surplus(src)
+ new /obj/item/bodypart/l_leg/robot/surplus(src)
+ new /obj/item/bodypart/r_leg/robot/surplus(src)
+ new /obj/item/bodypart/r_leg/robot/surplus(src)
+
+/obj/structure/closet/crate/radiation
+ desc = "A crate with a radiation sign on it."
+ name = "radiation crate"
+ icon_state = "radiation"
+
+/obj/structure/closet/crate/hydroponics
+ name = "hydroponics crate"
+ desc = "All you need to destroy those pesky weeds and pests."
+ icon_state = "hydrocrate"
+
+/obj/structure/closet/crate/engineering
+ name = "engineering crate"
+ icon_state = "engi_crate"
+
+/obj/structure/closet/crate/engineering/electrical
+ icon_state = "engi_e_crate"
+
+/obj/structure/closet/crate/rcd
+ desc = "A crate for the storage of an RCD."
+ name = "\improper RCD crate"
+ icon_state = "engi_crate"
+
+/obj/structure/closet/crate/rcd/PopulateContents()
+ ..()
+ for(var/i in 1 to 4)
+ new /obj/item/rcd_ammo(src)
+ new /obj/item/construction/rcd(src)
+
+/obj/structure/closet/crate/science
+ name = "science crate"
+ desc = "A science crate."
+ icon_state = "scicrate"
diff --git a/code/game/objects/structures/crates_lockers/crates/critter.dm b/code/game/objects/structures/crates_lockers/crates/critter.dm
index 3f631883c1..5261bb5332 100644
--- a/code/game/objects/structures/crates_lockers/crates/critter.dm
+++ b/code/game/objects/structures/crates_lockers/crates/critter.dm
@@ -1,38 +1,38 @@
-/obj/structure/closet/crate/critter
- name = "critter crate"
- desc = "A crate designed for safe transport of animals. It has an oxygen tank for safe transport in space."
- icon_state = "crittercrate"
- horizontal = FALSE
- allow_objects = FALSE
- breakout_time = 1
- material_drop = /obj/item/stack/sheet/mineral/wood
- material_drop_amount = 4
- delivery_icon = "deliverybox"
- var/obj/item/tank/internals/emergency_oxygen/tank
-
-/obj/structure/closet/crate/critter/New()
- ..()
- tank = new
-
-/obj/structure/closet/crate/critter/Destroy()
- var/turf/T = get_turf(src)
- if(tank)
- tank.forceMove(T)
- tank = null
-
- return ..()
-
-/obj/structure/closet/crate/critter/update_icon()
- cut_overlays()
- if(opened)
- add_overlay("crittercrate_door_open")
- else
- add_overlay("crittercrate_door")
- if(manifest)
- add_overlay("manifest")
-
-/obj/structure/closet/crate/critter/return_air()
- if(tank)
- return tank.air_contents
- else
- return loc.return_air()
\ No newline at end of file
+/obj/structure/closet/crate/critter
+ name = "critter crate"
+ desc = "A crate designed for safe transport of animals. It has an oxygen tank for safe transport in space."
+ icon_state = "crittercrate"
+ horizontal = FALSE
+ allow_objects = FALSE
+ breakout_time = 600
+ material_drop = /obj/item/stack/sheet/mineral/wood
+ material_drop_amount = 4
+ delivery_icon = "deliverybox"
+ var/obj/item/tank/internals/emergency_oxygen/tank
+
+/obj/structure/closet/crate/critter/New()
+ ..()
+ tank = new
+
+/obj/structure/closet/crate/critter/Destroy()
+ var/turf/T = get_turf(src)
+ if(tank)
+ tank.forceMove(T)
+ tank = null
+
+ return ..()
+
+/obj/structure/closet/crate/critter/update_icon()
+ cut_overlays()
+ if(opened)
+ add_overlay("crittercrate_door_open")
+ else
+ add_overlay("crittercrate_door")
+ if(manifest)
+ add_overlay("manifest")
+
+/obj/structure/closet/crate/critter/return_air()
+ if(tank)
+ return tank.air_contents
+ else
+ return loc.return_air()
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index e1204d86e3..a5173a5f80 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -6,6 +6,7 @@
anchored = FALSE
density = TRUE
max_integrity = 200
+ desc = "The mechanical framework for an airlock."
var/state = 0
var/mineral = null
var/typetext = ""
@@ -363,6 +364,23 @@
anchored = TRUE
state = 1
+/obj/structure/door_assembly/examine(mob/user)
+ ..()
+ switch(state)
+ if(0)
+ if(anchored)
+ to_chat(user, "The anchoring bolts are wrenched in place, but the maintenance panel lacks wiring.")
+ else
+ to_chat(user, "The assembly is welded together, but the anchoring bolts are unwrenched.")
+ if(1)
+ to_chat(user, "The maintenance panel is wired, but the circuit slot is empty.")
+ if(2)
+ to_chat(user, "The circuit is connected loosely to its slot, but the maintenance panel is unscrewed and open.")
+ if(!mineral || !material)
+ to_chat(user, "There is a small paper placard on the assembly. There are empty slots for glass windows or mineral covers.")
+ else
+ to_chat(user, "There is a small paper placard on the assembly.")
+
/obj/structure/door_assembly/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/pen))
var/t = stripped_input(user, "Enter the name for the door.", src.name, src.created_name,MAX_NAME_LEN)
@@ -616,15 +634,15 @@
var/obj/item/stack/sheet/G = W
if(G)
if(G.get_amount() >= 1)
- if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass))
+ if(is_glass_sheet(G))
playsound(src.loc, 'sound/items/crowbar.ogg', 100, 1)
user.visible_message("[user] adds [G.name] to the airlock assembly.", \
"You start to install [G.name] into the airlock assembly...")
if(do_after(user, 40, target = src))
if(G.get_amount() < 1 || mineral) return
- if (G.type == /obj/item/stack/sheet/rglass)
- to_chat(user, "You install reinforced glass windows into the airlock assembly.")
- heat_proof_finished = 1 //reinforced glass makes the airlock heat-proof
+ if(!istype(G, /obj/item/stack/sheet/glass))
+ to_chat(user, "You install [G.name] windows into the airlock assembly.")
+ heat_proof_finished = 1 //plasma & reinforced glass makes the airlock heat-proof
name = "near finished heat-proofed window airlock assembly"
else
to_chat(user, "You install regular glass windows into the airlock assembly.")
diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index f52df98ad4..4e891d047f 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -13,6 +13,8 @@
if(do_after(user, 20, target = src))
to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
anchored = !anchored
+ else
+ return ..()
/obj/structure/dresser/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/mineral/wood (get_turf(src), 10)
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index f0ff566b60..e61e1a1870 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -10,6 +10,10 @@
var/obj/item/extinguisher/stored_extinguisher
var/opened = 0
+/obj/structure/extinguisher_cabinet/examine(mob/user)
+ ..()
+ to_chat(user, "Alt-click to [opened ? "close":"open"] it.")
+
/obj/structure/extinguisher_cabinet/New(loc, ndir, building)
..()
if(building)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 5d6e6f3d77..b81aa7d4d8 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -123,9 +123,12 @@
else
return ..()
-/obj/structure/falsewall/proc/dismantle(mob/user, disassembled = TRUE)
- user.visible_message("[user] dismantles the false wall.", "You dismantle the false wall.")
- playsound(src, 'sound/items/welder.ogg', 100, 1)
+/obj/structure/falsewall/proc/dismantle(mob/user, disassembled=TRUE, obj/item/tool = null)
+ user.visible_message("[user] dismantles the false wall.", "You dismantle the false wall.")
+ if(tool)
+ playsound(src, tool.usesound, 100, 1)
+ else
+ playsound(src, 'sound/items/welder.ogg', 100, 1)
deconstruct(disassembled)
/obj/structure/falsewall/deconstruct(disassembled = TRUE)
@@ -141,6 +144,7 @@
return null
/obj/structure/falsewall/examine_status(mob/user) //So you can't detect falsewalls by examine.
+ to_chat(user, "The outer plating is welded firmly in place.")
return null
/*
@@ -155,6 +159,15 @@
walltype = /turf/closed/wall/r_wall
mineral = /obj/item/stack/sheet/plasteel
+/obj/structure/falsewall/reinforced/examine_status(mob/user)
+ to_chat(user, "The outer grille is fully intact.")
+ return null
+
+/obj/structure/falsewall/reinforced/attackby(obj/item/tool, mob/user)
+ ..()
+ if(istype(tool, /obj/item/wirecutters))
+ dismantle(user, TRUE, tool)
+
/*
* Uranium Falsewalls
*/
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 0d043ae807..c1b6c56bf5 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -6,6 +6,7 @@
//trees
/obj/structure/flora/tree
name = "tree"
+ desc = "A large tree."
density = TRUE
pixel_x = -16
layer = FLY_LAYER
@@ -40,6 +41,7 @@
/obj/structure/flora/tree/pine
name = "pine tree"
+ desc = "A coniferous pine tree."
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_1"
@@ -49,6 +51,7 @@
/obj/structure/flora/tree/pine/xmas
name = "xmas tree"
+ desc = "A wondrous decorated Christmas tree."
icon_state = "pine_c"
/obj/structure/flora/tree/pine/xmas/Initialize()
@@ -57,10 +60,12 @@
/obj/structure/flora/tree/dead
icon = 'icons/obj/flora/deadtrees.dmi'
+ desc = "A dead tree. How it died, you know not."
icon_state = "tree_1"
/obj/structure/flora/tree/palm
icon = 'icons/misc/beach2.dmi'
+ desc = "A tree straight from the tropics."
icon_state = "palm1"
/obj/structure/flora/tree/palm/Initialize()
@@ -98,6 +103,7 @@
//grass
/obj/structure/flora/grass
name = "grass"
+ desc = "A patch of overgrown grass."
icon = 'icons/obj/flora/snowflora.dmi'
gender = PLURAL //"this is grass" not "this is a grass"
@@ -127,6 +133,7 @@
//bushes
/obj/structure/flora/bush
name = "bush"
+ desc = "Some type of shrub."
icon = 'icons/obj/flora/snowflora.dmi'
icon_state = "snowbush1"
anchored = TRUE
@@ -139,6 +146,7 @@
/obj/structure/flora/ausbushes
name = "bush"
+ desc = "Some kind of plant."
icon = 'icons/obj/flora/ausflora.dmi'
icon_state = "firstbush_1"
@@ -256,6 +264,7 @@
name = "potted plant"
icon = 'icons/obj/flora/plants.dmi'
icon_state = "plant-01"
+ desc = "A little bit of nature contained in a pot."
layer = ABOVE_MOB_LAYER
w_class = WEIGHT_CLASS_HUGE
force = 10
@@ -265,8 +274,10 @@
/obj/item/twohanded/required/kirbyplants/equipped(mob/living/user)
var/image/I = image(icon = 'icons/obj/flora/plants.dmi' , icon_state = src.icon_state, loc = user)
+ I.copy_overlays(src)
I.override = 1
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "sneaking_mission", I)
+ I.layer = ABOVE_MOB_LAYER
..()
/obj/item/twohanded/required/kirbyplants/dropped(mob/living/user)
@@ -299,6 +310,13 @@
desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
icon_state = "plant-25"
+/obj/item/twohanded/required/kirbyplants/photosynthetic
+ name = "photosynthetic potted plant"
+ desc = "A bioluminescent plant."
+ icon_state = "plant-09"
+ light_color = "#2cb2e8"
+ light_range = 3
+
//a rock is flora according to where the icon file is
//and now these defines
@@ -356,6 +374,7 @@
/obj/structure/flora/junglebush
name = "bush"
+ desc = "A wild plant that is found in jungles."
icon = 'icons/obj/flora/jungleflora.dmi'
icon_state = "busha"
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index c603681909..59aaaca12b 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -43,8 +43,7 @@
death = FALSE
anchored = FALSE
density = FALSE
- flavour_text = "You are an ash walker. Your tribe worships the Necropolis. The wastes are sacred ground, its monsters a blessed bounty. \
- You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest."
+ flavour_text = "You are an ash walker. Your tribe worships the Necropolis. The wastes are sacred ground, its monsters a blessed bounty. You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest. You do not know how their magic works, nor where they come from, or the significance of their items."
assignedrole = "Ash Walker"
/obj/effect/mob_spawn/human/ash_walker/special(mob/living/new_spawn)
@@ -123,7 +122,7 @@
golems, so that no golem may ever be forced to serve again."
/obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
- ..()
+ . = ..()
if(species)
name += " ([initial(species.prefix)])"
mob_species = species
@@ -249,6 +248,11 @@
everyone? Where did they go? What happened to the hospital? And is that smoke you smell? You need to find someone else. Maybe they can tell you what happened."
assignedrole = "Translocated Vet"
+/obj/effect/mob_spawn/human/doctor/alive/lavaland/Destroy()
+ var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
+ S.setDir(dir)
+ return ..()
+
//Prisoner containment sleeper: Spawns in crashed prison ships in lavaland. Ghosts become escaped prisoners and are advised to find a way out of the mess they've gotten themselves into.
/obj/effect/mob_spawn/human/prisoner_transport
name = "prisoner containment sleeper"
@@ -462,9 +466,9 @@
death = FALSE
random = TRUE
mob_species = /datum/species/human
- flavour_text = "You are a security officer working for NanoTrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \
- cryogenics pod due to a oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \
- your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod."
+ flavour_text = "You are a security officer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \
+ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \
+ your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
uniform = /obj/item/clothing/under/rank/security
shoes = /obj/item/clothing/shoes/jackboots
id = /obj/item/card/id/away/old/sec
@@ -473,22 +477,22 @@
assignedrole = "Ancient Crew"
/obj/effect/mob_spawn/human/oldsec/Destroy()
- new/obj/structure/showcase/oldpod/used(get_turf(src))
+ new/obj/structure/showcase/machinery/oldpod/used(drop_location())
return ..()
/obj/effect/mob_spawn/human/oldeng
name = "old cryogenics pod"
- desc = "A humming cryo pod. You can barely recognise a engineering uniform underneath the built up ice. The machine is attempting to wake up its occupant"
- mob_name = "a engineer"
+ desc = "A humming cryo pod. You can barely recognise an engineering uniform underneath the built up ice. The machine is attempting to wake up its occupant"
+ mob_name = "an engineer"
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper"
roundstart = FALSE
death = FALSE
random = TRUE
mob_species = /datum/species/human
- flavour_text = "You are a engineer working for NanoTrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \
- cryogenics pod due to a oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \
- your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod."
+ flavour_text = "You are an engineer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \
+ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \
+ your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
uniform = /obj/item/clothing/under/rank/engineer
shoes = /obj/item/clothing/shoes/workboots
id = /obj/item/card/id/away/old/eng
@@ -497,7 +501,7 @@
assignedrole = "Ancient Crew"
/obj/effect/mob_spawn/human/oldeng/Destroy()
- new/obj/structure/showcase/oldpod/used(get_turf(src))
+ new/obj/structure/showcase/machinery/oldpod/used(drop_location())
return ..()
/obj/effect/mob_spawn/human/oldsci
@@ -510,9 +514,9 @@
death = FALSE
random = TRUE
mob_species = /datum/species/human
- flavour_text = "You are a scientist working for NanoTrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \
- cryogenics pod due to a oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \
- your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod."
+ flavour_text = "You are a scientist working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \
+ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \
+ your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
uniform = /obj/item/clothing/under/rank/scientist
shoes = /obj/item/clothing/shoes/laceup
id = /obj/item/card/id/away/old/sci
@@ -520,5 +524,5 @@
assignedrole = "Ancient Crew"
/obj/effect/mob_spawn/human/oldsci/Destroy()
- new/obj/structure/showcase/oldpod/used(get_turf(src))
+ new/obj/structure/showcase/machinery/oldpod/used(drop_location())
return ..()
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 02f6d784df..3d7e9be21a 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -1,6 +1,7 @@
/obj/structure/girder
name = "girder"
icon_state = "girder"
+ desc = "A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall."
anchored = TRUE
density = TRUE
layer = BELOW_OBJ_LAYER
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 6a3bdb81b4..914be24cfd 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -13,7 +13,7 @@
integrity_failure = 20
var/rods_type = /obj/item/stack/rods
var/rods_amount = 2
- var/rods_broken = 1
+ var/rods_broken = TRUE
var/grille_type = null
var/broken_type = /obj/structure/grille/broken
@@ -37,7 +37,7 @@
if(locate(/obj/structure/window) in loc)
return FALSE
to_chat(user, "You construct the window.")
- var/obj/structure/window/WD = new the_rcd.window_type(loc)
+ var/obj/structure/window/WD = new the_rcd.window_type(drop_location())
WD.anchored = TRUE
return TRUE
return FALSE
@@ -66,7 +66,7 @@
if(user.a_intent == INTENT_HARM)
if(!shock(user, 70))
..(user, 1)
- return 1
+ return TRUE
/obj/structure/grille/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
@@ -85,7 +85,7 @@
/obj/structure/grille/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGRILLE))
- return 1
+ return TRUE
else
if(istype(mover, /obj/item/projectile) && density)
return prob(30)
@@ -103,11 +103,11 @@
add_fingerprint(user)
if(istype(W, /obj/item/wirecutters))
if(!shock(user, 100))
- playsound(loc, W.usesound, 100, 1)
+ playsound(src, W.usesound, 100, 1)
deconstruct()
else if((istype(W, /obj/item/screwdriver)) && (isturf(loc) || anchored))
if(!shock(user, 90))
- playsound(loc, W.usesound, 100, 1)
+ playsound(src, W.usesound, 100, 1)
anchored = !anchored
user.visible_message("[user] [anchored ? "fastens" : "unfastens"] [src].", \
"You [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.")
@@ -123,7 +123,7 @@
return
//window placing begin
- else if(istype(W, /obj/item/stack/sheet/rglass) || istype(W, /obj/item/stack/sheet/glass))
+ else if(is_glass_sheet(W))
if (!broken)
var/obj/item/stack/ST = W
if (ST.get_amount() < 2)
@@ -143,10 +143,14 @@
for(var/obj/structure/window/WINDOW in loc) //Another window already installed on grille
return
var/obj/structure/window/WD
- if(istype(W, /obj/item/stack/sheet/rglass))
- WD = new/obj/structure/window/reinforced/fulltile(loc) //reinforced window
+ if(istype(W, /obj/item/stack/sheet/plasmarglass))
+ WD = new/obj/structure/window/plasma/reinforced/fulltile(drop_location()) //reinforced plasma window
+ else if(istype(W, /obj/item/stack/sheet/plasmaglass))
+ WD = new/obj/structure/window/plasma/fulltile(drop_location()) //plasma window
+ else if(istype(W, /obj/item/stack/sheet/rglass))
+ WD = new/obj/structure/window/reinforced/fulltile(drop_location()) //reinforced window
else
- WD = new/obj/structure/window/fulltile(loc) //normal window
+ WD = new/obj/structure/window/fulltile(drop_location()) //normal window
WD.setDir(dir_to_set)
WD.ini_dir = dir_to_set
WD.anchored = FALSE
@@ -163,18 +167,18 @@
switch(damage_type)
if(BRUTE)
if(damage_amount)
- playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+ playsound(src, 'sound/effects/grillehit.ogg', 80, 1)
else
- playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
+ playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(BURN)
- playsound(loc, 'sound/items/welder.ogg', 80, 1)
+ playsound(src, 'sound/items/welder.ogg', 80, 1)
/obj/structure/grille/deconstruct(disassembled = TRUE)
if(!loc) //if already qdel'd somehow, we do nothing
return
if(!(flags_1&NODECONSTRUCT_1))
- var/obj/R = new rods_type(src.loc, rods_amount)
+ var/obj/R = new rods_type(drop_location(), rods_amount)
transfer_fingerprints_to(R)
qdel(src)
..()
@@ -182,7 +186,7 @@
/obj/structure/grille/obj_break()
if(!broken && !(flags_1 & NODECONSTRUCT_1))
new broken_type(src.loc)
- var/obj/R = new rods_type(src.loc, rods_broken)
+ var/obj/R = new rods_type(drop_location(), rods_broken)
transfer_fingerprints_to(R)
qdel(src)
@@ -192,11 +196,11 @@
/obj/structure/grille/proc/shock(mob/user, prb)
if(!anchored || broken) // anchored/broken grilles are never connected
- return 0
+ return FALSE
if(!prob(prb))
- return 0
+ return FALSE
if(!in_range(src, user))//To prevent TK and mech users from getting shocked
- return 0
+ return FALSE
var/turf/T = get_turf(src)
var/obj/structure/cable/C = T.get_cable_node()
if(C)
@@ -204,10 +208,10 @@
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
- return 1
+ return TRUE
else
- return 0
- return 0
+ return FALSE
+ return FALSE
/obj/structure/grille/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(!broken)
@@ -221,7 +225,7 @@
var/turf/T = get_turf(src)
var/obj/structure/cable/C = T.get_cable_node()
if(C)
- playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
+ playsound(src, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 3, C.powernet.avail * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot.
C.powernet.load += C.powernet.avail * 0.0375 // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock.
return ..()
@@ -233,9 +237,9 @@
icon_state = "brokengrille"
density = FALSE
obj_integrity = 20
- broken = 1
+ broken = TRUE
rods_amount = 1
- rods_broken = 0
+ rods_broken = FALSE
grille_type = /obj/structure/grille
broken_type = null
@@ -269,8 +273,8 @@
icon_state = "brokenratvargrille"
density = FALSE
obj_integrity = 20
- broken = 1
+ broken = TRUE
rods_amount = 1
- rods_broken = 0
+ rods_broken = FALSE
grille_type = /obj/structure/grille/ratvar
broken_type = null
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index 84d9481464..d0ad32113d 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -7,6 +7,7 @@
var/height = 0 //the 'height' of the ladder. higher numbers are considered physically higher
var/obj/structure/ladder/down = null //the ladder below this one
var/obj/structure/ladder/up = null //the ladder above this one
+ var/auto_connect = FALSE
/obj/structure/ladder/unbreakable //mostly useful for awaymissions to prevent halting progress in a mission
name = "sturdy ladder"
@@ -19,12 +20,18 @@
return INITIALIZE_HINT_LATELOAD
/obj/structure/ladder/Destroy()
+ if(up && up.down == src)
+ up.down = null
+ up.update_icon()
+ if(down && down.up == src)
+ down.up = null
+ down.update_icon()
GLOB.ladders -= src
. = ..()
/obj/structure/ladder/LateInitialize()
for(var/obj/structure/ladder/L in GLOB.ladders)
- if(L.id == id)
+ if(L.id == id || (auto_connect && L.auto_connect && L.x == x && L.y == y))
if(L.height == (height - 1))
down = L
continue
@@ -50,31 +57,33 @@
else //wtf make your ladders properly assholes
icon_state = "ladder00"
-/obj/structure/ladder/proc/go_up(mob/user,is_ghost)
+/obj/structure/ladder/proc/travel(going_up, mob/user, is_ghost, obj/structure/ladder/ladder)
if(!is_ghost)
- show_fluff_message(1,user)
- up.add_fingerprint(user)
- user.loc = get_turf(up)
+ show_fluff_message(going_up,user)
+ ladder.add_fingerprint(user)
+
+ var/atom/movable/AM
+ if(user.pulling)
+ AM = user.pulling
+ user.pulling.forceMove(get_turf(ladder))
+ user.forceMove(get_turf(ladder))
+ if(AM)
+ user.start_pulling(AM)
-/obj/structure/ladder/proc/go_down(mob/user,is_ghost)
- if(!is_ghost)
- show_fluff_message(0,user)
- down.add_fingerprint(user)
- user.loc = get_turf(down)
/obj/structure/ladder/proc/use(mob/user,is_ghost=0)
if(up && down)
switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
if("Up")
- go_up(user,is_ghost)
+ travel(TRUE, user, is_ghost, up)
if("Down")
- go_down(user,is_ghost)
+ travel(FALSE, user, is_ghost, down)
if("Cancel")
return
else if(up)
- go_up(user,is_ghost)
+ travel(TRUE, user, is_ghost, up)
else if(down)
- go_down(user,is_ghost)
+ travel(FALSE, user,is_ghost, down)
else
to_chat(user, "[src] doesn't seem to lead anywhere!")
@@ -108,3 +117,14 @@
. = ..()
else
return QDEL_HINT_LETMELIVE
+
+/obj/structure/ladder/unbreakable/singularity_pull()
+ return
+
+/obj/structure/ladder/auto_connect //They will connect to ladders with the same X and Y without needing to share an ID
+ auto_connect = TRUE
+
+
+/obj/structure/ladder/singularity_pull()
+ visible_message("[src] is torn to pieces by the gravitational pull!")
+ qdel(src)
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 8a24b0271f..d578b307db 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -26,12 +26,11 @@
return
/obj/structure/lattice/ratvar_act()
- if(IsEven(x + y))
- new /obj/structure/lattice/clockwork(loc)
- else
- new /obj/structure/lattice/clockwork/large(loc)
+ new /obj/structure/lattice/clockwork(loc)
/obj/structure/lattice/attackby(obj/item/C, mob/user, params)
+ if(resistance_flags & INDESTRUCTIBLE)
+ return
if(istype(C, /obj/item/wirecutters))
to_chat(user, "Slicing [name] joints ...")
deconstruct()
@@ -54,22 +53,22 @@
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
/obj/structure/lattice/clockwork/Initialize(mapload)
- ..()
+ canSmoothWith += /turf/open/indestructible/clock_spawn_room //list overrides are a terrible thing
+ . = ..()
ratvar_act()
+ if(z == ZLEVEL_CITYOFCOGS)
+ resistance_flags |= INDESTRUCTIBLE
/obj/structure/lattice/clockwork/ratvar_act()
if(IsOdd(x+y))
- new /obj/structure/lattice/clockwork/large(loc) // deletes old one
-
-/obj/structure/lattice/clockwork/large/Initialize(mapload)
- ..()
- icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
- pixel_x = -9
- pixel_y = -9
-
-/obj/structure/lattice/clockwork/large/ratvar_act()
- if(IsEven(x + y))
- new /obj/structure/lattice/clockwork(loc)
+ icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
+ pixel_x = -9
+ pixel_y = -9
+ else
+ icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
+ pixel_x = 0
+ pixel_y = 0
+ return TRUE
/obj/structure/lattice/catwalk
name = "catwalk"
@@ -98,11 +97,29 @@
/obj/structure/lattice/catwalk/clockwork
name = "clockwork catwalk"
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
+ canSmoothWith = list(/obj/structure/lattice,
+ /turf/open/floor,
+ /turf/open/indestructible/clock_spawn_room,
+ /turf/closed/wall,
+ /obj/structure/falsewall)
+ smooth = SMOOTH_MORE
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
- ..()
- new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
- new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
+ . = ..()
+ ratvar_act()
+ if(!mapload)
+ new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
+ new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
+ if(z == ZLEVEL_CITYOFCOGS)
+ resistance_flags |= INDESTRUCTIBLE
/obj/structure/lattice/catwalk/clockwork/ratvar_act()
- return
+ if(IsOdd(x+y))
+ icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi'
+ pixel_x = -9
+ pixel_y = -9
+ else
+ icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
+ pixel_x = 0
+ pixel_y = 0
+ return TRUE
diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm
index e15a655a63..52d9e38f6b 100644
--- a/code/game/objects/structures/manned_turret.dm
+++ b/code/game/objects/structures/manned_turret.dm
@@ -1,214 +1,214 @@
-/////// MANNED TURRET ////////
-
-/obj/machinery/manned_turret
- name = "machine gun turret"
- desc = "While the trigger is held down, this gun will redistribute recoil to allow its user to easily shift targets."
- icon = 'icons/obj/turrets.dmi'
- icon_state = "machinegun"
- can_buckle = TRUE
- density = TRUE
- max_integrity = 100
- buckle_lying = FALSE
- layer = ABOVE_MOB_LAYER
- var/view_range = 10
- var/cooldown = 0
- var/projectile_type = /obj/item/projectile/bullet/weakbullet3
- var/rate_of_fire = 1
- var/number_of_shots = 40
- var/cooldown_duration = 90
- var/atom/target
- var/turf/target_turf
- var/warned = FALSE
- var/list/calculated_projectile_vars
-
-/obj/machinery/manned_turret/Destroy()
- target = null
- target_turf = null
- ..()
-
-//BUCKLE HOOKS
-
-/obj/machinery/manned_turret/unbuckle_mob(mob/living/buckled_mob,force = FALSE)
- playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
- for(var/obj/item/I in buckled_mob.held_items)
- if(istype(I, /obj/item/gun_control))
- qdel(I)
- if(istype(buckled_mob))
- buckled_mob.pixel_x = 0
- buckled_mob.pixel_y = 0
- if(buckled_mob.client)
- buckled_mob.client.change_view(world.view)
- anchored = FALSE
- . = ..()
- STOP_PROCESSING(SSfastprocess, src)
-
-/obj/machinery/manned_turret/user_buckle_mob(mob/living/M, mob/living/carbon/user)
- if(user.incapacitated() || !istype(user))
- return
- M.forceMove(get_turf(src))
- . = ..()
- if(!.)
- return
- for(var/V in M.held_items)
- var/obj/item/I = V
- if(istype(I))
- if(M.dropItemToGround(I))
- var/obj/item/gun_control/TC = new(src)
- M.put_in_hands(TC)
- else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
- var/obj/item/gun_control/TC = new(src)
- M.put_in_hands(TC)
- M.pixel_y = 14
- layer = ABOVE_MOB_LAYER
- setDir(SOUTH)
- playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
- anchored = TRUE
- if(M.client)
- M.client.change_view(view_range)
- START_PROCESSING(SSfastprocess, src)
-
-/obj/machinery/manned_turret/process()
- if(!LAZYLEN(buckled_mobs))
- return PROCESS_KILL
- update_positioning()
-
-/obj/machinery/manned_turret/proc/update_positioning()
- var/mob/living/controller = buckled_mobs[1]
- if(!istype(controller))
- return
- var/client/C = controller.client
- if(C)
- var/atom/A = C.mouseObject
- var/turf/T = get_turf(A)
- if(istype(T)) //They're hovering over something in the map.
- direction_track(controller, T)
- calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, C.mouseParams)
-
-/obj/machinery/manned_turret/proc/direction_track(mob/user, atom/targeted)
- if(user.incapacitated())
- return
- setDir(get_dir(src,targeted))
- user.setDir(dir)
- switch(dir)
- if(NORTH)
- layer = BELOW_MOB_LAYER
- user.pixel_x = 0
- user.pixel_y = -14
- if(NORTHEAST)
- layer = BELOW_MOB_LAYER
- user.pixel_x = -8
- user.pixel_y = -4
- if(EAST)
- layer = ABOVE_MOB_LAYER
- user.pixel_x = -14
- user.pixel_y = 0
- if(SOUTHEAST)
- layer = BELOW_MOB_LAYER
- user.pixel_x = -8
- user.pixel_y = 4
- if(SOUTH)
- layer = ABOVE_MOB_LAYER
- user.pixel_x = 0
- user.pixel_y = 14
- if(SOUTHWEST)
- layer = BELOW_MOB_LAYER
- user.pixel_x = 8
- user.pixel_y = 4
- if(WEST)
- layer = ABOVE_MOB_LAYER
- user.pixel_x = 14
- user.pixel_y = 0
- if(NORTHWEST)
- layer = BELOW_MOB_LAYER
- user.pixel_x = 8
- user.pixel_y = -4
-
-/obj/machinery/manned_turret/proc/checkfire(atom/targeted_atom, mob/user)
- target = targeted_atom
- if(target == user || user.incapacitated() || target == get_turf(src))
- return
- if(world.time < cooldown)
- if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing
- warned = TRUE
- playsound(src, 'sound/weapons/sear.ogg', 100, 1)
- return
- else
- cooldown = world.time + cooldown_duration
- warned = FALSE
- volley(user)
-
-/obj/machinery/manned_turret/proc/volley(mob/user)
- target_turf = get_turf(target)
- for(var/i in 1 to number_of_shots)
- addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
-
-/obj/machinery/manned_turret/proc/fire_helper(mob/user)
- if(user.incapacitated())
- return
- update_positioning() //REFRESH MOUSE TRACKING!!
- var/turf/targets_from = get_turf(src)
- if(QDELETED(target))
- target = target_turf
- var/obj/item/projectile/P = new projectile_type(targets_from)
- P.current = targets_from
- P.starting = targets_from
- P.firer = user
- P.original = target
- playsound(src, 'sound/weapons/gunshot_smg.ogg', 75, 1)
- P.xo = target.x - targets_from.x
- P.yo = target.y - targets_from.y
- P.Angle = calculated_projectile_vars[1] + rand(-9, 9)
- P.p_x = calculated_projectile_vars[2]
- P.p_y = calculated_projectile_vars[3]
- P.fire()
-
-/obj/machinery/manned_turret/ultimate // Admin-only proof of concept for autoclicker automatics
- name = "Infinity Gun"
- view_range = 12
- projectile_type = /obj/item/projectile/bullet/weakbullet3
-
-/obj/machinery/manned_turret/ultimate/checkfire(atom/targeted_atom, mob/user)
- target = targeted_atom
- if(target == user || target == get_turf(src))
- return
- target_turf = get_turf(target)
- fire_helper(user)
-
-/obj/item/gun_control
- name = "turret controls"
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "offhand"
- w_class = WEIGHT_CLASS_HUGE
- flags_1 = ABSTRACT_1 | NODROP_1 | NOBLUDGEON_1 | DROPDEL_1
- resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
- var/obj/machinery/manned_turret/turret
-
-/obj/item/gun_control/Initialize()
- . = ..()
- turret = loc
- if(!istype(turret))
- return INITIALIZE_HINT_QDEL
-
-/obj/item/gun_control/Destroy()
- turret = null
- ..()
-
-/obj/item/gun_control/CanItemAutoclick()
- return TRUE
-
-/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
- user.changeNext_move(CLICK_CD_MELEE)
- O.attacked_by(src, user)
-
-/obj/item/gun_control/attack(mob/living/M, mob/living/user)
- user.lastattacked = M
- M.lastattacker = user
- M.attacked_by(src, user)
- add_fingerprint(user)
-
-/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
- ..()
- var/obj/machinery/manned_turret/E = user.buckled
- E.calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(user, params)
- E.direction_track(user, targeted_atom)
- E.checkfire(targeted_atom, user)
+/////// MANNED TURRET ////////
+
+/obj/machinery/manned_turret
+ name = "machine gun turret"
+ desc = "While the trigger is held down, this gun will redistribute recoil to allow its user to easily shift targets."
+ icon = 'icons/obj/turrets.dmi'
+ icon_state = "machinegun"
+ can_buckle = TRUE
+ density = TRUE
+ max_integrity = 100
+ buckle_lying = FALSE
+ layer = ABOVE_MOB_LAYER
+ var/view_range = 10
+ var/cooldown = 0
+ var/projectile_type = /obj/item/projectile/bullet/manned_turret
+ var/rate_of_fire = 1
+ var/number_of_shots = 40
+ var/cooldown_duration = 90
+ var/atom/target
+ var/turf/target_turf
+ var/warned = FALSE
+ var/list/calculated_projectile_vars
+
+/obj/machinery/manned_turret/Destroy()
+ target = null
+ target_turf = null
+ ..()
+
+//BUCKLE HOOKS
+
+/obj/machinery/manned_turret/unbuckle_mob(mob/living/buckled_mob,force = FALSE)
+ playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+ for(var/obj/item/I in buckled_mob.held_items)
+ if(istype(I, /obj/item/gun_control))
+ qdel(I)
+ if(istype(buckled_mob))
+ buckled_mob.pixel_x = 0
+ buckled_mob.pixel_y = 0
+ if(buckled_mob.client)
+ buckled_mob.client.change_view(world.view)
+ anchored = FALSE
+ . = ..()
+ STOP_PROCESSING(SSfastprocess, src)
+
+/obj/machinery/manned_turret/user_buckle_mob(mob/living/M, mob/living/carbon/user)
+ if(user.incapacitated() || !istype(user))
+ return
+ M.forceMove(get_turf(src))
+ . = ..()
+ if(!.)
+ return
+ for(var/V in M.held_items)
+ var/obj/item/I = V
+ if(istype(I))
+ if(M.dropItemToGround(I))
+ var/obj/item/gun_control/TC = new(src)
+ M.put_in_hands(TC)
+ else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
+ var/obj/item/gun_control/TC = new(src)
+ M.put_in_hands(TC)
+ M.pixel_y = 14
+ layer = ABOVE_MOB_LAYER
+ setDir(SOUTH)
+ playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+ anchored = TRUE
+ if(M.client)
+ M.client.change_view(view_range)
+ START_PROCESSING(SSfastprocess, src)
+
+/obj/machinery/manned_turret/process()
+ if(!LAZYLEN(buckled_mobs))
+ return PROCESS_KILL
+ update_positioning()
+
+/obj/machinery/manned_turret/proc/update_positioning()
+ var/mob/living/controller = buckled_mobs[1]
+ if(!istype(controller))
+ return
+ var/client/C = controller.client
+ if(C)
+ var/atom/A = C.mouseObject
+ var/turf/T = get_turf(A)
+ if(istype(T)) //They're hovering over something in the map.
+ direction_track(controller, T)
+ calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, C.mouseParams)
+
+/obj/machinery/manned_turret/proc/direction_track(mob/user, atom/targeted)
+ if(user.incapacitated())
+ return
+ setDir(get_dir(src,targeted))
+ user.setDir(dir)
+ switch(dir)
+ if(NORTH)
+ layer = BELOW_MOB_LAYER
+ user.pixel_x = 0
+ user.pixel_y = -14
+ if(NORTHEAST)
+ layer = BELOW_MOB_LAYER
+ user.pixel_x = -8
+ user.pixel_y = -4
+ if(EAST)
+ layer = ABOVE_MOB_LAYER
+ user.pixel_x = -14
+ user.pixel_y = 0
+ if(SOUTHEAST)
+ layer = BELOW_MOB_LAYER
+ user.pixel_x = -8
+ user.pixel_y = 4
+ if(SOUTH)
+ layer = ABOVE_MOB_LAYER
+ user.pixel_x = 0
+ user.pixel_y = 14
+ if(SOUTHWEST)
+ layer = BELOW_MOB_LAYER
+ user.pixel_x = 8
+ user.pixel_y = 4
+ if(WEST)
+ layer = ABOVE_MOB_LAYER
+ user.pixel_x = 14
+ user.pixel_y = 0
+ if(NORTHWEST)
+ layer = BELOW_MOB_LAYER
+ user.pixel_x = 8
+ user.pixel_y = -4
+
+/obj/machinery/manned_turret/proc/checkfire(atom/targeted_atom, mob/user)
+ target = targeted_atom
+ if(target == user || user.incapacitated() || target == get_turf(src))
+ return
+ if(world.time < cooldown)
+ if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing
+ warned = TRUE
+ playsound(src, 'sound/weapons/sear.ogg', 100, 1)
+ return
+ else
+ cooldown = world.time + cooldown_duration
+ warned = FALSE
+ volley(user)
+
+/obj/machinery/manned_turret/proc/volley(mob/user)
+ target_turf = get_turf(target)
+ for(var/i in 1 to number_of_shots)
+ addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
+
+/obj/machinery/manned_turret/proc/fire_helper(mob/user)
+ if(user.incapacitated())
+ return
+ update_positioning() //REFRESH MOUSE TRACKING!!
+ var/turf/targets_from = get_turf(src)
+ if(QDELETED(target))
+ target = target_turf
+ var/obj/item/projectile/P = new projectile_type(targets_from)
+ P.current = targets_from
+ P.starting = targets_from
+ P.firer = user
+ P.original = target
+ playsound(src, 'sound/weapons/gunshot_smg.ogg', 75, 1)
+ P.xo = target.x - targets_from.x
+ P.yo = target.y - targets_from.y
+ P.Angle = calculated_projectile_vars[1] + rand(-9, 9)
+ P.p_x = calculated_projectile_vars[2]
+ P.p_y = calculated_projectile_vars[3]
+ P.fire()
+
+/obj/machinery/manned_turret/ultimate // Admin-only proof of concept for autoclicker automatics
+ name = "Infinity Gun"
+ view_range = 12
+ projectile_type = /obj/item/projectile/bullet/manned_turret
+
+/obj/machinery/manned_turret/ultimate/checkfire(atom/targeted_atom, mob/user)
+ target = targeted_atom
+ if(target == user || target == get_turf(src))
+ return
+ target_turf = get_turf(target)
+ fire_helper(user)
+
+/obj/item/gun_control
+ name = "turret controls"
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "offhand"
+ w_class = WEIGHT_CLASS_HUGE
+ flags_1 = ABSTRACT_1 | NODROP_1 | NOBLUDGEON_1 | DROPDEL_1
+ resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ var/obj/machinery/manned_turret/turret
+
+/obj/item/gun_control/Initialize()
+ . = ..()
+ turret = loc
+ if(!istype(turret))
+ return INITIALIZE_HINT_QDEL
+
+/obj/item/gun_control/Destroy()
+ turret = null
+ ..()
+
+/obj/item/gun_control/CanItemAutoclick()
+ return TRUE
+
+/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ O.attacked_by(src, user)
+
+/obj/item/gun_control/attack(mob/living/M, mob/living/user)
+ user.lastattacked = M
+ M.lastattacker = user
+ M.attacked_by(src, user)
+ add_fingerprint(user)
+
+/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
+ ..()
+ var/obj/machinery/manned_turret/E = user.buckled
+ E.calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(user, params)
+ E.direction_track(user, targeted_atom)
+ E.checkfire(targeted_atom, user)
\ No newline at end of file
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 2e1f0af991..c767dd1c68 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -1,232 +1,232 @@
-//NOT using the existing /obj/machinery/door type, since that has some complications on its own, mainly based on its
-//machineryness
-
-/obj/structure/mineral_door
- name = "metal door"
+//NOT using the existing /obj/machinery/door type, since that has some complications on its own, mainly based on its
+//machineryness
+
+/obj/structure/mineral_door
+ name = "metal door"
density = TRUE
anchored = TRUE
- opacity = TRUE
-
- icon = 'icons/obj/doors/mineral_doors.dmi'
- icon_state = "metal"
-
- var/initial_state
- var/state = 0 //closed, 1 == open
- var/isSwitchingStates = 0
- var/close_delay = -1 //-1 if does not auto close.
- max_integrity = 200
- armor = list(melee = 10, bullet = 0, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 50, acid = 50)
- var/sheetType = /obj/item/stack/sheet/metal
- var/sheetAmount = 7
- var/openSound = 'sound/effects/stonedoor_openclose.ogg'
- var/closeSound = 'sound/effects/stonedoor_openclose.ogg'
- CanAtmosPass = ATMOS_PASS_DENSITY
-
-/obj/structure/mineral_door/New(location)
- ..()
- initial_state = icon_state
- air_update_turf(1)
-
-/obj/structure/mineral_door/Destroy()
+ opacity = TRUE
+
+ icon = 'icons/obj/doors/mineral_doors.dmi'
+ icon_state = "metal"
+
+ var/initial_state
+ var/state = 0 //closed, 1 == open
+ var/isSwitchingStates = 0
+ var/close_delay = -1 //-1 if does not auto close.
+ max_integrity = 200
+ armor = list(melee = 10, bullet = 0, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 50, acid = 50)
+ var/sheetType = /obj/item/stack/sheet/metal
+ var/sheetAmount = 7
+ var/openSound = 'sound/effects/stonedoor_openclose.ogg'
+ var/closeSound = 'sound/effects/stonedoor_openclose.ogg'
+ CanAtmosPass = ATMOS_PASS_DENSITY
+
+/obj/structure/mineral_door/New(location)
+ ..()
+ initial_state = icon_state
+ air_update_turf(1)
+
+/obj/structure/mineral_door/Destroy()
density = FALSE
- air_update_turf(1)
- return ..()
-
-/obj/structure/mineral_door/Move()
- var/turf/T = loc
- ..()
- move_update_air(T)
-
+ air_update_turf(1)
+ return ..()
+
+/obj/structure/mineral_door/Move()
+ var/turf/T = loc
+ ..()
+ move_update_air(T)
+
/obj/structure/mineral_door/CollidedWith(atom/movable/AM)
- ..()
- if(!state)
+ ..()
+ if(!state)
return TryToSwitchState(AM)
-
-/obj/structure/mineral_door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral
- if(isAI(user)) //so the AI can't open it
- return
- else if(iscyborg(user)) //but cyborgs can
- if(get_dist(user,src) <= 1) //not remotely though
- return TryToSwitchState(user)
-
-/obj/structure/mineral_door/attack_paw(mob/user)
- return TryToSwitchState(user)
-
-/obj/structure/mineral_door/attack_hand(mob/user)
- return TryToSwitchState(user)
-
+
+/obj/structure/mineral_door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral
+ if(isAI(user)) //so the AI can't open it
+ return
+ else if(iscyborg(user)) //but cyborgs can
+ if(get_dist(user,src) <= 1) //not remotely though
+ return TryToSwitchState(user)
+
+/obj/structure/mineral_door/attack_paw(mob/user)
+ return TryToSwitchState(user)
+
+/obj/structure/mineral_door/attack_hand(mob/user)
+ return TryToSwitchState(user)
+
/obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target)
- if(istype(mover, /obj/effect/beam))
- return !opacity
- return !density
-
-/obj/structure/mineral_door/proc/TryToSwitchState(atom/user)
- if(isSwitchingStates)
- return
- if(isliving(user))
- var/mob/living/M = user
- if(world.time - M.last_bumped <= 60)
- return //NOTE do we really need that?
- if(M.client)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(!C.handcuffed)
- SwitchState()
- else
- SwitchState()
- else if(istype(user, /obj/mecha))
- SwitchState()
-
-/obj/structure/mineral_door/proc/SwitchState()
- if(state)
- Close()
- else
- Open()
-
-/obj/structure/mineral_door/proc/Open()
- isSwitchingStates = 1
- playsound(src, openSound, 100, 1)
- set_opacity(FALSE)
- flick("[initial_state]opening",src)
- sleep(10)
+ if(istype(mover, /obj/effect/beam))
+ return !opacity
+ return !density
+
+/obj/structure/mineral_door/proc/TryToSwitchState(atom/user)
+ if(isSwitchingStates)
+ return
+ if(isliving(user))
+ var/mob/living/M = user
+ if(world.time - M.last_bumped <= 60)
+ return //NOTE do we really need that?
+ if(M.client)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(!C.handcuffed)
+ SwitchState()
+ else
+ SwitchState()
+ else if(ismecha(user))
+ SwitchState()
+
+/obj/structure/mineral_door/proc/SwitchState()
+ if(state)
+ Close()
+ else
+ Open()
+
+/obj/structure/mineral_door/proc/Open()
+ isSwitchingStates = 1
+ playsound(src, openSound, 100, 1)
+ set_opacity(FALSE)
+ flick("[initial_state]opening",src)
+ sleep(10)
density = FALSE
- state = 1
- air_update_turf(1)
- update_icon()
- isSwitchingStates = 0
-
- if(close_delay != -1)
- addtimer(CALLBACK(src, .proc/Close), close_delay)
-
-/obj/structure/mineral_door/proc/Close()
- if(isSwitchingStates || state != 1)
- return
- var/turf/T = get_turf(src)
- for(var/mob/living/L in T)
- return
- isSwitchingStates = 1
- playsound(loc, closeSound, 100, 1)
- flick("[initial_state]closing",src)
- sleep(10)
+ state = 1
+ air_update_turf(1)
+ update_icon()
+ isSwitchingStates = 0
+
+ if(close_delay != -1)
+ addtimer(CALLBACK(src, .proc/Close), close_delay)
+
+/obj/structure/mineral_door/proc/Close()
+ if(isSwitchingStates || state != 1)
+ return
+ var/turf/T = get_turf(src)
+ for(var/mob/living/L in T)
+ return
+ isSwitchingStates = 1
+ playsound(loc, closeSound, 100, 1)
+ flick("[initial_state]closing",src)
+ sleep(10)
density = TRUE
- set_opacity(TRUE)
- state = 0
- air_update_turf(1)
- update_icon()
- isSwitchingStates = 0
-
-/obj/structure/mineral_door/update_icon()
- if(state)
- icon_state = "[initial_state]open"
- else
- icon_state = initial_state
-
-/obj/structure/mineral_door/attackby(obj/item/W, mob/user, params)
+ set_opacity(TRUE)
+ state = 0
+ air_update_turf(1)
+ update_icon()
+ isSwitchingStates = 0
+
+/obj/structure/mineral_door/update_icon()
+ if(state)
+ icon_state = "[initial_state]open"
+ else
+ icon_state = initial_state
+
+/obj/structure/mineral_door/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/pickaxe))
- var/obj/item/pickaxe/digTool = W
- to_chat(user, "You start digging the [name]...")
- if(do_after(user,digTool.digspeed*(1+round(max_integrity*0.01)), target = src) && src)
- to_chat(user, "You finish digging.")
- deconstruct(TRUE)
- else if(user.a_intent != INTENT_HARM)
- attack_hand(user)
- else
- return ..()
-
-/obj/structure/mineral_door/deconstruct(disassembled = TRUE)
- var/turf/T = get_turf(src)
- if(disassembled)
- new sheetType(T, sheetAmount)
- else
- new sheetType(T, max(sheetAmount - 2, 1))
- qdel(src)
-
-/obj/structure/mineral_door/iron
- name = "iron door"
- max_integrity = 300
-
-/obj/structure/mineral_door/silver
- name = "silver door"
- icon_state = "silver"
- sheetType = /obj/item/stack/sheet/mineral/silver
- max_integrity = 300
-
-/obj/structure/mineral_door/gold
- name = "gold door"
- icon_state = "gold"
- sheetType = /obj/item/stack/sheet/mineral/gold
-
-/obj/structure/mineral_door/uranium
- name = "uranium door"
- icon_state = "uranium"
- sheetType = /obj/item/stack/sheet/mineral/uranium
- max_integrity = 300
- light_range = 2
-
-/obj/structure/mineral_door/sandstone
- name = "sandstone door"
- icon_state = "sandstone"
- sheetType = /obj/item/stack/sheet/mineral/sandstone
- max_integrity = 100
-
-/obj/structure/mineral_door/transparent
- opacity = FALSE
-
-/obj/structure/mineral_door/transparent/Close()
- ..()
- set_opacity(FALSE)
-
-/obj/structure/mineral_door/transparent/plasma
- name = "plasma door"
- icon_state = "plasma"
- sheetType = /obj/item/stack/sheet/mineral/plasma
-
-/obj/structure/mineral_door/transparent/plasma/attackby(obj/item/W, mob/user, params)
- if(W.is_hot())
- var/turf/T = get_turf(src)
- message_admins("Plasma mineral door ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
- log_game("Plasma mineral door ignited by [key_name(user)] in [COORD(T)]")
- TemperatureAct()
- else
- return ..()
-
-/obj/structure/mineral_door/transparent/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(exposed_temperature > 300)
- TemperatureAct()
-
-/obj/structure/mineral_door/transparent/plasma/proc/TemperatureAct()
- atmos_spawn_air("plasma=500;TEMP=1000")
- deconstruct(FALSE)
-
-/obj/structure/mineral_door/transparent/diamond
- name = "diamond door"
- icon_state = "diamond"
- sheetType = /obj/item/stack/sheet/mineral/diamond
- max_integrity = 1000
-
-/obj/structure/mineral_door/wood
- name = "wood door"
- icon_state = "wood"
- openSound = 'sound/effects/doorcreaky.ogg'
- closeSound = 'sound/effects/doorcreaky.ogg'
- sheetType = /obj/item/stack/sheet/mineral/wood
- resistance_flags = FLAMMABLE
- max_integrity = 200
-
-/obj/structure/mineral_door/paperframe
- name = "paper frame door"
- icon_state = "paperframe"
- openSound = 'sound/effects/doorcreaky.ogg'
- closeSound = 'sound/effects/doorcreaky.ogg'
- sheetType = /obj/item/stack/sheet/paperframes
- sheetAmount = 3
- resistance_flags = FLAMMABLE
- max_integrity = 20
-
-/obj/structure/mineral_door/paperframe/Initialize()
- . = ..()
- queue_smooth_neighbors(src)
-
-/obj/structure/mineral_door/paperframe/Destroy()
- queue_smooth_neighbors(src)
- return ..()
+ var/obj/item/pickaxe/digTool = W
+ to_chat(user, "You start digging the [name]...")
+ if(do_after(user,digTool.digspeed*(1+round(max_integrity*0.01)), target = src) && src)
+ to_chat(user, "You finish digging.")
+ deconstruct(TRUE)
+ else if(user.a_intent != INTENT_HARM)
+ attack_hand(user)
+ else
+ return ..()
+
+/obj/structure/mineral_door/deconstruct(disassembled = TRUE)
+ var/turf/T = get_turf(src)
+ if(disassembled)
+ new sheetType(T, sheetAmount)
+ else
+ new sheetType(T, max(sheetAmount - 2, 1))
+ qdel(src)
+
+/obj/structure/mineral_door/iron
+ name = "iron door"
+ max_integrity = 300
+
+/obj/structure/mineral_door/silver
+ name = "silver door"
+ icon_state = "silver"
+ sheetType = /obj/item/stack/sheet/mineral/silver
+ max_integrity = 300
+
+/obj/structure/mineral_door/gold
+ name = "gold door"
+ icon_state = "gold"
+ sheetType = /obj/item/stack/sheet/mineral/gold
+
+/obj/structure/mineral_door/uranium
+ name = "uranium door"
+ icon_state = "uranium"
+ sheetType = /obj/item/stack/sheet/mineral/uranium
+ max_integrity = 300
+ light_range = 2
+
+/obj/structure/mineral_door/sandstone
+ name = "sandstone door"
+ icon_state = "sandstone"
+ sheetType = /obj/item/stack/sheet/mineral/sandstone
+ max_integrity = 100
+
+/obj/structure/mineral_door/transparent
+ opacity = FALSE
+
+/obj/structure/mineral_door/transparent/Close()
+ ..()
+ set_opacity(FALSE)
+
+/obj/structure/mineral_door/transparent/plasma
+ name = "plasma door"
+ icon_state = "plasma"
+ sheetType = /obj/item/stack/sheet/mineral/plasma
+
+/obj/structure/mineral_door/transparent/plasma/attackby(obj/item/W, mob/user, params)
+ if(W.is_hot())
+ var/turf/T = get_turf(src)
+ message_admins("Plasma mineral door ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
+ log_game("Plasma mineral door ignited by [key_name(user)] in [COORD(T)]")
+ TemperatureAct()
+ else
+ return ..()
+
+/obj/structure/mineral_door/transparent/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ if(exposed_temperature > 300)
+ TemperatureAct()
+
+/obj/structure/mineral_door/transparent/plasma/proc/TemperatureAct()
+ atmos_spawn_air("plasma=500;TEMP=1000")
+ deconstruct(FALSE)
+
+/obj/structure/mineral_door/transparent/diamond
+ name = "diamond door"
+ icon_state = "diamond"
+ sheetType = /obj/item/stack/sheet/mineral/diamond
+ max_integrity = 1000
+
+/obj/structure/mineral_door/wood
+ name = "wood door"
+ icon_state = "wood"
+ openSound = 'sound/effects/doorcreaky.ogg'
+ closeSound = 'sound/effects/doorcreaky.ogg'
+ sheetType = /obj/item/stack/sheet/mineral/wood
+ resistance_flags = FLAMMABLE
+ max_integrity = 200
+
+/obj/structure/mineral_door/paperframe
+ name = "paper frame door"
+ icon_state = "paperframe"
+ openSound = 'sound/effects/doorcreaky.ogg'
+ closeSound = 'sound/effects/doorcreaky.ogg'
+ sheetType = /obj/item/stack/sheet/paperframes
+ sheetAmount = 3
+ resistance_flags = FLAMMABLE
+ max_integrity = 20
+
+/obj/structure/mineral_door/paperframe/Initialize()
+ . = ..()
+ queue_smooth_neighbors(src)
+
+/obj/structure/mineral_door/paperframe/Destroy()
+ queue_smooth_neighbors(src)
+ return ..()
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index a32db59bc5..296e4ba757 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -1,225 +1,226 @@
-//wip wip wup
-/obj/structure/mirror
- name = "mirror"
- desc = "Mirror mirror on the wall, who's the most robust of them all?"
- icon = 'icons/obj/watercloset.dmi'
- icon_state = "mirror"
- density = FALSE
- anchored = TRUE
- max_integrity = 200
- integrity_failure = 100
-
-
-/obj/structure/mirror/attack_hand(mob/user)
- if(broken || !Adjacent(user))
- return
-
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
-
- var/userloc = H.loc
-
- //see code/modules/mob/dead/new_player/preferences.dm at approx line 545 for comments!
- //this is largely copypasted from there.
-
- //handle facial hair (if necessary)
- if(H.gender == MALE)
- var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in GLOB.facial_hair_styles_list
- if(userloc != H.loc)
- return //no tele-grooming
- if(new_style)
- H.facial_hair_style = new_style
- else
- H.facial_hair_style = "Shaved"
-
- //handle normal hair
- var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in GLOB.hair_styles_list
- if(userloc != H.loc)
- return //no tele-grooming
- if(new_style)
- H.hair_style = new_style
-
- H.update_hair()
-
-/obj/structure/mirror/examine_status(mob/user)
- if(broken)
- return // no message spam
- ..()
-
-/obj/structure/mirror/obj_break(damage_flag)
- if(!broken && !(flags_1 & NODECONSTRUCT_1))
- icon_state = "mirror_broke"
- playsound(src, "shatter", 70, 1)
- desc = "Oh no, seven years of bad luck!"
- broken = 1
-
-/obj/structure/mirror/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- if(!disassembled)
- new /obj/item/shard( src.loc )
- qdel(src)
-
-/obj/structure/mirror/attackby(obj/item/I, mob/living/user, params)
- if(istype(I, /obj/item/weldingtool) && user.a_intent != INTENT_HARM)
- var/obj/item/weldingtool/WT = I
- if(broken)
- user.changeNext_move(CLICK_CD_MELEE)
- if(WT.remove_fuel(0, user))
- to_chat(user, "You begin repairing [src]...")
- playsound(src, 'sound/items/welder.ogg', 100, 1)
- if(do_after(user, 10*I.toolspeed, target = src))
- if(!user || !WT || !WT.isOn())
- return
- to_chat(user, "You repair [src].")
- broken = 0
- icon_state = initial(icon_state)
- desc = initial(desc)
- else
- return ..()
-
-/obj/structure/mirror/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- switch(damage_type)
- if(BRUTE)
- playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
- if(BURN)
- playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-
-
-/obj/structure/mirror/magic
- name = "magic mirror"
- desc = "Turn and face the strange... face."
- icon_state = "magic_mirror"
- var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombie")
- var/list/choosable_races = list()
-
-/obj/structure/mirror/magic/New()
- if(!choosable_races.len)
- for(var/speciestype in subtypesof(/datum/species))
- var/datum/species/S = new speciestype()
- if(!(S.id in races_blacklist))
- choosable_races += S.id
- ..()
-
-/obj/structure/mirror/magic/lesser/New()
- choosable_races = GLOB.roundstart_species
- ..()
-
-/obj/structure/mirror/magic/badmin/New()
- for(var/speciestype in subtypesof(/datum/species))
- var/datum/species/S = new speciestype()
- choosable_races += S.id
- ..()
-
-/obj/structure/mirror/magic/attack_hand(mob/user)
- if(!ishuman(user))
- return
-
- var/mob/living/carbon/human/H = user
-
- var/choice = input(user, "Something to change?", "Magical Grooming") as null|anything in list("name", "race", "gender", "hair", "eyes")
-
- if(!Adjacent(user))
- return
-
- switch(choice)
- if("name")
- var/newname = copytext(sanitize(input(H, "Who are we again?", "Name change", H.name) as null|text),1,MAX_NAME_LEN)
-
- if(!newname)
- return
- if(!Adjacent(user))
- return
- H.real_name = newname
- H.name = newname
- if(H.dna)
- H.dna.real_name = newname
- if(H.mind)
- H.mind.name = newname
-
- if("race")
- var/newrace
- var/racechoice = input(H, "What are we again?", "Race change") as null|anything in choosable_races
- newrace = GLOB.species_list[racechoice]
-
- if(!newrace)
- return
- if(!Adjacent(user))
- return
- H.set_species(newrace, icon_update=0)
-
- if(H.dna.species.use_skintones)
- var/new_s_tone = input(user, "Choose your skin tone:", "Race change") as null|anything in GLOB.skin_tones
-
- if(new_s_tone)
- H.skin_tone = new_s_tone
- H.dna.update_ui_block(DNA_SKIN_TONE_BLOCK)
-
- if(MUTCOLORS in H.dna.species.species_traits)
- var/new_mutantcolor = input(user, "Choose your skin color:", "Race change") as color|null
- if(new_mutantcolor)
- var/temp_hsv = RGBtoHSV(new_mutantcolor)
-
- if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright
- H.dna.features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
-
- else
- to_chat(H, "Invalid color. Your color is not bright enough.")
-
- H.update_body()
- H.update_hair()
- H.update_body_parts()
- H.update_mutations_overlay() // no hulk lizard
-
- if("gender")
- if(!(H.gender in list("male", "female"))) //blame the patriarchy
- return
- if(!Adjacent(user))
- return
- if(H.gender == "male")
- if(alert(H, "Become a Witch?", "Confirmation", "Yes", "No") == "Yes")
- H.gender = "female"
- to_chat(H, "Man, you feel like a woman!")
- else
- return
-
- else
- if(alert(H, "Become a Warlock?", "Confirmation", "Yes", "No") == "Yes")
- H.gender = "male"
- to_chat(H, "Whoa man, you feel like a man!")
- else
- return
- H.dna.update_ui_block(DNA_GENDER_BLOCK)
- H.update_body()
- H.update_mutations_overlay() //(hulk male/female)
-
- if("hair")
- var/hairchoice = alert(H, "Hair style or hair color?", "Change Hair", "Style", "Color")
- if(!Adjacent(user))
- return
- if(hairchoice == "Style") //So you just want to use a mirror then?
- ..()
- else
- var/new_hair_color = input(H, "Choose your hair color", "Hair Color") as null|color
- if(new_hair_color)
- H.hair_color = sanitize_hexcolor(new_hair_color)
- H.dna.update_ui_block(DNA_HAIR_COLOR_BLOCK)
- if(H.gender == "male")
- var/new_face_color = input(H, "Choose your facial hair color", "Hair Color") as null|color
- if(new_face_color)
- H.facial_hair_color = sanitize_hexcolor(new_face_color)
- H.dna.update_ui_block(DNA_FACIAL_HAIR_COLOR_BLOCK)
- H.update_hair()
-
- if("eyes")
- var/new_eye_color = input(H, "Choose your eye color", "Eye Color") as null|color
- if(!Adjacent(user))
- return
- if(new_eye_color)
- H.eye_color = sanitize_hexcolor(new_eye_color)
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
- H.update_body()
- if(choice)
- curse(user)
-
-/obj/structure/mirror/magic/proc/curse(mob/living/user)
- return
+//wip wip wup
+/obj/structure/mirror
+ name = "mirror"
+ desc = "Mirror mirror on the wall, who's the most robust of them all?"
+ icon = 'icons/obj/watercloset.dmi'
+ icon_state = "mirror"
+ density = FALSE
+ anchored = TRUE
+ max_integrity = 200
+ integrity_failure = 100
+
+
+/obj/structure/mirror/attack_hand(mob/user)
+ if(broken || !Adjacent(user))
+ return
+
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+
+ var/userloc = H.loc
+
+ //see code/modules/mob/dead/new_player/preferences.dm at approx line 545 for comments!
+ //this is largely copypasted from there.
+
+ //handle facial hair (if necessary)
+ if(H.gender == MALE)
+ var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in GLOB.facial_hair_styles_list
+ if(userloc != H.loc)
+ return //no tele-grooming
+ if(new_style)
+ H.facial_hair_style = new_style
+ else
+ H.facial_hair_style = "Shaved"
+
+ //handle normal hair
+ var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in GLOB.hair_styles_list
+ if(userloc != H.loc)
+ return //no tele-grooming
+ if(new_style)
+ H.hair_style = new_style
+
+ H.update_hair()
+
+/obj/structure/mirror/examine_status(mob/user)
+ if(broken)
+ return // no message spam
+ ..()
+
+/obj/structure/mirror/obj_break(damage_flag)
+ if(!broken && !(flags_1 & NODECONSTRUCT_1))
+ icon_state = "mirror_broke"
+ playsound(src, "shatter", 70, 1)
+ desc = "Oh no, seven years of bad luck!"
+ broken = 1
+
+/obj/structure/mirror/deconstruct(disassembled = TRUE)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ if(!disassembled)
+ new /obj/item/shard( src.loc )
+ qdel(src)
+
+/obj/structure/mirror/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/weldingtool) && user.a_intent != INTENT_HARM)
+ var/obj/item/weldingtool/WT = I
+ if(broken)
+ user.changeNext_move(CLICK_CD_MELEE)
+ if(WT.remove_fuel(0, user))
+ to_chat(user, "You begin repairing [src]...")
+ playsound(src, 'sound/items/welder.ogg', 100, 1)
+ if(do_after(user, 10*I.toolspeed, target = src))
+ if(!user || !WT || !WT.isOn())
+ return
+ to_chat(user, "You repair [src].")
+ broken = 0
+ icon_state = initial(icon_state)
+ desc = initial(desc)
+ else
+ return ..()
+
+/obj/structure/mirror/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+ if(BURN)
+ playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+
+
+/obj/structure/mirror/magic
+ name = "magic mirror"
+ desc = "Turn and face the strange... face."
+ icon_state = "magic_mirror"
+ var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombie")
+ var/list/choosable_races = list()
+
+/obj/structure/mirror/magic/New()
+ if(!choosable_races.len)
+ for(var/speciestype in subtypesof(/datum/species))
+ var/datum/species/S = new speciestype()
+ if(!(S.id in races_blacklist))
+ choosable_races += S.id
+ ..()
+
+/obj/structure/mirror/magic/lesser/New()
+ var/list/L = CONFIG_GET(keyed_flag_list/roundstart_races)
+ choosable_races = L.Copy()
+ ..()
+
+/obj/structure/mirror/magic/badmin/New()
+ for(var/speciestype in subtypesof(/datum/species))
+ var/datum/species/S = new speciestype()
+ choosable_races += S.id
+ ..()
+
+/obj/structure/mirror/magic/attack_hand(mob/user)
+ if(!ishuman(user))
+ return
+
+ var/mob/living/carbon/human/H = user
+
+ var/choice = input(user, "Something to change?", "Magical Grooming") as null|anything in list("name", "race", "gender", "hair", "eyes")
+
+ if(!Adjacent(user))
+ return
+
+ switch(choice)
+ if("name")
+ var/newname = copytext(sanitize(input(H, "Who are we again?", "Name change", H.name) as null|text),1,MAX_NAME_LEN)
+
+ if(!newname)
+ return
+ if(!Adjacent(user))
+ return
+ H.real_name = newname
+ H.name = newname
+ if(H.dna)
+ H.dna.real_name = newname
+ if(H.mind)
+ H.mind.name = newname
+
+ if("race")
+ var/newrace
+ var/racechoice = input(H, "What are we again?", "Race change") as null|anything in choosable_races
+ newrace = GLOB.species_list[racechoice]
+
+ if(!newrace)
+ return
+ if(!Adjacent(user))
+ return
+ H.set_species(newrace, icon_update=0)
+
+ if(H.dna.species.use_skintones)
+ var/new_s_tone = input(user, "Choose your skin tone:", "Race change") as null|anything in GLOB.skin_tones
+
+ if(new_s_tone)
+ H.skin_tone = new_s_tone
+ H.dna.update_ui_block(DNA_SKIN_TONE_BLOCK)
+
+ if(MUTCOLORS in H.dna.species.species_traits)
+ var/new_mutantcolor = input(user, "Choose your skin color:", "Race change") as color|null
+ if(new_mutantcolor)
+ var/temp_hsv = RGBtoHSV(new_mutantcolor)
+
+ if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright
+ H.dna.features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
+
+ else
+ to_chat(H, "Invalid color. Your color is not bright enough.")
+
+ H.update_body()
+ H.update_hair()
+ H.update_body_parts()
+ H.update_mutations_overlay() // no hulk lizard
+
+ if("gender")
+ if(!(H.gender in list("male", "female"))) //blame the patriarchy
+ return
+ if(!Adjacent(user))
+ return
+ if(H.gender == "male")
+ if(alert(H, "Become a Witch?", "Confirmation", "Yes", "No") == "Yes")
+ H.gender = "female"
+ to_chat(H, "Man, you feel like a woman!")
+ else
+ return
+
+ else
+ if(alert(H, "Become a Warlock?", "Confirmation", "Yes", "No") == "Yes")
+ H.gender = "male"
+ to_chat(H, "Whoa man, you feel like a man!")
+ else
+ return
+ H.dna.update_ui_block(DNA_GENDER_BLOCK)
+ H.update_body()
+ H.update_mutations_overlay() //(hulk male/female)
+
+ if("hair")
+ var/hairchoice = alert(H, "Hair style or hair color?", "Change Hair", "Style", "Color")
+ if(!Adjacent(user))
+ return
+ if(hairchoice == "Style") //So you just want to use a mirror then?
+ ..()
+ else
+ var/new_hair_color = input(H, "Choose your hair color", "Hair Color") as null|color
+ if(new_hair_color)
+ H.hair_color = sanitize_hexcolor(new_hair_color)
+ H.dna.update_ui_block(DNA_HAIR_COLOR_BLOCK)
+ if(H.gender == "male")
+ var/new_face_color = input(H, "Choose your facial hair color", "Hair Color") as null|color
+ if(new_face_color)
+ H.facial_hair_color = sanitize_hexcolor(new_face_color)
+ H.dna.update_ui_block(DNA_FACIAL_HAIR_COLOR_BLOCK)
+ H.update_hair()
+
+ if("eyes")
+ var/new_eye_color = input(H, "Choose your eye color", "Eye Color") as null|color
+ if(!Adjacent(user))
+ return
+ if(new_eye_color)
+ H.eye_color = sanitize_hexcolor(new_eye_color)
+ H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
+ H.update_body()
+ if(choice)
+ curse(user)
+
+/obj/structure/mirror/magic/proc/curse(mob/living/user)
+ return
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 600e15201d..a5def04e0b 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -23,6 +23,8 @@
var/obj/structure/tray/connected = null
var/locked = FALSE
var/opendir = SOUTH
+ var/message_cooldown
+ var/breakout_time = 600
/obj/structure/bodycontainer/Destroy()
open()
@@ -41,6 +43,11 @@
/obj/structure/bodycontainer/relaymove(mob/user)
if(user.stat || !isturf(loc))
return
+ if(locked)
+ if(message_cooldown <= world.time)
+ message_cooldown = world.time + 50
+ to_chat(user, "[src]'s door won't budge!")
+ return
open()
/obj/structure/bodycontainer/attack_paw(mob/user)
@@ -84,11 +91,20 @@
qdel(src)
/obj/structure/bodycontainer/container_resist(mob/living/user)
- open()
-
-/obj/structure/bodycontainer/relay_container_resist(mob/living/user, obj/O)
- to_chat(user, "You slam yourself into the side of [O].")
- container_resist(user)
+ if(!locked)
+ open()
+ return
+ user.changeNext_move(CLICK_CD_BREAKOUT)
+ user.last_special = world.time + CLICK_CD_BREAKOUT
+ user.visible_message(null, \
+ "You lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)", \
+ "You hear a metallic creaking from [src].")
+ 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]!", \
+ "You successfully break out of [src]!")
+ open()
/obj/structure/bodycontainer/proc/open()
playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index cd3d09536b..d253cbcf44 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -1,69 +1,69 @@
-
+
#define MUSICIAN_HEARCHECK_MINDELAY 4
#define MUSIC_MAXLINES 300
#define MUSIC_MAXLINECHARS 50
-
-/datum/song
- var/name = "Untitled"
- var/list/lines = new()
- var/tempo = 5 // delay between notes
-
- var/playing = 0 // if we're playing
- var/help = 0 // if help is open
- var/edit = 1 // if we're in editing mode
- var/repeat = 0 // number of times remaining to repeat
- var/max_repeats = 10 // maximum times we can repeat
-
- var/instrumentDir = "piano" // the folder with the sounds
- var/instrumentExt = "ogg" // the file extension
- var/obj/instrumentObj = null // the associated obj playing the sound
+
+/datum/song
+ var/name = "Untitled"
+ var/list/lines = new()
+ var/tempo = 5 // delay between notes
+
+ var/playing = 0 // if we're playing
+ var/help = 0 // if help is open
+ var/edit = 1 // if we're in editing mode
+ var/repeat = 0 // number of times remaining to repeat
+ var/max_repeats = 10 // maximum times we can repeat
+
+ var/instrumentDir = "piano" // the folder with the sounds
+ var/instrumentExt = "ogg" // the file extension
+ var/obj/instrumentObj = null // the associated obj playing the sound
var/last_hearcheck = 0
var/list/hearing_mobs
-
+
/datum/song/New(dir, obj, ext = "ogg")
- tempo = sanitize_tempo(tempo)
- instrumentDir = dir
- instrumentObj = obj
+ tempo = sanitize_tempo(tempo)
+ instrumentDir = dir
+ instrumentObj = obj
instrumentExt = ext
-
-/datum/song/Destroy()
- instrumentObj = null
- return ..()
-
-// note is a number from 1-7 for A-G
-// acc is either "b", "n", or "#"
-// oct is 1-8 (or 9 for C)
-/datum/song/proc/playnote(note, acc as text, oct)
- // handle accidental -> B<>C of E<>F
- if(acc == "b" && (note == 3 || note == 6)) // C or F
- if(note == 3)
- oct--
- note--
- acc = "n"
- else if(acc == "#" && (note == 2 || note == 5)) // B or E
- if(note == 2)
- oct++
- note++
- acc = "n"
- else if(acc == "#" && (note == 7)) //G#
- note = 1
- acc = "b"
- else if(acc == "#") // mass convert all sharps to flats, octave jump already handled
- acc = "b"
- note++
-
- // check octave, C is allowed to go to 9
- if(oct < 1 || (note == 3 ? oct > 9 : oct > 8))
- return
-
- // now generate name
+
+/datum/song/Destroy()
+ instrumentObj = null
+ return ..()
+
+// note is a number from 1-7 for A-G
+// acc is either "b", "n", or "#"
+// oct is 1-8 (or 9 for C)
+/datum/song/proc/playnote(note, acc as text, oct)
+ // handle accidental -> B<>C of E<>F
+ if(acc == "b" && (note == 3 || note == 6)) // C or F
+ if(note == 3)
+ oct--
+ note--
+ acc = "n"
+ else if(acc == "#" && (note == 2 || note == 5)) // B or E
+ if(note == 2)
+ oct++
+ note++
+ acc = "n"
+ else if(acc == "#" && (note == 7)) //G#
+ note = 1
+ acc = "b"
+ else if(acc == "#") // mass convert all sharps to flats, octave jump already handled
+ acc = "b"
+ note++
+
+ // check octave, C is allowed to go to 9
+ if(oct < 1 || (note == 3 ? oct > 9 : oct > 8))
+ return
+
+ // now generate name
var/soundfile = "sound/instruments/[instrumentDir]/[ascii2text(note+64)][acc][oct].[instrumentExt]"
- soundfile = file(soundfile)
- // make sure the note exists
- if(!fexists(soundfile))
- return
- // and play
- var/turf/source = get_turf(instrumentObj)
+ soundfile = file(soundfile)
+ // make sure the note exists
+ if(!fexists(soundfile))
+ return
+ // and play
+ var/turf/source = get_turf(instrumentObj)
if((world.time - MUSICIAN_HEARCHECK_MINDELAY) > last_hearcheck)
LAZYCLEARLIST(hearing_mobs)
for(var/mob/M in get_hearers_in_view(15, source))
@@ -76,321 +76,317 @@
for(var/i in hearing_mobs)
var/mob/M = i
M.playsound_local(source, null, 100, falloff = 5, S = music_played)
-
-/datum/song/proc/updateDialog(mob/user)
- instrumentObj.updateDialog() // assumes it's an object in world, override if otherwise
-
-/datum/song/proc/shouldStopPlaying(mob/user)
- if(instrumentObj)
- if(!user.canUseTopic(instrumentObj))
+
+/datum/song/proc/updateDialog(mob/user)
+ instrumentObj.updateDialog() // assumes it's an object in world, override if otherwise
+
+/datum/song/proc/shouldStopPlaying(mob/user)
+ if(instrumentObj)
+ if(!user.canUseTopic(instrumentObj))
return TRUE
- return !instrumentObj.anchored // add special cases to stop in subclasses
- else
+ return !instrumentObj.anchored // add special cases to stop in subclasses
+ else
return TRUE
-
-/datum/song/proc/playsong(mob/user)
- while(repeat >= 0)
- var/cur_oct[7]
- var/cur_acc[7]
- for(var/i = 1 to 7)
- cur_oct[i] = 3
- cur_acc[i] = "n"
-
- for(var/line in lines)
- //to_chat(world, line)
- for(var/beat in splittext(lowertext(line), ","))
- //to_chat(world, "beat: [beat]")
- var/list/notes = splittext(beat, "/")
- for(var/note in splittext(notes[1], "-"))
- //to_chat(world, "note: [note]")
- if(!playing || shouldStopPlaying(user))//If the instrument is playing, or special case
+
+/datum/song/proc/playsong(mob/user)
+ while(repeat >= 0)
+ var/cur_oct[7]
+ var/cur_acc[7]
+ for(var/i = 1 to 7)
+ cur_oct[i] = 3
+ cur_acc[i] = "n"
+
+ for(var/line in lines)
+ for(var/beat in splittext(lowertext(line), ","))
+ var/list/notes = splittext(beat, "/")
+ for(var/note in splittext(notes[1], "-"))
+ if(!playing || shouldStopPlaying(user))//If the instrument is playing, or special case
playing = FALSE
hearing_mobs = null
- return
+ return
if(!lentext(note))
- continue
- //to_chat(world, "Parse: [copytext(note,1,2)]")
- var/cur_note = text2ascii(note) - 96
- if(cur_note < 1 || cur_note > 7)
- continue
- for(var/i=2 to lentext(note))
- var/ni = copytext(note,i,i+1)
- if(!text2num(ni))
- if(ni == "#" || ni == "b" || ni == "n")
- cur_acc[cur_note] = ni
- else if(ni == "s")
- cur_acc[cur_note] = "#" // so shift is never required
- else
- cur_oct[cur_note] = text2num(ni)
- if(user.dizziness > 0 && prob(user.dizziness / 2))
- cur_note = Clamp(cur_note + rand(round(-user.dizziness / 10), round(user.dizziness / 10)), 1, 7)
- if(user.dizziness > 0 && prob(user.dizziness / 5))
- if(prob(30))
- cur_acc[cur_note] = "#"
- else if(prob(42))
- cur_acc[cur_note] = "b"
- else if(prob(75))
- cur_acc[cur_note] = "n"
- playnote(cur_note, cur_acc[cur_note], cur_oct[cur_note])
- if(notes.len >= 2 && text2num(notes[2]))
- sleep(sanitize_tempo(tempo / text2num(notes[2])))
- else
- sleep(tempo)
- repeat--
+ continue
+ var/cur_note = text2ascii(note) - 96
+ if(cur_note < 1 || cur_note > 7)
+ continue
+ for(var/i=2 to lentext(note))
+ var/ni = copytext(note,i,i+1)
+ if(!text2num(ni))
+ if(ni == "#" || ni == "b" || ni == "n")
+ cur_acc[cur_note] = ni
+ else if(ni == "s")
+ cur_acc[cur_note] = "#" // so shift is never required
+ else
+ cur_oct[cur_note] = text2num(ni)
+ if(user.dizziness > 0 && prob(user.dizziness / 2))
+ cur_note = Clamp(cur_note + rand(round(-user.dizziness / 10), round(user.dizziness / 10)), 1, 7)
+ if(user.dizziness > 0 && prob(user.dizziness / 5))
+ if(prob(30))
+ cur_acc[cur_note] = "#"
+ else if(prob(42))
+ cur_acc[cur_note] = "b"
+ else if(prob(75))
+ cur_acc[cur_note] = "n"
+ playnote(cur_note, cur_acc[cur_note], cur_oct[cur_note])
+ if(notes.len >= 2 && text2num(notes[2]))
+ sleep(sanitize_tempo(tempo / text2num(notes[2])))
+ else
+ sleep(tempo)
+ repeat--
hearing_mobs = null
playing = FALSE
- repeat = 0
- updateDialog(user)
-
-/datum/song/proc/interact(mob/user)
- var/dat = ""
-
- if(lines.len > 0)
- dat += "Playback
"
- if(!playing)
- dat += "Play Stop
"
- dat += "Repeat Song: "
- dat += repeat > 0 ? "--" : "--"
- dat += " [repeat] times "
- dat += repeat < max_repeats ? "++" : "++"
- dat += "
"
- else
- dat += "Play Stop
"
- dat += "Repeats left: [repeat]
"
- if(!edit)
- dat += "
Show Editor
"
- else
- dat += "Editing
"
- dat += "Hide Editor"
- dat += " Start a New Song"
- dat += " Import a Song
"
- var/bpm = round(600 / tempo)
- dat += "Tempo: - [bpm] BPM +
"
- var/linecount = 0
- for(var/line in lines)
- linecount += 1
- dat += "Line [linecount]: Edit X [line]
"
- dat += "Add Line
"
- if(help)
- dat += "Hide Help
"
- dat += {"
+ repeat = 0
+ updateDialog(user)
+
+/datum/song/proc/interact(mob/user)
+ var/dat = ""
+
+ if(lines.len > 0)
+ dat += "Playback
"
+ if(!playing)
+ dat += "Play Stop
"
+ dat += "Repeat Song: "
+ dat += repeat > 0 ? "--" : "--"
+ dat += " [repeat] times "
+ dat += repeat < max_repeats ? "++" : "++"
+ dat += "
"
+ else
+ dat += "Play Stop
"
+ dat += "Repeats left: [repeat]
"
+ if(!edit)
+ dat += "
Show Editor
"
+ else
+ dat += "Editing
"
+ dat += "Hide Editor"
+ dat += " Start a New Song"
+ dat += " Import a Song
"
+ var/bpm = round(600 / tempo)
+ dat += "Tempo: - [bpm] BPM +
"
+ var/linecount = 0
+ for(var/line in lines)
+ linecount += 1
+ dat += "Line [linecount]: Edit X [line]
"
+ dat += "Add Line
"
+ if(help)
+ dat += "Hide Help
"
+ dat += {"
Lines are a series of chords, separated by commas (,), each with notes separated by hyphens (-).
- Every note in a chord will play together, with chord timed by the tempo.
-
- Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.
- By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.
- Example: C,D,E,F,G,A,B will play a C major scale.
- After a note has an accidental placed, it will be remembered: C,C4,C,C3 is C3,C4,C4,C3
- Chords can be played simply by seperating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B
- A pause may be denoted by an empty chord: C,E,,C,G
- To make a chord be a different time, end it with /x, where the chord length will be length
- defined by tempo / x: C,G/2,E/4
- Combined, an example is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4
-
+ Every note in a chord will play together, with chord timed by the tempo.
+
+ Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.
+ By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.
+ Example: C,D,E,F,G,A,B will play a C major scale.
+ After a note has an accidental placed, it will be remembered: C,C4,C,C3 is C3,C4,C4,C3
+ Chords can be played simply by seperating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B
+ A pause may be denoted by an empty chord: C,E,,C,G
+ To make a chord be a different time, end it with /x, where the chord length will be length
+ defined by tempo / x: C,G/2,E/4
+ Combined, an example is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4
+
Lines may be up to [MUSIC_MAXLINECHARS] characters.
A song may only contain up to [MUSIC_MAXLINES] lines.
- "}
- else
- dat += "Show Help
"
-
- var/datum/browser/popup = new(user, "instrument", instrumentObj.name, 700, 500)
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(instrumentObj.icon, instrumentObj.icon_state))
- popup.open()
-
-/datum/song/proc/ParseSong(text)
- set waitfor = FALSE
- //split into lines
- lines = splittext(text, "\n")
- if(lines.len)
- if(copytext(lines[1],1,6) == "BPM: ")
- tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
- lines.Cut(1,2)
- else
- tempo = sanitize_tempo(5) // default 120 BPM
+ "}
+ else
+ dat += "Show Help
"
+
+ var/datum/browser/popup = new(user, "instrument", instrumentObj.name, 700, 500)
+ popup.set_content(dat)
+ popup.set_title_image(user.browse_rsc_icon(instrumentObj.icon, instrumentObj.icon_state))
+ popup.open()
+
+/datum/song/proc/ParseSong(text)
+ set waitfor = FALSE
+ //split into lines
+ lines = splittext(text, "\n")
+ if(lines.len)
+ if(copytext(lines[1],1,6) == "BPM: ")
+ tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
+ lines.Cut(1,2)
+ else
+ tempo = sanitize_tempo(5) // default 120 BPM
if(lines.len > MUSIC_MAXLINES)
- to_chat(usr, "Too many lines!")
+ to_chat(usr, "Too many lines!")
lines.Cut(MUSIC_MAXLINES + 1)
- var/linenum = 1
- for(var/l in lines)
+ var/linenum = 1
+ for(var/l in lines)
if(lentext(l) > MUSIC_MAXLINECHARS)
- to_chat(usr, "Line [linenum] too long!")
- lines.Remove(l)
- else
- linenum++
- updateDialog(usr) // make sure updates when complete
-
-/datum/song/Topic(href, href_list)
- if(!usr.canUseTopic(instrumentObj))
- usr << browse(null, "window=instrument")
- usr.unset_machine()
- return
-
- instrumentObj.add_fingerprint(usr)
-
- if(href_list["newsong"])
- lines = new()
- tempo = sanitize_tempo(5) // default 120 BPM
- name = ""
-
- else if(href_list["import"])
- var/t = ""
- do
- t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t) as message)
- if(!in_range(instrumentObj, usr))
- return
-
+ to_chat(usr, "Line [linenum] too long!")
+ lines.Remove(l)
+ else
+ linenum++
+ updateDialog(usr) // make sure updates when complete
+
+/datum/song/Topic(href, href_list)
+ if(!usr.canUseTopic(instrumentObj))
+ usr << browse(null, "window=instrument")
+ usr.unset_machine()
+ return
+
+ instrumentObj.add_fingerprint(usr)
+
+ if(href_list["newsong"])
+ lines = new()
+ tempo = sanitize_tempo(5) // default 120 BPM
+ name = ""
+
+ else if(href_list["import"])
+ var/t = ""
+ do
+ t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t) as message)
+ if(!in_range(instrumentObj, usr))
+ return
+
if(lentext(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
- var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
- if(cont == "no")
- break
+ var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
+ if(cont == "no")
+ break
while(lentext(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
- ParseSong(t)
-
- else if(href_list["help"])
- help = text2num(href_list["help"]) - 1
-
- else if(href_list["edit"])
- edit = text2num(href_list["edit"]) - 1
-
- if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops.
- if(playing)
- return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing.
- repeat += round(text2num(href_list["repeat"]))
- if(repeat < 0)
- repeat = 0
- if(repeat > max_repeats)
- repeat = max_repeats
-
- else if(href_list["tempo"])
- tempo = sanitize_tempo(tempo + text2num(href_list["tempo"]))
-
- else if(href_list["play"])
+ ParseSong(t)
+
+ else if(href_list["help"])
+ help = text2num(href_list["help"]) - 1
+
+ else if(href_list["edit"])
+ edit = text2num(href_list["edit"]) - 1
+
+ if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops.
+ if(playing)
+ return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing.
+ repeat += round(text2num(href_list["repeat"]))
+ if(repeat < 0)
+ repeat = 0
+ if(repeat > max_repeats)
+ repeat = max_repeats
+
+ else if(href_list["tempo"])
+ tempo = sanitize_tempo(tempo + text2num(href_list["tempo"]))
+
+ else if(href_list["play"])
playing = TRUE
- spawn()
- playsong(usr)
-
- else if(href_list["newline"])
- var/newline = html_encode(input("Enter your line: ", instrumentObj.name) as text|null)
- if(!newline || !in_range(instrumentObj, usr))
- return
+ spawn()
+ playsong(usr)
+
+ else if(href_list["newline"])
+ var/newline = html_encode(input("Enter your line: ", instrumentObj.name) as text|null)
+ if(!newline || !in_range(instrumentObj, usr))
+ return
if(lines.len > MUSIC_MAXLINES)
- return
+ return
if(lentext(newline) > MUSIC_MAXLINECHARS)
newline = copytext(newline, 1, MUSIC_MAXLINECHARS)
- lines.Add(newline)
-
- else if(href_list["deleteline"])
- var/num = round(text2num(href_list["deleteline"]))
- if(num > lines.len || num < 1)
- return
- lines.Cut(num, num+1)
-
- else if(href_list["modifyline"])
- var/num = round(text2num(href_list["modifyline"]),1)
- var/content = html_encode(input("Enter your line: ", instrumentObj.name, lines[num]) as text|null)
- if(!content || !in_range(instrumentObj, usr))
- return
+ lines.Add(newline)
+
+ else if(href_list["deleteline"])
+ var/num = round(text2num(href_list["deleteline"]))
+ if(num > lines.len || num < 1)
+ return
+ lines.Cut(num, num+1)
+
+ else if(href_list["modifyline"])
+ var/num = round(text2num(href_list["modifyline"]),1)
+ var/content = html_encode(input("Enter your line: ", instrumentObj.name, lines[num]) as text|null)
+ if(!content || !in_range(instrumentObj, usr))
+ return
if(lentext(content) > MUSIC_MAXLINECHARS)
content = copytext(content, 1, MUSIC_MAXLINECHARS)
- if(num > lines.len || num < 1)
- return
- lines[num] = content
-
- else if(href_list["stop"])
+ if(num > lines.len || num < 1)
+ return
+ lines[num] = content
+
+ else if(href_list["stop"])
playing = FALSE
hearing_mobs = null
-
- updateDialog(usr)
- return
-
-/datum/song/proc/sanitize_tempo(new_tempo)
- new_tempo = abs(new_tempo)
- return max(round(new_tempo, world.tick_lag), world.tick_lag)
-
-// subclass for handheld instruments, like violin
-/datum/song/handheld
-
-/datum/song/handheld/updateDialog(mob/user)
- instrumentObj.interact(user)
-
-/datum/song/handheld/shouldStopPlaying()
- if(instrumentObj)
- return !isliving(instrumentObj.loc)
- else
+
+ updateDialog(usr)
+ return
+
+/datum/song/proc/sanitize_tempo(new_tempo)
+ new_tempo = abs(new_tempo)
+ return max(round(new_tempo, world.tick_lag), world.tick_lag)
+
+// subclass for handheld instruments, like violin
+/datum/song/handheld
+
+/datum/song/handheld/updateDialog(mob/user)
+ instrumentObj.interact(user)
+
+/datum/song/handheld/shouldStopPlaying()
+ if(instrumentObj)
+ return !isliving(instrumentObj.loc)
+ else
return TRUE
-
-
-//////////////////////////////////////////////////////////////////////////
-
-
-/obj/structure/piano
- name = "space minimoog"
- icon = 'icons/obj/musician.dmi'
- icon_state = "minimoog"
+
+
+//////////////////////////////////////////////////////////////////////////
+
+
+/obj/structure/piano
+ name = "space minimoog"
+ icon = 'icons/obj/musician.dmi'
+ icon_state = "minimoog"
anchored = TRUE
density = TRUE
- var/datum/song/song
-
-
-/obj/structure/piano/New()
- ..()
- song = new("piano", src)
-
- if(prob(50))
- name = "space minimoog"
- desc = "This is a minimoog, like a space piano, but more spacey!"
- icon_state = "minimoog"
- else
- name = "space piano"
- desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
- icon_state = "piano"
-
-/obj/structure/piano/Destroy()
- qdel(song)
- song = null
- return ..()
-
-/obj/structure/piano/Initialize(mapload)
- ..()
- if(mapload)
- song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
-
-/obj/structure/piano/attack_hand(mob/user)
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return 1
- interact(user)
-
-/obj/structure/piano/attack_paw(mob/user)
- return src.attack_hand(user)
-
-/obj/structure/piano/interact(mob/user)
- if(!user || !anchored)
- return
-
- user.set_machine(src)
- song.interact(user)
-
-/obj/structure/piano/attackby(obj/item/O, mob/user, params)
- if (istype(O, /obj/item/wrench))
- if (!anchored && !isinspace())
+ var/datum/song/song
+
+
+/obj/structure/piano/New()
+ ..()
+ song = new("piano", src)
+
+ if(prob(50))
+ name = "space minimoog"
+ desc = "This is a minimoog, like a space piano, but more spacey!"
+ icon_state = "minimoog"
+ else
+ name = "space piano"
+ desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
+ icon_state = "piano"
+
+/obj/structure/piano/Destroy()
+ qdel(song)
+ song = null
+ return ..()
+
+/obj/structure/piano/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
+
+/obj/structure/piano/attack_hand(mob/user)
+ if(!user.IsAdvancedToolUser())
+ to_chat(user, "You don't have the dexterity to do this!")
+ return 1
+ interact(user)
+
+/obj/structure/piano/attack_paw(mob/user)
+ return src.attack_hand(user)
+
+/obj/structure/piano/interact(mob/user)
+ if(!user || !anchored)
+ return
+
+ user.set_machine(src)
+ song.interact(user)
+
+/obj/structure/piano/attackby(obj/item/O, mob/user, params)
+ if (istype(O, /obj/item/wrench))
+ if (!anchored && !isinspace())
playsound(src, O.usesound, 50, 1)
- to_chat(user, " You begin to tighten \the [src] to the floor...")
- if (do_after(user, 20*O.toolspeed, target = src))
- user.visible_message( \
- "[user] tightens \the [src]'s casters.", \
- "You tighten \the [src]'s casters. Now it can be played again.", \
- "You hear ratchet.")
+ to_chat(user, " You begin to tighten \the [src] to the floor...")
+ if (do_after(user, 20*O.toolspeed, target = src))
+ user.visible_message( \
+ "[user] tightens \the [src]'s casters.", \
+ "You tighten \the [src]'s casters. Now it can be played again.", \
+ "You hear ratchet.")
anchored = TRUE
- else if(anchored)
+ else if(anchored)
playsound(src, O.usesound, 50, 1)
- to_chat(user, " You begin to loosen \the [src]'s casters...")
- if (do_after(user, 40*O.toolspeed, target = src))
- user.visible_message( \
- "[user] loosens \the [src]'s casters.", \
- "You loosen \the [src]. Now it can be pulled somewhere else.", \
- "You hear ratchet.")
+ to_chat(user, " You begin to loosen \the [src]'s casters...")
+ if (do_after(user, 40*O.toolspeed, target = src))
+ user.visible_message( \
+ "[user] loosens \the [src]'s casters.", \
+ "You loosen \the [src]. Now it can be pulled somewhere else.", \
+ "You hear ratchet.")
anchored = FALSE
- else
- return ..()
+ else
+ return ..()
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 9648e80993..cdf294fded 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -1,127 +1,127 @@
-/obj/structure/noticeboard
- name = "notice board"
- desc = "A board for pinning important notices upon."
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "nboard00"
+/obj/structure/noticeboard
+ name = "notice board"
+ desc = "A board for pinning important notices upon."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "nboard00"
density = FALSE
anchored = TRUE
- max_integrity = 150
- var/notices = 0
-
-/obj/structure/noticeboard/Initialize(mapload)
- ..()
-
- if(!mapload)
- return
-
- for(var/obj/item/I in loc)
- if(notices > 4) break
- if(istype(I, /obj/item/paper))
- I.loc = src
- notices++
- icon_state = "nboard0[notices]"
-
-//attaching papers!!
-/obj/structure/noticeboard/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/paper) || istype(O, /obj/item/photo))
- if(!allowed(user))
- to_chat(user, "You are not authorized to add notices")
- return
- if(notices < 5)
- if(!user.transferItemToLoc(O, src))
- return
- notices++
- icon_state = "nboard0[notices]"
- to_chat(user, "You pin the [O] to the noticeboard.")
- else
- to_chat(user, "The notice board is full")
- else
- return ..()
-
-/obj/structure/noticeboard/attack_hand(mob/user)
- var/auth = allowed(user)
- var/dat = "[name]
"
- for(var/obj/item/P in src)
- if(istype(P, /obj/item/paper))
- dat += "[P.name] [auth ? "Write Remove" : ""]
"
- else
- dat += "[P.name] [auth ? "Remove" : ""]
"
- user << browse("
"
+ for(var/obj/item/P in src)
+ if(istype(P, /obj/item/paper))
+ dat += "[P.name] [auth ? "Write Remove" : ""]
"
+ else
+ dat += "[P.name] [auth ? "Remove" : ""]
"
+ user << browse(""
- for(var/i = contents.len, i>=1, i--)
- var/obj/item/P = contents[i]
- dat += "
[P.name] "
+ for(var/i = contents.len, i>=1, i--)
+ var/obj/item/P = contents[i]
+ dat += "
[P.name]
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 a7acd8d6fa..74150c6433 100644
--- a/code/game/turfs/simulated/chasm.dm
+++ b/code/game/turfs/simulated/chasm.dm
@@ -11,6 +11,7 @@
canSmoothWith = list(/turf/open/floor/fakepit, /turf/open/chasm)
density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf
var/static/list/falling_atoms = list() //Atoms currently falling into the chasm
+ var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/abstract, /obj/effect/temp_visual))
var/drop_x = 1
var/drop_y = 1
var/drop_z = 1
@@ -88,12 +89,7 @@
return FALSE
if(!isliving(AM) && !isobj(AM))
return FALSE
- if(istype(AM, /obj/singularity) || istype(AM, /obj/item/projectile) || AM.throwing)
- return FALSE
- if(istype(AM, /obj/effect/portal))
- //Portals aren't affected by gravity. Probably.
- return FALSE
- if(istype(AM, /obj/structure/stone_tile))
+ if(is_type_in_typecache(AM, forbidden_types) || AM.throwing)
return FALSE
//Flies right over the chasm
if(isliving(AM))
@@ -110,6 +106,7 @@
return FALSE
return TRUE
+
/turf/open/chasm/proc/drop(atom/movable/AM)
//Make sure the item is still there after our sleep
if(!AM || QDELETED(AM))
@@ -128,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 cfc834037d..02206646d2 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",
@@ -170,6 +170,7 @@
return make_plating()
/turf/open/floor/singularity_pull(S, current_size)
+ ..()
if(current_size == STAGE_THREE)
if(prob(30))
if(floor_tile)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 59e7bed8ca..a24642c735 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -71,7 +71,7 @@
var/turfverb = "uproot"
/turf/open/floor/grass/Initialize()
- ..()
+ . = ..()
update_icon()
/turf/open/floor/grass/attackby(obj/item/C, mob/user, params)
@@ -109,7 +109,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 +126,7 @@
slowdown = 0
/turf/open/floor/grass/fakebasalt/Initialize()
- ..()
+ . = ..()
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
set_basalt_light(src)
@@ -144,7 +144,7 @@
flags_1 = NONE
/turf/open/floor/carpet/Initialize()
- ..()
+ . = ..()
update_icon()
/turf/open/floor/carpet/update_icon()
@@ -205,7 +205,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 542a0ed81d..247382d03c 100644
--- a/code/game/turfs/simulated/floor/light_floor.dm
+++ b/code/game/turfs/simulated/floor/light_floor.dm
@@ -13,7 +13,7 @@
/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 c28232410d..6f863d4bd0 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 f8d6c1da71..794b886537 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
@@ -230,52 +240,3 @@
icon_state = "sepia"
desc = "Time seems to flow very slowly around these tiles"
floor_tile = /obj/item/stack/tile/sepia
-
-
-
-// VINE FLOOR
-
-/turf/open/floor/vines
- color = "#aa77aa"
- icon_state = "vinefloor"
- broken_states = list()
-
-
-//All of this shit is useless for vines
-
-/turf/open/floor/vines/attackby()
- return
-
-/turf/open/floor/vines/burn_tile()
- return
-
-/turf/open/floor/vines/break_tile()
- return
-
-/turf/open/floor/vines/make_plating()
- return
-
-/turf/open/floor/vines/break_tile_to_plating()
- return
-
-/turf/open/floor/vines/ex_act(severity, target)
- ..()
- if(severity < 3 || target == src)
- ChangeTurf(src.baseturf)
-
-/turf/open/floor/vines/narsie_act(force, ignore_mobs, probability = 20)
- if(prob(probability) || force)
- ChangeTurf(baseturf) //nar sie eats this shit
- narsie_act(force, ignore_mobs, probability)
-
-/turf/open/floor/vines/singularity_pull(S, current_size)
- if(current_size >= STAGE_FIVE)
- if(prob(50))
- ChangeTurf(src.baseturf)
-
-/turf/open/floor/vines/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
- . = ..()
- //Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't
- for(var/obj/structure/spacevine/SV in src)
- if(!QDESTROYING(SV))//Helps avoid recursive loops
- qdel(SV)
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index c99d2f3a9a..63c883f88c 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -361,6 +361,7 @@
name = "Mainframe Floor"
/turf/open/floor/plasteel/vault/killroom
name = "Killroom Floor"
+ initial_gas_mix = "n2=500;TEMP=80"
/turf/open/floor/plasteel/cult
icon_state = "cult"
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index a03caadd19..8ad6657784 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -6,20 +6,18 @@
* Engine floor
* Foam plating
*/
-// note that plating and engine floor do not call their parent attackby, unlike other flooring
-// this is done in order to avoid inheriting the crowbar attackby
/turf/open/floor/plating
name = "plating"
icon_state = "plating"
- intact = 0
+ intact = FALSE
/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 b24b758d73..2649a3a14d 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -9,11 +9,11 @@
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
icon_plating = "asteroid"
+ postdig_icon_change = TRUE
var/environment_type = "asteroid"
var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
- var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
- var/sand_type = /obj/item/ore/glass
var/floor_variance = 20 //probability floor has a different icon state
+ archdrops = list(/obj/item/ore/glass = 5)
/turf/open/floor/plating/asteroid/Initialize()
var/proper_name = name
@@ -22,6 +22,9 @@
if(prob(floor_variance))
icon_state = "[environment_type][rand(0,12)]"
+ if(LAZYLEN(archdrops))
+ AddComponent(/datum/component/archaeology, 100, archdrops)
+
/turf/open/floor/plating/asteroid/burn_tile()
return
@@ -31,46 +34,9 @@
/turf/open/floor/plating/asteroid/MakeDry(wet_setting = TURF_WET_WATER)
return
-/turf/open/floor/plating/asteroid/ex_act(severity, target)
- contents_explosion(severity, target)
- switch(severity)
- if(3)
- return
- if(2)
- if(prob(20))
- src.gets_dug()
- if(1)
- src.gets_dug()
-
/turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params)
- //note that this proc does not call ..()
- if(!W || !user)
- return 0
- var/digging_speed = 0
- if (istype(W, /obj/item/shovel))
- var/obj/item/shovel/S = W
- digging_speed = S.digspeed
- else if (istype(W, /obj/item/pickaxe))
- var/obj/item/pickaxe/P = W
- digging_speed = P.digspeed
- if (digging_speed)
- var/turf/T = user.loc
- if(!isturf(T))
- return
-
- if (dug)
- to_chat(user, "This area has already been dug!")
- return
-
- to_chat(user, "You start digging...")
- playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
-
- if(do_after(user, digging_speed, target = src))
- if(istype(src, /turf/open/floor/plating/asteroid))
- to_chat(user, "You dig a hole.")
- gets_dug()
- SSblackbox.add_details("pick_used_mining","[W.type]")
-
+ if(..())
+ return TRUE
if(istype(W, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
if(S.collection_mode == 1)
@@ -88,36 +54,19 @@
var/turf/open/floor/light/F = T
F.state = L.state
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
-
-/turf/open/floor/plating/asteroid/proc/gets_dug()
- if(dug)
return
- for(var/i in 1 to 5)
- new sand_type(src)
- dug = 1
- icon_plating = "[environment_type]_dug"
- icon_state = "[environment_type]_dug"
- slowdown = 0
- return
+
+ return ..()
+
/turf/open/floor/plating/asteroid/singularity_act()
if(turf_z_is_planet(src))
return ..()
ChangeTurf(/turf/open/space)
-/turf/open/floor/plating/asteroid/singularity_pull(S, current_size)
- if(dug)
- return
- switch(current_size)
- if(STAGE_THREE)
- if(!prob(30))
- gets_dug()
- if(STAGE_FOUR)
- if(prob(50))
- gets_dug()
- else
- if(current_size >= STAGE_FIVE && prob(70))
- gets_dug()
+/turf/open/floor/plating/asteroid/ex_act(severity, target)
+ . = SendSignal(COMSIG_ATOM_EX_ACT, severity, target)
+ contents_explosion(severity, target)
/turf/open/floor/plating/asteroid/basalt
@@ -127,7 +76,7 @@
icon_state = "basalt"
icon_plating = "basalt"
environment_type = "basalt"
- sand_type = /obj/item/ore/glass/basalt
+ archdrops = list(/obj/item/ore/glass/basalt = 5)
floor_variance = 15
/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
@@ -147,10 +96,10 @@
if("basalt5", "basalt9")
B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything!
-/turf/open/floor/plating/asteroid/basalt/gets_dug()
- if(!dug)
- set_light(0)
+/turf/open/floor/plating/asteroid/basalt/ComponentActivated(datum/component/C)
..()
+ if(istype(C, /datum/component/archaeology))
+ set_light(0)
///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
@@ -188,9 +137,9 @@
has_data = TRUE
/turf/open/floor/plating/asteroid/airless/cave/volcanic
- mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast = 50, /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 3, \
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 40, /mob/living/simple_animal/hostile/spawner/lavaland = 2, \
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion = 30, /mob/living/simple_animal/hostile/spawner/lavaland/legion = 3, \
+ mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 3, \
+ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /mob/living/simple_animal/hostile/spawner/lavaland = 2, \
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /mob/living/simple_animal/hostile/spawner/lavaland/legion = 3, \
SPAWN_MEGAFAUNA = 6, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
data_having_type = /turf/open/floor/plating/asteroid/airless/cave/volcanic/has_data
@@ -340,8 +289,8 @@
initial_gas_mix = "TEMP=180"
slowdown = 2
environment_type = "snow"
- sand_type = /obj/item/stack/sheet/mineral/snow
flags_1 = NONE
+ archdrops = list(/obj/item/stack/sheet/mineral/snow = 5)
/turf/open/floor/plating/asteroid/snow/airless
initial_gas_mix = "TEMP=2.7"
diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm
index df353653d7..04c97aa7d5 100644
--- a/code/game/turfs/simulated/floor/reinf_floor.dm
+++ b/code/game/turfs/simulated/floor/reinf_floor.dm
@@ -58,6 +58,7 @@
make_plating(1)
/turf/open/floor/engine/singularity_pull(S, current_size)
+ ..()
if(current_size >= STAGE_FIVE)
if(floor_tile)
if(prob(30))
@@ -107,7 +108,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 9e0d57d782..a597022448 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))
@@ -111,12 +111,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 +147,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 +387,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 0000000000..2e0246df83
--- /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 d0eaad34e3..e39c791cee 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 261e856629..5c95d108b4 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.")
@@ -247,6 +246,7 @@
icon_state = "r_wall"
/turf/closed/wall/r_wall/singularity_pull(S, current_size)
+ ..()
if(current_size >= STAGE_FIVE)
if(prob(30))
dismantle_wall()
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 57774a5754..baee3b31c1 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
@@ -245,6 +252,7 @@
QDEL_IN(O, 50)
/turf/closed/wall/singularity_pull(S, current_size)
+ ..()
if(current_size >= STAGE_FIVE)
if(prob(50))
dismantle_wall()
@@ -286,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 b1b00b3e55..a51030be2b 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 d85f0b1938..cf611560c3 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -30,6 +30,7 @@
throw_atom(AM)
/turf/open/space/transit/proc/throw_atom(atom/movable/AM)
+ set waitfor = FALSE
if(!AM || istype(AM, /obj/docking_port))
return
if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement.
@@ -64,15 +65,15 @@
_y = min
var/turf/T = locate(_x, _y, _z)
- AM.loc = T
- AM.newtonian_move(dir)
+ AM.forceMove(T)
+
/turf/open/space/transit/CanBuildHere()
return SSshuttle.is_in_shuttle_bounds(src)
/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 e6314861b6..b02444281c 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -95,6 +95,8 @@
C.is_empty(user)
/turf/attackby(obj/item/C, mob/user, params)
+ if(..())
+ return TRUE
if(can_lay_cable() && istype(C, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = C
for(var/obj/structure/cable/LC in src)
@@ -119,8 +121,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
@@ -129,32 +129,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!
@@ -442,7 +438,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]
@@ -524,12 +520,12 @@
/turf/proc/photograph(limit=20)
var/image/I = new()
- I.overlays += src
+ I.add_overlay(src)
for(var/V in contents)
var/atom/A = V
if(A.invisibility)
continue
- I.overlays += A
+ I.add_overlay(A)
if(limit)
limit--
else
diff --git a/code/game/world.dm b/code/game/world.dm
index 0eeb29fa50..bd04008ea3 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,35 +1,41 @@
+#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)
+
/world/New()
log_world("World loaded at [time_stamp()]")
SetupExternalRSC()
- GLOB.config_error_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
+ GLOB.config_error_log = GLOB.world_pda_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
+
+ CheckSecurityMode()
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()
+ reload_custom_roundstart_items_list()
GLOB.timezoneOffset = text2num(time2text(0,"hh")) * 36000
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)
@@ -43,7 +49,7 @@
#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")
@@ -51,16 +57,19 @@
if(query_db_version.NextRow())
var/db_major = text2num(query_db_version.item[1])
var/db_minor = text2num(query_db_version.item[2])
- if(db_major < DB_MAJOR_VERSION || db_minor < DB_MINOR_VERSION)
- message_admins("Database schema ([db_major].[db_minor]) is behind latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
- log_sql("Database schema ([db_major].[db_minor]) is behind latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
+ if(db_major != DB_MAJOR_VERSION || db_minor != DB_MINOR_VERSION)
+ var/which = "behind"
+ if(db_major < DB_MAJOR_VERSION || db_minor < DB_MINOR_VERSION)
+ which = "ahead of"
+ message_admins("Database schema ([db_major].[db_minor]) is [which] the latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
+ log_sql("Database schema ([db_major].[db_minor]) is [which] the latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
else
message_admins("Could not get schema version from database")
else
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()
@@ -78,11 +87,14 @@
GLOB.world_game_log = file("[GLOB.log_directory]/game.log")
GLOB.world_attack_log = file("[GLOB.log_directory]/attack.log")
GLOB.world_runtime_log = file("[GLOB.log_directory]/runtime.log")
+ GLOB.world_qdel_log = file("[GLOB.log_directory]/qdel.log")
GLOB.world_href_log = file("[GLOB.log_directory]/hrefs.html")
+ GLOB.world_pda_log = file("[GLOB.log_directory]/pda.log")
GLOB.sql_error_log = file("[GLOB.log_directory]/sql.log")
WRITE_FILE(GLOB.world_game_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
WRITE_FILE(GLOB.world_attack_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
WRITE_FILE(GLOB.world_runtime_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
+ WRITE_FILE(GLOB.world_pda_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
GLOB.changelog_hash = md5('html/changelog.html') //used for telling if the changelog has changed recently
if(fexists(GLOB.config_error_log))
fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log")
@@ -91,18 +103,33 @@
if(GLOB.round_id)
log_game("Round ID: [GLOB.round_id]")
+/world/proc/CheckSecurityMode()
+ //try to write to data
+ if(!text2file("The world is running at least safe mode", "data/server_security_check.lock"))
+ GLOB.security_mode = SECURITY_ULTRASAFE
+ warning("/tg/station 13 is not supported in ultrasafe security mode. Everything will break!")
+ return
+
+ //try to shell
+ if(shell("echo \"The world is running in trusted mode\"") != null)
+ GLOB.security_mode = SECURITY_TRUSTED
+ else
+ GLOB.security_mode = SECURITY_SAFE
+ warning("/tg/station 13 uses many file operations, a few shell()s, and some external call()s. Trusted mode is recommended. You can download our source code for your own browsing and compilation at https://github.com/tgstation/tgstation")
+
/world/Topic(T, addr, master, key)
var/list/input = params2list(T)
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
@@ -117,25 +144,14 @@
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
@@ -185,24 +201,6 @@
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"])
@@ -221,7 +219,7 @@
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")
@@ -237,17 +235,6 @@
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()
@@ -257,13 +244,25 @@
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)
@@ -275,8 +274,8 @@
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/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm
index a83ced850e..44e6c3d07f 100644
--- a/code/modules/VR/vr_sleeper.dm
+++ b/code/modules/VR/vr_sleeper.dm
@@ -49,6 +49,10 @@
open_machine()
+/obj/machinery/vr_sleeper/container_resist(mob/living/user)
+ open_machine()
+
+
/obj/machinery/vr_sleeper/Destroy()
open_machine()
cleanup_vr_human()
@@ -118,7 +122,7 @@
if(vr_human)
qdel(vr_human)
else
- to_chat(usr, "The VR Sleeper's safeties prevent you from doing that.")
+ to_chat(usr, "The VR Sleeper's safeties prevent you from doing that.")
. = TRUE
if("toggle_open")
if(state_open)
diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm
index e580b306b3..086df300d3 100644
--- a/code/modules/admin/DB_ban/functions.dm
+++ b/code/modules/admin/DB_ban/functions.dm
@@ -354,6 +354,7 @@
output += ""
if(!linkless)
@@ -160,16 +162,16 @@
if(type == "memo" || type == "watchlist entry")
if(type == "memo")
output += "
"
- output += "\[Add memo\]"
+ output += "\[Add memo\]"
else if(type == "watchlist entry")
output += "
"
- output += "\[Add watchlist entry\]"
+ output += "\[Add watchlist entry\]"
if(filter)
- output += "|\[Unfilter clients\]"
+ output += "|\[Unfilter clients\]"
else
- output += "|\[Filter offline clients\]"
+ output += "|\[Filter offline clients\]"
output += ruler
- var/datum/DBQuery/query_get_type_messages = SSdbcore.NewQuery("SELECT id, targetckey, adminckey, text, timestamp, server, lasteditor FROM [format_table_name("messages")] WHERE type = '[type]'")
+ var/datum/DBQuery/query_get_type_messages = SSdbcore.NewQuery("SELECT id, targetckey, adminckey, text, timestamp, server, lasteditor FROM [format_table_name("messages")] WHERE type = '[type]' AND deleted = 0")
if(!query_get_type_messages.warn_execute())
return
while(query_get_type_messages.NextRow())
@@ -186,19 +188,20 @@
if(type == "watchlist entry")
output += "[t_ckey] | "
output += "[timestamp] | [server] | [admin_ckey]"
- output += " \[Delete\]"
- output += " \[Edit\]"
+ output += " \[Delete\]"
+ output += " \[Edit\]"
if(editor_ckey)
- output += " Last edit by [editor_ckey] (Click here to see edit log)"
+ output += " Last edit by [editor_ckey] (Click here to see edit log)"
output += "
[text]
"
if(target_ckey)
target_ckey = sanitizeSQL(target_ckey)
- var/datum/DBQuery/query_get_messages = SSdbcore.NewQuery("SELECT type, secret, id, adminckey, text, timestamp, server, lasteditor FROM [format_table_name("messages")] WHERE type <> 'memo' AND targetckey = '[target_ckey]' ORDER BY timestamp DESC")
+ var/datum/DBQuery/query_get_messages = SSdbcore.NewQuery("SELECT type, secret, id, adminckey, text, timestamp, server, lasteditor, DATEDIFF(NOW(), timestamp) AS `age` FROM [format_table_name("messages")] WHERE type <> 'memo' AND targetckey = '[target_ckey]' AND deleted = 0 ORDER BY timestamp DESC")
if(!query_get_messages.warn_execute())
return
var/messagedata
var/watchdata
var/notedata
+ var/skipped = 0
while(query_get_messages.NextRow())
type = query_get_messages.item[1]
if(type == "memo")
@@ -212,21 +215,36 @@
var/timestamp = query_get_messages.item[6]
var/server = query_get_messages.item[7]
var/editor_ckey = query_get_messages.item[8]
+ var/age = text2num(query_get_messages.item[9])
+ var/alphatext = ""
+ var/nsd = CONFIG_GET(number/note_stale_days)
+ var/nfd = CONFIG_GET(number/note_fresh_days)
+ if (agegate && type == "note" && isnum(nsd) && isnum(nfd) && nsd > nfd)
+ var/alpha = Clamp(100 - (age - nfd) * (85 / (nsd - nfd)), 15, 100)
+ if (alpha < 100)
+ if (alpha <= 15)
+ if (skipped)
+ skipped++
+ continue
+ alpha = 10
+ skipped = TRUE
+ alphatext = "filter: alpha(opacity=[alpha]); opacity: [alpha/100];"
+
var/data
- data += "[timestamp] | [server] | [admin_ckey]"
+ data += "
[text]
"
+ data += " Last edit by [editor_ckey] (Click here to see edit log)"
+ data += "
[text]
"
switch(type)
if("message")
messagedata += data
@@ -238,12 +256,12 @@
notedata += data
output += "Messages
"
@@ -254,10 +272,19 @@
if(notedata)
output += "Notes
"
output += notedata
+ if(!linkless)
+ if (agegate)
+ if (skipped) //the first skipped message is still shown so that we can put this link over it.
+ output += "
"
+ output += "[index_ckey]
"
else if(!type && !target_ckey && !index)
- output += "
Last edit by [editor_ckey] (Click here to see edit log)"
+ output += "
Last edit by [editor_ckey] (Click here to see edit log)"
output += "
[text]
"
return output
@@ -329,8 +356,9 @@ proc/get_message_output(type, target_ckey)
var/notetext
notesfile >> notetext
var/server
- if(config && config.server_sql_name)
- server = config.server_sql_name
+ var/ssqlname = CONFIG_GET(string/serversqlname)
+ if (ssqlname)
+ server = ssqlname
var/regex/note = new("^(\\d{2}-\\w{3}-\\d{4}) \\| (.+) ~(\\w+)$", "i")
note.Find(notetext)
var/timestamp = note.group[1]
diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm
index 9ac85e49fa..800d23090d 100644
--- a/code/modules/admin/stickyban.dm
+++ b/code/modules/admin/stickyban.dm
@@ -109,7 +109,7 @@
var/ckey = data["ckey"]
var/ban = get_stickyban_from_ckey(ckey)
if (!ban)
- to_chat(usr, "Error: No sticky ban for [ckey] found!")
+ to_chat(usr, "Error: No sticky ban for [ckey] found!")
return
var/oldreason = ban["message"]
var/reason = input(usr,"Reason","Reason","[ban["message"]]") as text|null
@@ -135,11 +135,11 @@
return
var/ban = get_stickyban_from_ckey(ckey)
if (!ban)
- to_chat(usr, "Error: No sticky ban for [ckey] found!")
+ to_chat(usr, "Error: No sticky ban for [ckey] found!")
return
var/cached_ban = SSstickyban.cache[ckey]
if (!cached_ban)
- to_chat(usr, "Error: No cached sticky ban for [ckey] found!")
+ to_chat(usr, "Error: No cached sticky ban for [ckey] found!")
world.SetConfig("ban",ckey,null)
log_admin_private("[key_name(usr)] has reverted [ckey]'s sticky ban to it's state at round start.")
@@ -152,11 +152,11 @@
/datum/admins/proc/stickyban_gethtml(ckey, ban)
. = {"
- \[-\]
- \[revert\]
+ \[-\]
+ \[revert\]
[ckey]
"
- [ban["message"]] \[Edit\]
+ [ban["message"]] \[Edit\]
"}
if (ban["admin"])
. += "[ban["admin"]]
"
@@ -166,7 +166,7 @@
for (var/key in ban["keys"])
if (ckey(key) == ckey)
continue
- . += "All Sticky Bans:
\[+\]
+ All Sticky Bans:
\[+\]
[banhtml]
"}
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index f7aa6caaf6..c182107a6a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1,3 +1,16 @@
+/datum/admins/proc/CheckAdminHref(href, href_list)
+ var/auth = href_list["admin_token"]
+ . = auth && (auth == href_token || auth == GLOB.href_token)
+ if(.)
+ return
+ var/msg = !auth ? "no" : "a bad"
+ message_admins("[key_name_admin(usr)] clicked an href with [msg] authorization key!")
+ if(CONFIG_GET(flag/debug_admin_hrefs))
+ message_admins("Debug mode enabled, call not blocked. Please ask your coders to review this round's logs.")
+ log_world("UAH: [href]")
+ return TRUE
+ log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]")
+
/datum/admins/Topic(href, href_list)
..()
@@ -5,6 +18,10 @@
message_admins("[usr.key] has attempted to override the admin panel!")
log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
return
+
+ if(!CheckAdminHref(href, href_list))
+ return
+
if(href_list["ahelp"])
if(!check_rights(R_ADMIN, TRUE))
return
@@ -112,13 +129,6 @@
message_admins("[key_name(usr)] spawned a blob with base resource gain [strength].")
log_admin("[key_name(usr)] spawned a blob with base resource gain [strength].")
new/datum/round_event/ghost_role/blob(TRUE, strength)
- if("gangs")
- if(src.makeGangsters())
- message_admins("[key_name(usr)] created gangs.")
- log_admin("[key_name(usr)] created gangs.")
- else
- message_admins("[key_name(usr)] tried to create gangs. Unfortunately, there were not enough candidates available.")
- log_admin("[key_name(usr)] failed create gangs.")
if("centcom")
message_admins("[key_name(usr)] is creating a CentCom response team...")
if(src.makeEmergencyresponseteam())
@@ -308,35 +318,36 @@
else if(href_list["toggle_continuous"])
if(!check_rights(R_ADMIN))
return
-
- if(!config.continuous[SSticker.mode.config_tag])
- config.continuous[SSticker.mode.config_tag] = 1
+ var/list/continuous = CONFIG_GET(keyed_flag_list/continuous)
+ if(!continuous[SSticker.mode.config_tag])
+ continuous[SSticker.mode.config_tag] = TRUE
else
- config.continuous[SSticker.mode.config_tag] = 0
+ continuous[SSticker.mode.config_tag] = FALSE
- message_admins("[key_name_admin(usr)] toggled the round to [config.continuous[SSticker.mode.config_tag] ? "continue if all antagonists die" : "end with the antagonists"].")
+ message_admins("[key_name_admin(usr)] toggled the round to [continuous[SSticker.mode.config_tag] ? "continue if all antagonists die" : "end with the antagonists"].")
check_antagonists()
else if(href_list["toggle_midround_antag"])
if(!check_rights(R_ADMIN))
return
- if(!config.midround_antag[SSticker.mode.config_tag])
- config.midround_antag[SSticker.mode.config_tag] = 1
+ var/list/midround_antag = CONFIG_GET(keyed_flag_list/midround_antag)
+ if(!midround_antag[SSticker.mode.config_tag])
+ midround_antag[SSticker.mode.config_tag] = TRUE
else
- config.midround_antag[SSticker.mode.config_tag] = 0
+ midround_antag[SSticker.mode.config_tag] = FALSE
- message_admins("[key_name_admin(usr)] toggled the round to [config.midround_antag[SSticker.mode.config_tag] ? "use" : "skip"] the midround antag system.")
+ message_admins("[key_name_admin(usr)] toggled the round to [midround_antag[SSticker.mode.config_tag] ? "use" : "skip"] the midround antag system.")
check_antagonists()
else if(href_list["alter_midround_time_limit"])
if(!check_rights(R_ADMIN))
return
- var/timer = input("Enter new maximum time",, config.midround_antag_time_check ) as num|null
+ var/timer = input("Enter new maximum time",, CONFIG_GET(number/midround_antag_time_check)) as num|null
if(!timer)
return
- config.midround_antag_time_check = timer
+ CONFIG_SET(number/midround_antag_time_check, timer)
message_admins("[key_name_admin(usr)] edited the maximum midround antagonist time to [timer] minutes.")
check_antagonists()
@@ -344,9 +355,10 @@
if(!check_rights(R_ADMIN))
return
- var/ratio = input("Enter new life ratio",, config.midround_antag_life_check*100) as num
- if(ratio)
- config.midround_antag_life_check = ratio/100
+ var/ratio = input("Enter new life ratio",, CONFIG_GET(number/midround_antag_life_check) * 100) as num
+ if(!ratio)
+ return
+ CONFIG_SET(number/midround_antag_life_check, ratio / 100)
message_admins("[key_name_admin(usr)] edited the midround antagonist living crew ratio to [ratio]% alive.")
check_antagonists()
@@ -360,7 +372,7 @@
else
SSticker.mode.round_ends_with_antag_death = 0
- message_admins("[key_name_admin(usr)] edited the midround antagonist system to [SSticker.mode.round_ends_with_antag_death ? "end the round" : "continue as extended"] upon failure.")
+ message_admins("[key_name_admin(usr)] edited the midround antagonist system to [SSticker.mode.round_ends_with_antag_death ? "end the round" : "continue as extended"] upon failure.")
check_antagonists()
else if(href_list["delay_round_end"])
@@ -576,8 +588,9 @@
to_chat(M, "You have been appearance banned by [usr.client.ckey].")
to_chat(M, "The reason is: [reason]")
to_chat(M, "Appearance ban can be lifted only upon request.")
- if(config.banappeals)
- to_chat(M, "To try to resolve this matter head to [config.banappeals]")
+ var/bran = CONFIG_GET(string/banappeals)
+ if(bran)
+ to_chat(M, "To try to resolve this matter head to [bran]")
else
to_chat(M, "No ban appeals URL has been set.")
if("No")
@@ -604,15 +617,15 @@
//Regular jobs
//Command (Blue)
dat += ""
- dat += "
Command Positions "
+ dat += " Command Positions "
for(var/jobPos in GLOB.command_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 6) //So things dont get squiiiiished!
@@ -623,15 +636,15 @@
//Security (Red)
counter = 0
dat += ""
- dat += "
Security Positions "
+ dat += " Security Positions "
for(var/jobPos in GLOB.security_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 5) //So things dont get squiiiiished!
@@ -642,15 +655,15 @@
//Engineering (Yellow)
counter = 0
dat += ""
- dat += "
Engineering Positions "
+ dat += " Engineering Positions "
for(var/jobPos in GLOB.engineering_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 5) //So things dont get squiiiiished!
@@ -661,15 +674,15 @@
//Medical (White)
counter = 0
dat += ""
- dat += "
Medical Positions "
+ dat += " Medical Positions "
for(var/jobPos in GLOB.medical_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 5) //So things dont get squiiiiished!
@@ -680,15 +693,15 @@
//Science (Purple)
counter = 0
dat += ""
- dat += "
Science Positions "
+ dat += " Science Positions "
for(var/jobPos in GLOB.science_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 5) //So things dont get squiiiiished!
@@ -699,15 +712,15 @@
//Supply (Brown)
counter = 0
dat += ""
- dat += "
Supply Positions "
+ dat += " Supply Positions "
for(var/jobPos in GLOB.supply_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 5) //So things dont get COPYPASTE!
@@ -718,15 +731,15 @@
//Civilian (Grey)
counter = 0
dat += ""
- dat += "
Civilian Positions "
+ dat += " Civilian Positions "
for(var/jobPos in GLOB.civilian_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 5) //So things dont get squiiiiished!
@@ -737,15 +750,15 @@
//Non-Human (Green)
counter = 0
dat += ""
- dat += "
Non-human Positions "
+ dat += " Non-human Positions "
for(var/jobPos in GLOB.nonhuman_positions)
if(!jobPos)
continue
if(jobban_isbanned(M, jobPos))
- dat += " [jobPos] "
+ dat += "[jobPos] "
counter++
else
- dat += "[jobPos] "
+ dat += "[jobPos] "
counter++
if(counter >= 5) //So things dont get squiiiiished!
@@ -756,103 +769,95 @@
//Ghost Roles (light light gray)
dat += ""
- dat += "
"
//Antagonist (Orange)
var/isbanned_dept = jobban_isbanned(M, "Syndicate")
dat += "Ghost Roles "
+ dat += " Ghost Roles "
//pAI
if(jobban_isbanned(M, "pAI"))
- dat += " pAI "
+ dat += "pAI "
else
- dat += "pAI "
+ dat += "pAI "
//Drones
if(jobban_isbanned(M, "drone"))
- dat += "Drone "
+ dat += "Drone "
else
- dat += "Drone "
+ dat += "Drone "
//Positronic Brains
if(jobban_isbanned(M, "posibrain"))
- dat += "Posibrain "
+ dat += "Posibrain "
else
- dat += "Posibrain "
+ dat += "Posibrain "
//Deathsquad
if(jobban_isbanned(M, "deathsquad"))
- dat += "Deathsquad "
+ dat += "Deathsquad "
else
- dat += "Deathsquad "
+ dat += "Deathsquad "
//Lavaland roles
if(jobban_isbanned(M, "lavaland"))
- dat += "Lavaland "
+ dat += "Lavaland "
else
- dat += "Lavaland "
+ dat += "Lavaland "
dat += ""
- dat += "
"
usr << browse(dat, "window=jobban2;size=800x450")
@@ -1107,7 +1112,10 @@
else if(href_list["showmessageckey"])
var/target = href_list["showmessageckey"]
- browse_messages(target_ckey = target)
+ var/agegate = TRUE
+ if (href_list["showall"])
+ agegate = FALSE
+ browse_messages(target_ckey = target, agegate = agegate)
else if(href_list["showmessageckeylinkless"])
var/target = href_list["showmessageckeylinkless"]
@@ -1151,8 +1159,9 @@
to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.")
SSblackbox.inc("ban_tmp",1)
SSblackbox.inc("ban_tmp_mins",mins)
- if(config.banappeals)
- to_chat(M, "To try to resolve this matter head to [config.banappeals]")
+ var/bran = CONFIG_GET(string/banappeals)
+ if(bran)
+ to_chat(M, "To try to resolve this matter head to [bran]")
else
to_chat(M, "No ban appeals URL has been set.")
log_admin_private("[key_name(usr)] has banned [M.ckey].\nReason: [key_name(M)]\nThis will be removed in [mins] minutes.")
@@ -1175,8 +1184,9 @@
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0)
to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason]")
to_chat(M, "This is a permanent ban.")
- if(config.banappeals)
- to_chat(M, "To try to resolve this matter head to [config.banappeals]")
+ var/bran = CONFIG_GET(string/banappeals)
+ if(bran)
+ to_chat(M, "To try to resolve this matter head to [bran]")
else
to_chat(M, "No ban appeals URL has been set.")
if(!DB_ban_record(BANTYPE_PERMA, M, -1, reason))
@@ -1207,9 +1217,9 @@
return alert(usr, "The game has already started.", null, null, null, null)
var/dat = {"What mode do you wish to play?Antagonist Positions "
+ dat += " Antagonist Positions "
//Traitor
if(jobban_isbanned(M, "traitor") || isbanned_dept)
- dat += " Traitor "
+ dat += "Traitor "
else
dat += "Traitor "
//Changeling
if(jobban_isbanned(M, "changeling") || isbanned_dept)
- dat += "Changeling "
+ dat += "Changeling "
else
- dat += "Changeling "
+ dat += "Changeling "
//Nuke Operative
if(jobban_isbanned(M, "operative") || isbanned_dept)
- dat += "Nuke Operative "
+ dat += "Nuke Operative "
else
- dat += "Nuke Operative "
+ dat += "Nuke Operative "
//Revolutionary
if(jobban_isbanned(M, "revolutionary") || isbanned_dept)
- dat += "Revolutionary "
+ dat += "Revolutionary "
else
- dat += "Revolutionary "
-
- //Gangster
- if(jobban_isbanned(M, "gangster") || isbanned_dept)
- dat += "Gangster "
- else
- dat += "Gangster "
-
- dat += "" //Breaking it up so it fits nicer on the screen every 5 entries
+ dat += " Revolutionary "
//Cultist
if(jobban_isbanned(M, "cultist") || isbanned_dept)
- dat += "Cultist "
+ dat += "Cultist "
else
- dat += "Cultist "
+ dat += "Cultist "
//Servant of Ratvar
if(jobban_isbanned(M, "servant of Ratvar") || isbanned_dept)
- dat += "Servant "
+ dat += "Servant "
else
- dat += "Servant "
+ dat += "Servant "
//Wizard
if(jobban_isbanned(M, "wizard") || isbanned_dept)
- dat += "Wizard "
+ dat += "Wizard "
else
- dat += "Wizard "
+ dat += "Wizard "
//Abductor
if(jobban_isbanned(M, "abductor") || isbanned_dept)
- dat += "Abductor "
+ dat += "Abductor "
else
- dat += "Abductor "
+ dat += "Abductor "
//Borer
if(jobban_isbanned(M, "borer") || isbanned_dept)
@@ -862,9 +867,9 @@
//Alien
if(jobban_isbanned(M, "alien candidate") || isbanned_dept)
- dat += "Alien "
+ dat += "Alien "
else
- dat += "Alien "
+ dat += "Alien "
dat += "
"}
for(var/mode in config.modes)
- dat += {"[config.mode_names[mode]]
"}
- dat += {"Secret
"}
- dat += {"Random
"}
+ dat += {"[config.mode_names[mode]]
"}
+ dat += {"Secret
"}
+ dat += {"Random
"}
dat += {"Now: [GLOB.master_mode]"}
usr << browse(dat, "window=c_mode")
@@ -1223,8 +1233,8 @@
return alert(usr, "The game mode has to be secret!", null, null, null, null)
var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"}
for(var/mode in config.modes)
- dat += {"[config.mode_names[mode]]
"}
- dat += {"Random (default)
"}
+ dat += {"[config.mode_names[mode]]
"}
+ dat += {"Random (default)
"}
dat += {"Now: [GLOB.secret_force_mode]"}
usr << browse(dat, "window=f_secret")
@@ -1615,11 +1625,13 @@
var/mob/living/L = M
var/status
switch (M.stat)
- if (0)
+ if (CONSCIOUS)
status = "Alive"
- if (1)
- status = "Unconscious"
- if (2)
+ if(SOFT_CRIT)
+ status = "Dying"
+ if(UNCONSCIOUS)
+ status = "[L.InCritical() ? "Unconscious and Dying" : "Unconscious"]"
+ if(DEAD)
status = "Dead"
health_description = "Status = [status]"
health_description += "
Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()] - Stamina: [L.getStaminaLoss()]"
@@ -2284,4 +2296,3 @@
dat += thing_to_check
usr << browse(dat.Join("
"), "window=related_[C];size=420x300")
-
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index 5d4e0dc29a..0842d82553 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -37,7 +37,6 @@
if(!query_text || length(query_text) < 1)
return
- //to_chat(world, query_text)
var/list/query_list = SDQL2_tokenize(query_text)
@@ -115,14 +114,14 @@
end_time -= start_time
to_chat(usr, "SDQL query results: [query_text]")
to_chat(usr, "SDQL query completed: [objs_all] objects selected by path, and [objs_eligible] objects executed on after WHERE filtering if applicable.")
- to_chat(usr, "SDQL query took [end_time/10] seconds to complete.")
+ to_chat(usr, "SDQL query took [DisplayTimeText(end_time)] to complete.")
/proc/SDQL_qdel_datum(datum/d)
qdel(d)
/proc/SDQL_gen_vv_href(t)
var/text = ""
- text += "\ref[t]"
+ text += "\ref[t]"
if(istype(t, /atom))
var/atom/a = t
var/turf/T = a.loc
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index c2a6ab7cd5..37762520a8 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -170,5 +170,13 @@
return
L -= args.Copy(2)
+/proc/_list_set(list/L, key, value)
+ L[key] = value
+
+/proc/_list_numerical_add(L, key, num)
+ L[key] += num
+
/proc/_list_swap(list/L, Index1, Index2)
L.Swap(Index1, Index2)
+
+
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index d593973188..c9784dcf18 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -80,10 +80,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(!l2b)
return
var/list/dat = list("
"
+ dat += "Refresh
"
for(var/I in l2b)
var/datum/admin_help/AH = I
- dat += "Ticket #[AH.id]: [AH.initiator_key_name]: [AH.name]
"
+ dat += "Ticket #[AH.id]: [AH.initiator_key_name]: [AH.name]
"
usr << browse(dat.Join(), "window=ahelp_list[state];size=600x480")
@@ -106,8 +106,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/datum/admin_help_tickets/proc/ClientLogin(client/C)
C.current_ticket = CKey2ActiveTicket(C.ckey)
if(C.current_ticket)
- C.current_ticket.AddInteraction("Client reconnected.")
C.current_ticket.initiator = C
+ C.current_ticket.AddInteraction("Client reconnected.")
//Dissasociate ticket
/datum/admin_help_tickets/proc/ClientLogout(client/C)
@@ -152,6 +152,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/client/initiator //semi-misnomer, it's the person who ahelped/was bwoinked
var/initiator_ckey
var/initiator_key_name
+ var/heard_by_no_admins = FALSE
var/list/_interactions //use AddInteraction() or, preferably, admin_ticket_log()
@@ -199,6 +200,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.")
if(admin_number_present <= 0)
to_chat(C, "No active admins are online, your adminhelp was sent to the admin irc.")
+ heard_by_no_admins = TRUE
GLOB.ahelp_tickets.active_tickets += src
@@ -209,6 +211,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return ..()
/datum/admin_help/proc/AddInteraction(formatted_message)
+ if(heard_by_no_admins && usr && usr.ckey != initiator_ckey)
+ heard_by_no_admins = FALSE
+ send2irc(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]")
_interactions += "[gameTimestamp()]: [formatted_message]"
//Removes the ahelp verb and returns it after 2 minutes
@@ -228,22 +233,22 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/datum/admin_help/proc/ClosureLinks(ref_src)
if(!ref_src)
ref_src = "\ref[src]"
- . = " (REJT)"
- . += " (IC)"
- . += " (CLOSE)"
- . += " (RSLVE)"
+ . = " (REJT)"
+ . += " (IC)"
+ . += " (CLOSE)"
+ . += " (RSLVE)"
//private
/datum/admin_help/proc/LinkedReplyName(ref_src)
if(!ref_src)
ref_src = "\ref[src]"
- return "[initiator_key_name]"
+ return "[initiator_key_name]"
//private
/datum/admin_help/proc/TicketHref(msg, ref_src, action = "ticket")
if(!ref_src)
ref_src = "\ref[src]"
- return "[msg]"
+ return "[msg]"
//message from the initiator without a target, all admins will see this
//won't bug irc
@@ -327,8 +332,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
state = AHELP_RESOLVED
GLOB.ahelp_tickets.ListInsert(src)
- if(initiator)
- initiator.giveadminhelpverb()
+ addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50)
AddInteraction("Resolved by [key_name].")
if(!silent)
@@ -395,9 +399,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
dat += "[GLOB.TAB][TicketHref("Refresh", ref_src)][GLOB.TAB][TicketHref("Re-Title", ref_src, "retitle")]"
if(state != AHELP_ACTIVE)
dat += "[GLOB.TAB][TicketHref("Reopen", ref_src, "reopen")]"
- dat += "
Opened at: [gameTimestamp(wtime = opened_at)] (Approx [(world.time - opened_at) / 600] minutes ago)"
+ dat += "
Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)"
if(closed_at)
- dat += "
Closed at: [gameTimestamp(wtime = closed_at)] (Approx [(world.time - closed_at) / 600] minutes ago)"
+ dat += "
Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)"
dat += "
"
if(initiator)
dat += "Actions: [FullMonty(ref_src)]
"
@@ -583,21 +587,20 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/proc/send2irc(msg,msg2)
- if(world.RunningService())
- world.ExportService("[SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE] [msg] | [msg2]")
- else if(config.useircbot)
- shell("python nudge.py [msg] [msg2]")
+ if(SERVER_TOOLS_PRESENT)
+ SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]")
/proc/send2otherserver(source,msg,type = "Ahelp")
- if(config.cross_allowed)
+ var/comms_key = CONFIG_GET(string/comms_key)
+ if(comms_key)
var/list/message = list()
message["message_sender"] = source
message["message"] = msg
- message["source"] = "([config.cross_name])"
- message["key"] = global.comms_key
+ message["source"] = "([CONFIG_GET(string/cross_comms_name)])"
+ message["key"] = comms_key
message["crossmessage"] = type
- world.Export("[config.cross_address]?[list2params(message)]")
+ world.Export("[CONFIG_GET(string/cross_server_address)]?[list2params(message)]")
/proc/ircadminwho()
@@ -675,7 +678,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(found.mind && found.mind.special_role)
is_antag = 1
founds += "Name: [found.name]([found.real_name]) Ckey: [found.ckey] [is_antag ? "(Antag)" : null] "
- msg += "[original_word](?|F) "
+ msg += "[original_word](?|F) "
continue
msg += "[original_word] "
if(irc)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index db29021463..038e454a24 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -185,7 +185,7 @@
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
- if(config.popup_admin_pm)
+ if(CONFIG_GET(flag/popup_admin_pm))
spawn() //so we don't hold the caller proc up
var/sender = src
var/sendername = key
@@ -277,7 +277,7 @@
return "Error: Ticket could not be found"
var/static/stealthkey
- var/adminname = config.showircname ? irc_tagged : "Administrator"
+ var/adminname = CONFIG_GET(flag/show_irc_name) ? irc_tagged : "Administrator"
if(!C)
return "Error: No client"
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 707a76854f..8e543c8a73 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -12,7 +12,7 @@
log_talk(mob,"[key_name(src)] : [msg]",LOGASAY)
msg = keywords_lookup(msg)
if(check_rights(R_ADMIN,0))
- msg = "ADMIN: [key_name(usr, 1)] (FLW): "
+ msg = "ADMIN: [key_name(usr, 1)] [ADMIN_FLW(mob)]: "
to_chat(GLOB.admins, msg)
else
msg = "ADMIN: [key_name(usr, 1)]: "
diff --git a/code/modules/admin/verbs/ak47s.dm b/code/modules/admin/verbs/ak47s.dm
new file mode 100644
index 0000000000..b2e62ed58f
--- /dev/null
+++ b/code/modules/admin/verbs/ak47s.dm
@@ -0,0 +1,22 @@
+GLOBAL_VAR_INIT(terrorism, FALSE)
+/client/proc/ak47s() // For when you just can't summon guns worthy of a firefight
+ if(!SSticker.HasRoundStarted())
+ alert("The game hasn't started yet!")
+ return
+ GLOB.terrorism = TRUE
+
+ for(var/mob/living/carbon/human/H in GLOB.player_list)
+ if(H.stat == DEAD || !(H.client))
+ continue
+ H.make_terrorism()
+
+ send_to_playing_players("MOTHER RUSSIA ARMS THE MOB!")
+
+/mob/living/carbon/human/proc/make_terrorism()
+ for(var/obj/item/I in held_items)
+ qdel(I)
+ var/obj/item/gun/energy/laser/LaserAK/AK = new(src)
+ if(!GLOB.terrorism)
+ AK.admin_spawned = TRUE //To prevent announcing
+ put_in_hands(AK)
+ AK.pickup(src) //For the stun shielding
diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm
index 186eee2195..7093ee23ea 100644
--- a/code/modules/admin/verbs/cinematic.dm
+++ b/code/modules/admin/verbs/cinematic.dm
@@ -1,18 +1,11 @@
-/client/proc/cinematic(cinematic as anything in list("explosion",null))
- set name = "cinematic"
- set category = "Fun"
- set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
- set hidden = 1
- if(!SSticker)
- return
- switch(cinematic)
- if("explosion")
- var/parameter = input(src,"station_missed = ?","Enter Parameter",0) as num
- var/override
- switch(parameter)
- if(1)
- override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","gang war","fake","no override")
- if(0)
- override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","nuclear emergency","AI malfunction","no override")
- SSticker.station_explosion_cinematic(parameter,override)
- return
\ No newline at end of file
+/client/proc/cinematic()
+ set name = "cinematic"
+ set category = "Fun"
+ set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
+ set hidden = 1
+ if(!SSticker)
+ return
+
+ var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic)
+ if(choice)
+ Cinematic(initial(choice.id),world,null)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 362ce2a1d8..cff80e6117 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -96,10 +96,16 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
to_chat(usr, .)
SSblackbox.add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-GLOBAL_VAR_INIT(AdminProcCaller, null)
+GLOBAL_VAR(AdminProcCaller)
GLOBAL_PROTECT(AdminProcCaller)
GLOBAL_VAR_INIT(AdminProcCallCount, 0)
GLOBAL_PROTECT(AdminProcCallCount)
+GLOBAL_VAR(LastAdminCalledTargetRef)
+GLOBAL_PROTECT(LastAdminCalledTargetRef)
+GLOBAL_VAR(LastAdminCalledTarget)
+GLOBAL_PROTECT(LastAdminCalledTarget)
+GLOBAL_VAR(LastAdminCalledProc)
+GLOBAL_PROTECT(LastAdminCalledProc)
/proc/WrapAdminProcCall(target, procname, list/arguments)
var/current_caller = GLOB.AdminProcCaller
@@ -108,6 +114,9 @@ GLOBAL_PROTECT(AdminProcCallCount)
to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.")
UNTIL(!GLOB.AdminProcCaller)
to_chat(usr, "Running your proc")
+ GLOB.LastAdminCalledProc = procname
+ if(target != GLOBAL_PROC)
+ GLOB.LastAdminCalledTargetRef = "\ref[target]"
GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you
++GLOB.AdminProcCallCount
. = world.WrapAdminProcCall(target, procname, arguments)
@@ -509,7 +518,7 @@ GLOBAL_PROTECT(AdminProcCallCount)
for(var/area/A in world)
if(on_station)
var/turf/picked = safepick(get_area_turfs(A.type))
- if(picked && (picked.z == ZLEVEL_STATION))
+ if(picked && (picked.z in GLOB.station_z_levels))
if(!(A.type in areas_all) && !is_type_in_typecache(A, station_areas_blacklist))
areas_all.Add(A.type)
else if(!(A.type in areas_all))
@@ -743,21 +752,31 @@ GLOBAL_PROTECT(AdminProcCallCount)
/client/proc/cmd_display_del_log()
set category = "Debug"
set name = "Display del() Log"
- set desc = "Displays a list of things that have failed to GC this round"
+ set desc = "Display del's log of everything that's passed through it."
- var/dat = "List of things that failed to GC this round
"
- for(var/path in SSgarbage.didntgc)
- dat += "[path] - [SSgarbage.didntgc[path]] times
"
+ var/list/dellog = list("List of things that have gone through qdel this round")
+ sortTim(SSgarbage.items, cmp=/proc/cmp_qdel_item_time, associative = TRUE)
+ for(var/path in SSgarbage.items)
+ var/datum/qdel_item/I = SSgarbage.items[path]
+ dellog += "
"
- dat += "List of paths that slept in Destroy()
"
- for(var/path in SSgarbage.noqdelhint)
- dat += "[path]
"
+ dellog += "
"
- for(var/path in SSgarbage.sleptDestroy)
- dat += "[path]
"
-
- usr << browse(dat, "window=dellog")
+ usr << browse(dellog.Join(), "window=dellog")
/client/proc/cmd_display_init_log()
set category = "Debug"
@@ -826,11 +845,11 @@ GLOBAL_PROTECT(AdminProcCallCount)
if(!holder)
return
- global.medals_enabled = !global.medals_enabled
+ GLOB.medals_enabled = !GLOB.medals_enabled
- message_admins("[key_name_admin(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.")
+ message_admins("[key_name_admin(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.")
SSblackbox.add_details("admin_verb","Toggle Medal Disable") // If...
- log_admin("[key_name(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.")
+ log_admin("[key_name(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.")
/client/proc/view_runtimes()
set category = "Debug"
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index a4482154d8..68df8a6666 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -43,8 +43,8 @@
log_admin("DEBUG: [key_name(M)] next_move = [M.next_move] lastDblClick = [M.next_click] world.time = [world.time]")
M.next_move = 1
M.next_click = 0
- message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!")
- message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!")
+ message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [DisplayTimeText(largest_move_time)]!")
+ message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [DisplayTimeText(largest_click_time)]!")
message_admins("world.time = [world.time]")
SSblackbox.add_details("admin_verb","Unfreeze Everyone") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm
index bedcd0a6e5..f893c43e08 100644
--- a/code/modules/admin/verbs/fps.dm
+++ b/code/modules/admin/verbs/fps.dm
@@ -7,13 +7,14 @@
if(!check_rights(R_DEBUG))
return
- var/new_fps = round(input("Sets game frames-per-second. Can potentially break the game (default: [config.fps])","FPS", world.fps) as num|null)
+ var/cfg_fps = CONFIG_GET(number/fps)
+ var/new_fps = round(input("Sets game frames-per-second. Can potentially break the game (default: [cfg_fps])","FPS", world.fps) as num|null)
if(new_fps <= 0)
to_chat(src, "Error: set_server_fps(): Invalid world.fps value. No changes made.")
return
- if(new_fps > config.fps*1.5)
- if(alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [config.fps]","Warning!","Confirm","ABORT-ABORT-ABORT") != "Confirm")
+ if(new_fps > cfg_fps * 1.5)
+ if(alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [cfg_fps]","Warning!","Confirm","ABORT-ABORT-ABORT") != "Confirm")
return
var/msg = "[key_name(src)] has modified world.fps to [new_fps]"
@@ -21,4 +22,5 @@
message_admins(msg, 0)
SSblackbox.add_details("admin_toggle","Set Server FPS|[new_fps]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ CONFIG_SET(number/fps, new_fps)
world.fps = new_fps
diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm
index ca84d5d759..cd3feed5d0 100644
--- a/code/modules/admin/verbs/individual_logging.dm
+++ b/code/modules/admin/verbs/individual_logging.dm
@@ -1,12 +1,12 @@
/proc/show_individual_logging_panel(mob/M, type = INDIVIDUAL_ATTACK_LOG)
if(!M || !ismob(M))
return
- var/dat = "
"
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index c8df7f56f1..3021f9badd 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -11,45 +11,56 @@
/datum/admins/proc/one_click_antag()
var/dat = {"
- Make Traitors
- Make Changelings
- Make Revs
- Make Cult
- Make Clockwork Cult
- Make Blob
- Make Gangsters
- Make Wizard (Requires Ghosts)
- Make Nuke Team (Requires Ghosts)
- Make CentCom Response Team (Requires Ghosts)
- Make Abductor Team (Requires Ghosts)
- Make Revenant (Requires Ghost)
+ Make Traitors
+ Make Changelings
+ Make Revs
+ Make Cult
+ Make Clockwork Cult
+ Make Blob
+ Make Wizard (Requires Ghosts)
+ Make Nuke Team (Requires Ghosts)
+ Make CentCom Response Team (Requires Ghosts)
+ Make Abductor Team (Requires Ghosts)
+ Make Revenant (Requires Ghost)
"}
var/datum/browser/popup = new(usr, "oneclickantag", "Quick-Create Antagonist", 400, 400)
popup.set_content(dat)
popup.open()
+/datum/admins/proc/isReadytoRumble(mob/living/carbon/human/applicant, targetrole, onstation = TRUE, conscious = TRUE)
+ if(applicant.mind.special_role)
+ return FALSE
+ if(!(targetrole in applicant.client.prefs.be_special))
+ return FALSE
+ if(onstation)
+ var/turf/T = get_turf(applicant)
+ if(!(T.z in GLOB.station_z_levels))
+ return FALSE
+ if(conscious && applicant.stat) //incase you don't care about a certain antag being unconcious when made, ie if they have selfhealing abilities.
+ return FALSE
+ if(!considered_alive(applicant.mind) || considered_afk(applicant.mind)) //makes sure the player isn't a zombie, brain, or just afk all together
+ return FALSE
+ return (!jobban_isbanned(applicant, targetrole) && !jobban_isbanned(applicant, "Syndicate"))
+
+
/datum/admins/proc/makeTraitors()
var/datum/game_mode/traitor/temp = new
- if(config.protect_roles_from_antagonist)
+ if(CONFIG_GET(flag/protect_roles_from_antagonist))
temp.restricted_jobs += temp.protected_jobs
- if(config.protect_assistant_from_antagonist)
+ if(CONFIG_GET(flag/protect_assistant_from_antagonist))
temp.restricted_jobs += "Assistant"
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(ROLE_TRAITOR in applicant.client.prefs.be_special)
- if(!applicant.stat)
- if(applicant.mind)
- if (!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, ROLE_TRAITOR) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ if(isReadytoRumble(applicant, ROLE_TRAITOR, FALSE))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numTraitors = min(candidates.len, 3)
@@ -68,23 +79,20 @@
/datum/admins/proc/makeChanglings()
var/datum/game_mode/changeling/temp = new
- if(config.protect_roles_from_antagonist)
+ if(CONFIG_GET(flag/protect_roles_from_antagonist))
temp.restricted_jobs += temp.protected_jobs
- if(config.protect_assistant_from_antagonist)
+ if(CONFIG_GET(flag/protect_assistant_from_antagonist))
temp.restricted_jobs += "Assistant"
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(ROLE_CHANGELING in applicant.client.prefs.be_special)
- var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
- if(!jobban_isbanned(applicant, ROLE_CHANGELING) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ if(isReadytoRumble(applicant, ROLE_CHANGELING))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numChanglings = min(candidates.len, 3)
@@ -101,23 +109,20 @@
/datum/admins/proc/makeRevs()
var/datum/game_mode/revolution/temp = new
- if(config.protect_roles_from_antagonist)
+ if(CONFIG_GET(flag/protect_roles_from_antagonist))
temp.restricted_jobs += temp.protected_jobs
- if(config.protect_assistant_from_antagonist)
+ if(CONFIG_GET(flag/protect_assistant_from_antagonist))
temp.restricted_jobs += "Assistant"
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(ROLE_REV in applicant.client.prefs.be_special)
- var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
- if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ if(isReadytoRumble(applicant, ROLE_REV))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numRevs = min(candidates.len, 3)
@@ -143,23 +148,20 @@
/datum/admins/proc/makeCult()
var/datum/game_mode/cult/temp = new
- if(config.protect_roles_from_antagonist)
+ if(CONFIG_GET(flag/protect_roles_from_antagonist))
temp.restricted_jobs += temp.protected_jobs
- if(config.protect_assistant_from_antagonist)
+ if(CONFIG_GET(flag/protect_assistant_from_antagonist))
temp.restricted_jobs += "Assistant"
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(ROLE_CULTIST in applicant.client.prefs.be_special)
- var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
- if(!jobban_isbanned(applicant, ROLE_CULTIST) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ if(isReadytoRumble(applicant, ROLE_CULTIST))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numCultists = min(candidates.len, 4)
@@ -176,23 +178,20 @@
/datum/admins/proc/makeClockCult()
var/datum/game_mode/clockwork_cult/temp = new
- if(config.protect_roles_from_antagonist)
+ if(CONFIG_GET(flag/protect_roles_from_antagonist))
temp.restricted_jobs += temp.protected_jobs
- if(config.protect_assistant_from_antagonist)
+ if(CONFIG_GET(flag/protect_assistant_from_antagonist))
temp.restricted_jobs += "Assistant"
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(ROLE_SERVANT_OF_RATVAR in applicant.client.prefs.be_special)
- var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
- if(!jobban_isbanned(applicant, ROLE_SERVANT_OF_RATVAR) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ if(isReadytoRumble(applicant, ROLE_SERVANT_OF_RATVAR))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numCultists = min(candidates.len, 4)
@@ -341,7 +340,7 @@
missiondesc += "
Your Mission: [mission]"
to_chat(Commando, missiondesc)
- if(config.enforce_human_authority)
+ if(CONFIG_GET(flag/enforce_human_authority))
Commando.set_species(/datum/species/human)
//Logging and cleanup
@@ -358,43 +357,6 @@
return
-
-/datum/admins/proc/makeGangsters()
-
- var/datum/game_mode/gang/temp = new
- if(config.protect_roles_from_antagonist)
- temp.restricted_jobs += temp.protected_jobs
-
- if(config.protect_assistant_from_antagonist)
- temp.restricted_jobs += "Assistant"
-
- var/list/mob/living/carbon/human/candidates = list()
- var/mob/living/carbon/human/H = null
-
- for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(ROLE_GANG in applicant.client.prefs.be_special)
- var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
- if(!jobban_isbanned(applicant, ROLE_GANG) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
-
- if(candidates.len >= 2)
- for(var/needs_assigned=2,needs_assigned>0,needs_assigned--)
- H = pick(candidates)
- if(GLOB.gang_colors_pool.len)
- var/datum/gang/newgang = new()
- SSticker.mode.gangs += newgang
- H.mind.make_Gang(newgang)
- candidates.Remove(H)
- else if(needs_assigned == 2)
- return 0
- return 1
-
- return 0
-
-
/datum/admins/proc/makeOfficial()
var/mission = input("Assign a task for the official", "Assign Task", "Conduct a routine preformance review of [station_name()] and its Captain.")
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered to be a CentCom Official?", "deathsquad")
@@ -420,7 +382,7 @@
missionobj.completed = 1
newmob.mind.objectives += missionobj
- if(config.enforce_human_authority)
+ if(CONFIG_GET(flag/enforce_human_authority))
newmob.set_species(/datum/species/human)
//Greet the official
@@ -535,7 +497,7 @@
missiondesc += "
Your Mission: [mission]"
to_chat(ERTOperative, missiondesc)
- if(config.enforce_human_authority)
+ if(CONFIG_GET(flag/enforce_human_authority))
ERTOperative.set_species(/datum/species/human)
//Logging and cleanup
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index 7301724eb6..b675815602 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -50,8 +50,8 @@ GLOBAL_VAR_INIT(highlander, FALSE)
equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(src), slot_ears)
equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(src), slot_head)
equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), slot_shoes)
- equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_l_store)
- for(var/obj/item/pinpointer/P in src)
+ equip_to_slot_or_del(new /obj/item/pinpointer/nuke(src), slot_l_store)
+ for(var/obj/item/pinpointer/nuke/P in src)
P.attack_self(src)
var/obj/item/card/id/W = new(src)
W.icon_state = "centcom"
@@ -77,48 +77,3 @@ GLOBAL_VAR_INIT(highlander, FALSE)
to_chat(src, "Your [H1.name] cries out for blood. Claim the lives of others, and your own will be restored!\n\
Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it.")
-
-/proc/only_me()
- if(!SSticker.HasRoundStarted())
- alert("The game hasn't started yet!")
- return
-
- for(var/mob/living/carbon/human/H in GLOB.player_list)
- if(H.stat == 2 || !(H.client)) continue
- if(is_special_character(H)) continue
-
- SSticker.mode.traitors += H.mind
- H.mind.special_role = "[H.real_name] Prime"
-
- var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone
- hijack_objective.owner = H.mind
- H.mind.objectives += hijack_objective
-
- to_chat(H, "You are the multiverse summoner. Activate your blade to summon copies of yourself from another universe to fight by your side.")
- H.mind.announce_objectives()
-
- var/datum/gang/multiverse/G = new(src, "[H.real_name]")
- SSticker.mode.gangs += G
- G.bosses[H.mind] = 0 //No they don't use influence but this prevents runtimes.
- G.add_gang_hud(H.mind)
- H.mind.gang_datum = G
-
- var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id)
- qdel(slot_item_ID)
- var/obj/item/slot_item_hand = H.get_item_for_held_index(2)
- H.dropItemToGround(slot_item_hand)
-
- var /obj/item/multisword/multi = new(H)
- H.put_in_hands_or_del(multi)
-
- var/obj/item/card/id/W = new(H)
- W.icon_state = "centcom"
- W.access = get_all_accesses()
- W.access += get_all_centcom_access()
- W.assignment = "Multiverse Summoner"
- W.registered_name = H.real_name
- W.update_label(H.real_name)
- H.equip_to_slot_or_del(W, slot_wear_id)
-
- message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ME!")
- log_admin("[key_name(usr)] used there can be only me.")
diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm
index 3da486be78..b159445963 100644
--- a/code/modules/admin/verbs/panicbunker.dm
+++ b/code/modules/admin/verbs/panicbunker.dm
@@ -1,15 +1,16 @@
/client/proc/panicbunker()
set category = "Server"
set name = "Toggle Panic Bunker"
- if (!config.sql_enabled)
+ if (!CONFIG_GET(flag/sql_enabled))
to_chat(usr, "The Database is not enabled!")
return
- config.panic_bunker = (!config.panic_bunker)
+ var/new_pb = !CONFIG_GET(flag/panic_bunker)
+ CONFIG_SET(flag/panic_bunker, new_pb)
- log_admin("[key_name(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"on":"off")]")
- message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"enabled":"disabled")].")
- if (config.panic_bunker && (!SSdbcore || !SSdbcore.IsConnected()))
+ log_admin("[key_name(usr)] has toggled the Panic Bunker, it is now [new_pb ? "on" : "off"]")
+ message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [new_pb ? "enabled" : "disabled"].")
+ if (new_pb && !SSdbcore.Connect())
message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.")
- SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[new_pb]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index 84a29d9c01..0cc1f72256 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -36,7 +36,11 @@
for(var/mob/M in GLOB.player_list)
if(M.client.prefs.toggles & SOUND_MIDI)
+ var/user_vol = M.client.chatOutput.adminMusicVolume
+ if(user_vol)
+ admin_sound.volume = vol * (user_vol / 100)
SEND_SOUND(M, admin_sound)
+ admin_sound.volume = vol
SSblackbox.add_details("admin_verb","Play Global Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -52,6 +56,63 @@
playsound(get_turf(src.mob), S, 50, 0, 0)
SSblackbox.add_details("admin_verb","Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/play_web_sound()
+ set category = "Fun"
+ set name = "Play Internet Sound"
+ if(!check_rights(R_SOUNDS))
+ return
+
+ var/ytdl = CONFIG_GET(string/invoke_youtubedl)
+ if(!ytdl)
+ to_chat(src, "Youtube-dl was not configured, action unavailable") //Check config.txt for the INVOKE_YOUTUBEDL value
+ return
+
+ var/web_sound_input = input("Enter content URL (supported sites only, leave blank to stop playing)", "Play Internet Sound via youtube-dl") as text|null
+ if(istext(web_sound_input))
+ var/web_sound_url = ""
+ var/pitch
+ if(length(web_sound_input))
+
+ web_sound_input = trim(web_sound_input)
+ var/static/regex/html_protocol_regex = regex("https?://")
+ if(findtext(web_sound_input, ":") && !findtext(web_sound_input, html_protocol_regex))
+ to_chat(src, "Non-http(s) URIs are not allowed.")
+ to_chat(src, "For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website.")
+ return
+ var/shell_scrubbed_input = shell_url_scrub(web_sound_input)
+ var/list/output = world.shelleo("[ytdl] --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --get-url \"[shell_scrubbed_input]\"")
+ var/errorlevel = output[SHELLEO_ERRORLEVEL]
+ var/stdout = output[SHELLEO_STDOUT]
+ var/stderr = output[SHELLEO_STDERR]
+ if(!errorlevel)
+ var/static/regex/content_url_regex = regex("https?://\\S+")
+ if(content_url_regex.Find(stdout))
+ web_sound_url = content_url_regex.match
+
+ if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS])
+ pitch = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5)
+ to_chat(src, "You feel the Honkmother messing with your song...")
+ SSblackbox.add_details("played_url", "[web_sound_input]|[ckey]")
+ log_admin("[key_name(src)] played web sound: [web_sound_input]")
+ message_admins("[key_name(src)] played web sound: [web_sound_input]")
+ else
+ to_chat(src, "Youtube-dl URL retrieval FAILED:")
+ to_chat(src, "[stderr]")
+
+ else //pressed ok with blank
+ log_admin("[key_name(src)] stopped web sound")
+ message_admins("[key_name(src)] stopped web sound")
+ web_sound_url = " "
+
+ if(web_sound_url)
+ for(var/m in GLOB.player_list)
+ var/mob/M = m
+ var/client/C = M.client
+ if((C.prefs.toggles & SOUND_MIDI) && C.chatOutput && !C.chatOutput.broken && C.chatOutput.loaded)
+ C.chatOutput.sendMusic(web_sound_url, pitch)
+
+ SSblackbox.add_details("admin_verb","Play Internet Sound")
+
/client/proc/set_round_end_sound(S as sound)
set category = "Fun"
set name = "Set Round End Sound"
@@ -75,4 +136,7 @@
for(var/mob/M in GLOB.player_list)
if(M.client)
SEND_SOUND(M, sound(null))
+ var/client/C = M.client
+ if(C && C.chatOutput && !C.chatOutput.broken && C.chatOutput.loaded)
+ C.chatOutput.sendMusic(" ")
SSblackbox.add_details("admin_verb","Stop All Playing Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index e271cdb3a7..483c9470a2 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -2,7 +2,7 @@
set name = "Possess Obj"
set category = "Object"
- if(O.dangerous_possession && config.forbid_singulo_possession)
+ if(O.dangerous_possession && CONFIG_GET(flag/forbid_singulo_possession))
to_chat(usr, "[O] is too powerful for you to possess.")
return
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 62f3cab1d1..e354d26ab0 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -174,7 +174,7 @@
return
if(automute)
- if(!config.automute_on)
+ if(!CONFIG_GET(flag/automute_on))
return
else
if(!check_rights())
@@ -344,7 +344,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
new_character.real_name = record_found.fields["name"]
new_character.gender = record_found.fields["sex"]
new_character.age = record_found.fields["age"]
- new_character.hardset_dna(record_found.fields["identity"], record_found.fields["enzymes"], record_found.fields["name"], record_found.fields["blood_type"], record_found.fields["species"], record_found.fields["features"])
+ new_character.hardset_dna(record_found.fields["identity"], record_found.fields["enzymes"], record_found.fields["name"], record_found.fields["blood_type"], new record_found.fields["species"], record_found.fields["features"])
else
var/datum/preferences/A = new()
A.copy_to(new_character)
@@ -391,9 +391,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
call(/datum/game_mode/proc/equip_syndicate)(new_character)
if("Space Ninja")
var/list/ninja_spawn = list()
- for(var/obj/effect/landmark/L in GLOB.landmarks_list)
- if(L.name=="carpspawn")
- ninja_spawn += L
+ for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
+ ninja_spawn += L
var/datum/antagonist/ninja/ninjadatum = new_character.mind.has_antag_datum(ANTAG_DATUM_NINJA)
ninjadatum.equip_space_ninja()
if(ninja_spawn.len)
@@ -652,6 +651,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
change_view(input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128))
else
change_view(world.view)
+
log_admin("[key_name(usr)] changed their view range to [view].")
//message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI
@@ -706,8 +706,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!")
return
- if(config.force_random_names)
- config.force_random_names = 0
+ var/frn = CONFIG_GET(flag/force_random_names)
+ if(frn)
+ CONFIG_SET(flag/force_random_names, FALSE)
message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.")
to_chat(usr, "Disabled.")
return
@@ -725,7 +726,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet.")
- config.force_random_names = 1
+ CONFIG_SET(flag/force_random_names, TRUE)
SSblackbox.add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -733,15 +734,15 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Server"
set name = "Toggle random events on/off"
set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
- if(!config.allow_random_events)
- config.allow_random_events = 1
+ var/new_are = !CONFIG_GET(flag/allow_random_events)
+ CONFIG_SET(flag/allow_random_events, new_are)
+ if(new_are)
to_chat(usr, "Random events enabled")
message_admins("Admin [key_name_admin(usr)] has enabled random events.")
else
- config.allow_random_events = 0
to_chat(usr, "Random events disabled")
message_admins("Admin [key_name_admin(usr)] has disabled random events.")
- SSblackbox.add_details("admin_toggle","Toggle Random Events|[config.allow_random_events]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_toggle","Toggle Random Events|[new_are]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/admin_change_sec_level()
@@ -843,8 +844,9 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
var/dat = {"