[E]" - if(E.holidayID) - holiday += dat - else if(E.wizardevent) - magic += dat - else - normal += dat - - dat = normal + "
" + magic + "
" + holiday - - var/datum/browser/popup = new(usr, "forceevent", "Force Random Event", 300, 750) - popup.set_content(dat) - popup.open() - - -/* -////////////// -// HOLIDAYS // -////////////// -//Uncommenting ALLOW_HOLIDAYS in config.txt will enable holidays - -//It's easy to add stuff. Just modify getHoliday to set holiday to something using the switch for DD(#day) MM(#month) YY(#year). -//You can then check if it's a special day in any code in the game by doing if(events.holiday == "MyHolidayID") - -//You can also make holiday random events easily thanks to Pete/Gia's system. -//simply make a random event normally, then assign it a holidayID string which matches the one you gave it in getHolday. -//Anything with a holidayID, which does not match the holiday string, will never occur. - -//Please, Don't spam stuff up with stupid stuff (key example being april-fools Pooh/ERP/etc), -//And don't forget: CHECK YOUR CODE!!!! We don't want any zero-day bugs which happen only on holidays and never get found/fixed! - -////////////////////////////////////////////////////////////////////////////////////////////////////////// -//ALSO, MOST IMPORTANTLY: Don't add stupid stuff! Discuss bonus content with Project-Heads first please!// -////////////////////////////////////////////////////////////////////////////////////////////////////////// -~Carn */ - -//sets up the holiday string in the events manager. -/datum/controller/event/proc/getHoliday() - if(!config.allow_holidays) return // Holiday stuff was not enabled in the config! - holiday = null - - var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year - var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month - var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day - - //Main switch. If any of these are too dumb/inappropriate, or you have better ones, feel free to change whatever - switch(MM) - if(1) //Jan - switch(DD) - if(1) holiday = "New Year" - - if(2) //Feb - switch(DD) - if(2) holiday = "Groundhog Day" - if(14) holiday = "Valentine's Day" - if(17) holiday = "Random Acts of Kindness Day" - - if(3) //Mar - switch(DD) - if(14) holiday = "Pi Day" - if(17) holiday = "St. Patrick's Day" - if(27) - if(YY == 16) - holiday = "Easter" - if(31) - if(YY == 13) - holiday = "Easter" - - if(4) //Apr - switch(DD) - if(1) - holiday = "April Fool's Day" - if(YY == 18 && prob(50)) holiday = "Easter" - if(5) - if(YY == 15) holiday = "Easter" - if(16) - if(YY == 17) holiday = "Easter" - if(20) - holiday = "Four-Twenty" - if(YY == 14 && prob(50)) holiday = "Easter" - if(22) holiday = "Earth Day" - - if(5) //May - switch(DD) - if(1) holiday = "Labour Day" - if(4) holiday = "FireFighter's Day" - if(12) holiday = "Owl and Pussycat Day" //what a dumb day of observence...but we -do- have costumes already :3 - - if(6) //Jun - - if(7) //Jul - switch(DD) - if(1) holiday = "Doctor's Day" - if(2) holiday = "UFO Day" - if(8) holiday = "Writer's Day" - if(30) holiday = "Friendship Day" - - if(8) //Aug - switch(DD) - if(5) holiday = "Beer Day" - - if(9) //Sep - switch(DD) - if(19) holiday = "Talk-Like-a-Pirate Day" - if(28) holiday = "Stupid-Questions Day" - - if(10) //Oct - switch(DD) - if(4) holiday = "Animal's Day" - if(7) holiday = "Smiling Day" - if(16) holiday = "Boss' Day" - if(31) holiday = "Halloween" - - if(11) //Nov - switch(DD) - if(1) holiday = "Vegan Day" - if(13) holiday = "Kindness Day" - if(19) holiday = "Flowers Day" - if(21) holiday = "Saying-'Hello' Day" - - if(12) //Dec - switch(DD) - if(10) holiday = "Human-Rights Day" - if(14) holiday = "Monkey Day" - if(21) holiday = "Mayan Doomsday Anniversary" - if(22) holiday = "Orgasming Day" //lol. These all actually exist - if(24) holiday = "Xmas" - if(25) holiday = "Xmas" - if(26) holiday = "Boxing Day" - if(31) holiday = "New Year" - - if(!holiday) - //Friday the 13th - if(DD == 13) - if(time2text(world.timeofday, "DDD") == "Fri") - holiday = "Friday the 13th" - - world.update_status() - -/datum/controller/event/proc/toggleWizardmode() - wizardmode = !wizardmode - for(var/datum/round_event_control/E in control) - E.weight = initial(E.weight) - if((E.wizardevent && !wizardmode) || (!E.wizardevent && wizardmode)) - E.weight = 0 - message_admins("Summon Events has been [wizardmode ? "enabled, events will occur every [events.frequency_lower / 600] to [events.frequency_upper / 600] minutes" : "disabled"]!") - log_game("Summon Events was [wizardmode ? "enabled" : "disabled"]!") - -/datum/controller/event/proc/resetFrequency() - frequency_lower = initial(frequency_lower) - frequency_upper = initial(frequency_upper) \ No newline at end of file +var/datum/subsystem/events/SSevent + +/datum/subsystem/events + name = "Events" + priority = 6 + + var/list/control = list() //list of all datum/round_event_control. Used for selecting events based on weight and occurrences. + var/list/running = list() //list of all existing /datum/round_event + + var/scheduled = 0 //The next world.time that a naturally occuring random event can be selected. + var/frequency_lower = 3000 //5 minutes lower bound. + var/frequency_upper = 9000 //15 minutes upper bound. Basically an event will happen every 5 to 15 minutes. + + var/holiday //This will be a string of the name of any realworld holiday which occurs today (GMT time) + var/wizardmode = 0 + + +/datum/subsystem/events/New() + NEW_SS_GLOBAL(SSevent) + + +/datum/subsystem/events/Initialize() + for(var/type in typesof(/datum/round_event_control)) + var/datum/round_event_control/E = new type() + if(!E.typepath) + continue //don't want this one! leave it for the garbage collector + if(E.wizardevent && !wizardmode) + E.weight = 0 + control += E //add it to the list of all events (controls) + reschedule() + getHoliday() + ..() + + +/datum/subsystem/events/fire() + checkEvent() + var/i=1 + for(var/thing in running) + if(thing) + thing:process() + ++i + continue + running.Cut(i,i+1) + + +//checks if we should select a random event yet, and reschedules if necessary +/datum/subsystem/events/proc/checkEvent() + if(scheduled <= world.time) + spawnEvent() + reschedule() + +//decides which world.time we should select another random event at. +/datum/subsystem/events/proc/reschedule() + scheduled = world.time + rand(frequency_lower, max(frequency_lower,frequency_upper)) + +//selects a random event based on whether it can occur and it's 'weight'(probability) +/datum/subsystem/events/proc/spawnEvent() + if(!config.allow_random_events) +// var/datum/round_event_control/E = locate(/datum/round_event_control/dust) in control +// if(E) E.runEvent() + return + + var/sum_of_weights = 0 + for(var/datum/round_event_control/E in control) + if(E.occurrences >= E.max_occurrences) continue + if(E.earliest_start >= world.time) continue + if(E.holidayID) + if(E.holidayID != holiday) continue + if(E.weight < 0) //for round-start events etc. + if(E.runEvent() == PROCESS_KILL) + E.max_occurrences = 0 + continue + return + sum_of_weights += E.weight + + sum_of_weights = rand(0,sum_of_weights) //reusing this variable. It now represents the 'weight' we want to select + + for(var/datum/round_event_control/E in control) + if(E.occurrences >= E.max_occurrences) continue + if(E.earliest_start >= world.time) continue + if(E.holidayID) + if(E.holidayID != holiday) continue + sum_of_weights -= E.weight + + if(sum_of_weights <= 0) //we've hit our goal + if(E.runEvent() == PROCESS_KILL)//we couldn't run this event for some reason, set its max_occurrences to 0 + E.max_occurrences = 0 + continue + return + + +/datum/round_event/proc/findEventArea() //Here's a nice proc to use to find an area for your event to land in! + var/list/safe_areas = list( + /area/turret_protected/ai, + /area/turret_protected/ai_upload, + /area/engine, + /area/solar, + /area/holodeck, + /area/shuttle + ) + + //These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up. + var/list/danger_areas = list( + /area/engine/break_room, + /area/engine/chiefs_office) + + //Need to locate() as it's just a list of paths. + return locate(pick((the_station_areas - safe_areas) + danger_areas)) + + +//allows a client to trigger an event +//aka Badmin Central +/client/proc/forceEvent() + set name = "Trigger Event" + set category = "Fun" + + if(!holder ||!check_rights(R_FUN)) + return + + holder.forceEvent() + +/datum/admins/proc/forceEvent() + var/dat = "" + var/normal = "" + var/magic = "" + var/holiday = "" + for(var/datum/round_event_control/E in SSevent.control) + dat = "
[E]" + if(E.holidayID) + holiday += dat + else if(E.wizardevent) + magic += dat + else + normal += dat + + dat = normal + "
" + magic + "
" + holiday + + var/datum/browser/popup = new(usr, "forceevent", "Force Random Event", 300, 750) + popup.set_content(dat) + popup.open() + + +/* +////////////// +// HOLIDAYS // +////////////// +//Uncommenting ALLOW_HOLIDAYS in config.txt will enable holidays + +//It's easy to add stuff. Just modify getHoliday to set holiday to something using the switch for DD(#day) MM(#month) YY(#year). +//You can then check if it's a special day in any code in the game by doing if(events.holiday == "MyHolidayID") + +//You can also make holiday random events easily thanks to Pete/Gia's system. +//simply make a random event normally, then assign it a holidayID string which matches the one you gave it in getHolday. +//Anything with a holidayID, which does not match the holiday string, will never occur. + +//Please, Don't spam stuff up with stupid stuff (key example being april-fools Pooh/ERP/etc), +//And don't forget: CHECK YOUR CODE!!!! We don't want any zero-day bugs which happen only on holidays and never get found/fixed! + +////////////////////////////////////////////////////////////////////////////////////////////////////////// +//ALSO, MOST IMPORTANTLY: Don't add stupid stuff! Discuss bonus content with Project-Heads first please!// +////////////////////////////////////////////////////////////////////////////////////////////////////////// +~Carn */ + +//sets up the holiday string in the events manager. +/datum/subsystem/events/proc/getHoliday() + if(!config.allow_holidays) return // Holiday stuff was not enabled in the config! + holiday = null + + var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year + var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month + var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day + + //Main switch. If any of these are too dumb/inappropriate, or you have better ones, feel free to change whatever + switch(MM) + if(1) //Jan + switch(DD) + if(1) holiday = "New Year" + + if(2) //Feb + switch(DD) + if(2) holiday = "Groundhog Day" + if(14) holiday = "Valentine's Day" + if(17) holiday = "Random Acts of Kindness Day" + + if(3) //Mar + switch(DD) + if(14) holiday = "Pi Day" + if(17) holiday = "St. Patrick's Day" + if(27) + if(YY == 16) + holiday = "Easter" + if(31) + if(YY == 13) + holiday = "Easter" + + if(4) //Apr + switch(DD) + if(1) + holiday = "April Fool's Day" + if(YY == 18 && prob(50)) holiday = "Easter" + if(5) + if(YY == 15) holiday = "Easter" + if(16) + if(YY == 17) holiday = "Easter" + if(20) + holiday = "Four-Twenty" + if(YY == 14 && prob(50)) holiday = "Easter" + if(22) holiday = "Earth Day" + + if(5) //May + switch(DD) + if(1) holiday = "Labour Day" + if(4) holiday = "FireFighter's Day" + if(12) holiday = "Owl and Pussycat Day" //what a dumb day of observence...but we -do- have costumes already :3 + + if(6) //Jun + + if(7) //Jul + switch(DD) + if(1) holiday = "Doctor's Day" + if(2) holiday = "UFO Day" + if(8) holiday = "Writer's Day" + if(30) holiday = "Friendship Day" + + if(8) //Aug + switch(DD) + if(5) holiday = "Beer Day" + + if(9) //Sep + switch(DD) + if(19) holiday = "Talk-Like-a-Pirate Day" + if(28) holiday = "Stupid-Questions Day" + + if(10) //Oct + switch(DD) + if(4) holiday = "Animal's Day" + if(7) holiday = "Smiling Day" + if(16) holiday = "Boss' Day" + if(31) holiday = "Halloween" + + if(11) //Nov + switch(DD) + if(1) holiday = "Vegan Day" + if(13) holiday = "Kindness Day" + if(19) holiday = "Flowers Day" + if(21) holiday = "Saying-'Hello' Day" + + if(12) //Dec + switch(DD) + if(10) holiday = "Human-Rights Day" + if(14) holiday = "Monkey Day" + if(21) holiday = "Mayan Doomsday Anniversary" + if(22) holiday = "Orgasming Day" //lol. These all actually exist + if(24) holiday = "Xmas" + if(25) holiday = "Xmas" + if(26) holiday = "Boxing Day" + if(31) holiday = "New Year" + + if(!holiday) + //Friday the 13th + if(DD == 13) + if(time2text(world.timeofday, "DDD") == "Fri") + holiday = "Friday the 13th" + + world.update_status() + + +/datum/subsystem/events/proc/toggleWizardmode() + wizardmode = !wizardmode + for(var/datum/round_event_control/E in SSevent.control) + E.weight = initial(E.weight) + if((E.wizardevent && !wizardmode) || (!E.wizardevent && wizardmode)) + E.weight = 0 + message_admins("Summon Events has been [wizardmode ? "enabled, events will occur every [SSevent.frequency_lower / 600] to [SSevent.frequency_upper / 600] minutes" : "disabled"]!") + log_game("Summon Events was [wizardmode ? "enabled" : "disabled"]!") + + +/datum/subsystem/events/proc/resetFrequency() + frequency_lower = initial(frequency_lower) + frequency_upper = initial(frequency_upper) diff --git a/code/controllers/garbage.dm b/code/controllers/subsystem/garbage.dm similarity index 81% rename from code/controllers/garbage.dm rename to code/controllers/subsystem/garbage.dm index 501ea8a2d92..3a329379f97 100644 --- a/code/controllers/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -1,133 +1,144 @@ -#define GC_COLLECTION_TIMEOUT 300 // deciseconds to wait to let running procs finish before we just say fuck it and force del() the object -#define GC_DEL_CHECK_PER_TICK 100 // number of tests per master controller tick to make sure our GC'd objects are actually GC'd -#define GC_FORCE_DEL_PER_TICK 20 // max force del() calls per master controller tick - -var/datum/controller/garbage_collector/garbage = new() - - -/datum/controller/garbage_collector - var/dels = 0 // number of del()'s we've done this tick - var/list/destroyed = 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/logging = 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 - -/datum/controller/garbage_collector/proc/AddTrash(var/datum/A) - if(!istype(A) || !isnull(A.gc_destroyed)) - return -// testing("GC: AddTrash([A.type])") - A.gc_destroyed = world.time - destroyed -= "\ref[A]" // Removing any previous references that were GC'd so that the current object will be at the end of the list. - destroyed["\ref[A]"] = world.time - -/datum/controller/garbage_collector/proc/process() - dels = 0 - var/time_to_kill = world.time - GC_COLLECTION_TIMEOUT // Anything qdel() but not GC'd BEFORE this time needs to be manually del() - var/checkRemain = GC_DEL_CHECK_PER_TICK - while(destroyed.len && --checkRemain >= 0) - if(dels > GC_FORCE_DEL_PER_TICK) -// testing("GC: Reached max force dels per tick [dels] vs [GC_FORCE_DEL_PER_TICK]") - break // Server's already pretty pounded, everything else can wait 2 seconds - var/refID = destroyed[1] - var/GCd_at_time = destroyed[refID] - if(GCd_at_time > time_to_kill) -// testing("GC: [refID] not old enough, breaking at [world.time] for [GCd_at_time - time_to_kill] deciseconds until [GCd_at_time + GC_COLLECTION_TIMEOUT]") - break // Everything else is newer, skip them - var/atom/A = locate(refID) -// testing("GC: [refID] old enough to test: GCd_at_time: [GCd_at_time] time_to_kill: [time_to_kill] current: [world.time]") - if(A && A.gc_destroyed == GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake - // Something's still referring to the qdel'd object. Kill it. - testing("GC: -- \ref[A] | [A.type] was unable to be GC'd and was deleted --") - logging["[A.type]"]++ - del(A) - dels++ -// else -// testing("GC: [refID] properly GC'd at [world.time] with timeout [GCd_at_time]") - destroyed.Cut(1, 2) - -// 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. -/proc/qdel(var/datum/A) - if(!A) - return - if(!istype(A)) - //warning("qdel() passed object of type [A.type]. qdel() can only handle /datum types.") - del(A) - if(garbage) - garbage.dels++ - else if(isnull(A.gc_destroyed)) - // Let our friend know they're about to get fucked up. - . = !A.Destroy() - if(. && A) - if(garbage && !isturf(A)) - garbage.AddTrash(A) - else - del(A) - -// Default implementation of clean-up code. -// This should be overridden to remove all references pointing to the object being destroyed. -// Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.) -/datum/proc/Destroy() - //del(src) - return - -/datum/var/gc_destroyed //Time when this object was destroyed. - -#ifdef TESTING -/client/var/running_find_references - -/atom/verb/find_references() - set category = "Debug" - set name = "Find References" - set background = 1 - set src in world - - if(!usr || !usr.client) - return - - if(usr.client.running_find_references) - testing("CANCELLED search for references to a [usr.client.running_find_references].") - usr.client.running_find_references = null - return - - if(alert("Running this will create a lot of lag until it finishes. You can cancel it by running it again. Would you like to begin the search?", "Find References", "Yes", "No") == "No") - return - - // Remove this object from the list of things to be auto-deleted. - if(garbage) - garbage.destroyed -= "\ref[src]" - - usr.client.running_find_references = type - testing("Beginning search for references to a [type].") - var/list/things = list() - for(var/client/thing) - things += thing - for(var/datum/thing) - things += thing - for(var/atom/thing) - things += thing - testing("Collected list of things in search for references to a [type]. ([things.len] Thing\s)") - for(var/datum/thing in things) - if(!usr.client.running_find_references) return - for(var/varname in thing.vars) - var/variable = thing.vars[varname] - if(variable == src) - testing("Found [src.type] \ref[src] in [thing.type]'s [varname] var.") - else if(islist(variable)) - if(src in variable) - testing("Found [src.type] \ref[src] in [thing.type]'s [varname] list var.") - testing("Completed search for references to a [type].") - usr.client.running_find_references = null - -/client/verb/purge_all_destroyed_objects() - set category = "Debug" - if(garbage) - while(garbage.destroyed.len) - var/datum/o = locate(garbage.destroyed[1]) - if(istype(o) && o.gc_destroyed) - del(o) - garbage.dels++ - garbage.destroyed.Cut(1, 2) -#endif +var/datum/subsystem/garbage_collector/SSgarbage + +/datum/subsystem/garbage_collector + name = "Garbage" + can_fire = 1 + wait = 60 + priority = 21 + + var/collection_timeout = 300 //deciseconds to wait to let running procs finish before we just say fuck it and force del() the object + var/max_checks_multiplier = 5 //multiplier (per-decisecond) for calculating max number of tests per SS tick. These tests check if our GC'd objects are actually GC'd + var/max_forcedel_multiplier = 1 //multiplier (per-decisecond) for calculating max number of force del() calls per SS tick. + + var/dels = 0 // number of del()'s we've done this tick + var/list/destroyed = 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/logging = 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 + +/datum/subsystem/garbage_collector/New() + NEW_SS_GLOBAL(SSgarbage) + +/datum/subsystem/garbage_collector/fire() + dels = 0 + + var/time_to_kill = world.time - collection_timeout // Anything qdel() but not GC'd BEFORE this time needs to be manually del() + var/checkRemain = max_checks_multiplier * wait + var/maxDels = max_forcedel_multiplier * wait + + while(destroyed.len && --checkRemain >= 0) + if(dels >= maxDels) +// testing("GC: Reached max force dels per tick [dels] vs [GC_FORCE_DEL_PER_TICK]") + break // Server's already pretty pounded, everything else can wait 2 seconds + var/refID = destroyed[1] + var/GCd_at_time = destroyed[refID] + if(GCd_at_time > time_to_kill) +// testing("GC: [refID] not old enough, breaking at [world.time] for [GCd_at_time - time_to_kill] deciseconds until [GCd_at_time + GC_COLLECTION_TIMEOUT]") + break // Everything else is newer, skip them + var/atom/A = locate(refID) +// testing("GC: [refID] old enough to test: GCd_at_time: [GCd_at_time] time_to_kill: [time_to_kill] current: [world.time]") + if(A && A.gc_destroyed == GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake + // Something's still referring to the qdel'd object. Kill it. + testing("GC: -- \ref[A] | [A.type] was unable to be GC'd and was deleted --") + logging["[A.type]"]++ + del(A) + ++dels +// else +// testing("GC: [refID] properly GC'd at [world.time] with timeout [GCd_at_time]") + destroyed.Cut(1, 2) + + +/datum/subsystem/garbage_collector/proc/AddTrash(datum/A) + if(!istype(A) || !isnull(A.gc_destroyed)) + return +// testing("GC: AddTrash([A.type])") + A.gc_destroyed = world.time + destroyed -= "\ref[A]" // Removing any previous references that were GC'd so that the current object will be at the end of the list. + destroyed["\ref[A]"] = world.time + + +// 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. +/proc/qdel(var/datum/A) + if(!A) + return + if(!istype(A)) + //warning("qdel() passed object of type [A.type]. qdel() can only handle /datum types.") + del(A) + SSgarbage.dels++ + else if(isnull(A.gc_destroyed)) + // Let our friend know they're about to get fucked up. + . = !A.Destroy() + if(. && A) + if(!isturf(A)) + SSgarbage.AddTrash(A) + else + del(A) + +// Default implementation of clean-up code. +// This should be overridden to remove all references pointing to the object being destroyed. +// Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.) +/datum/proc/Destroy() + //del(src) + return + +/datum/var/gc_destroyed //Time when this object was destroyed. + +#ifdef TESTING +/client/var/running_find_references + +/atom/verb/find_references() + set category = "Debug" + set name = "Find References" + set background = 1 + set src in world + + if(!usr || !usr.client) + return + + if(usr.client.running_find_references) + testing("CANCELLED search for references to a [usr.client.running_find_references].") + usr.client.running_find_references = null + return + + if(alert("Running this will create a lot of lag until it finishes. You can cancel it by running it again. Would you like to begin the search?", "Find References", "Yes", "No") == "No") + return + + // Remove this object from the list of things to be auto-deleted. + if(garbage) + garbage.destroyed -= "\ref[src]" + + usr.client.running_find_references = type + testing("Beginning search for references to a [type].") + var/list/things = list() + for(var/client/thing) + things += thing + for(var/datum/thing) + things += thing + for(var/atom/thing) + things += thing + testing("Collected list of things in search for references to a [type]. ([things.len] Thing\s)") + for(var/datum/thing in things) + if(!usr.client.running_find_references) return + for(var/varname in thing.vars) + var/variable = thing.vars[varname] + if(variable == src) + testing("Found [src.type] \ref[src] in [thing.type]'s [varname] var.") + else if(islist(variable)) + if(src in variable) + testing("Found [src.type] \ref[src] in [thing.type]'s [varname] list var.") + testing("Completed search for references to a [type].") + usr.client.running_find_references = null + +/client/verb/purge_all_destroyed_objects() + set category = "Debug" + if(garbage) + while(garbage.destroyed.len) + var/datum/o = locate(garbage.destroyed[1]) + if(istype(o) && o.gc_destroyed) + del(o) + garbage.dels++ + garbage.destroyed.Cut(1, 2) +#endif diff --git a/code/game/jobs/job_controller.dm b/code/controllers/subsystem/jobs.dm similarity index 87% rename from code/game/jobs/job_controller.dm rename to code/controllers/subsystem/jobs.dm index 906f167875d..d1a09895393 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/controllers/subsystem/jobs.dm @@ -1,416 +1,424 @@ -var/global/datum/controller/occupations/job_master - -/datum/controller/occupations - //List of all jobs - var/list/occupations = list() - //Players who need jobs - var/list/unassigned = list() - //Debug info - var/list/job_debug = list() - - -/datum/controller/occupations/proc/SetupOccupations(var/faction = "Station") - occupations = list() - var/list/all_jobs = typesof(/datum/job) - if(!all_jobs.len) - world << "Error setting up jobs, no job datums found" - return 0 - - for(var/J in all_jobs) - var/datum/job/job = new J() - if(!job) continue - if(job.faction != faction) continue - if(!job.config_check()) continue - occupations += job - - return 1 - - -/datum/controller/occupations/proc/Debug(var/text) - if(!Debug2) return 0 - job_debug.Add(text) - return 1 - - -/datum/controller/occupations/proc/GetJob(var/rank) - if(!rank) return null - for(var/datum/job/J in occupations) - if(!J) continue - if(J.title == rank) return J - return null - -/datum/controller/occupations/proc/AssignRole(var/mob/new_player/player, var/rank, var/latejoin = 0) - Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]") - if(player && player.mind && rank) - var/datum/job/job = GetJob(rank) - if(!job) return 0 - if(jobban_isbanned(player, rank)) return 0 - if(!job.player_old_enough(player.client)) return 0 - var/position_limit = job.total_positions - if(!latejoin) - position_limit = job.spawn_positions - if((job.current_positions < position_limit) || position_limit == -1) - Debug("Player: [player] is now Rank: [rank], JCP:[job.current_positions], JPL:[position_limit]") - player.mind.assigned_role = rank - unassigned -= player - job.current_positions++ - return 1 - Debug("AR has failed, Player: [player], Rank: [rank]") - return 0 - - -/datum/controller/occupations/proc/FindOccupationCandidates(datum/job/job, level, flag) - Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]") - var/list/candidates = list() - for(var/mob/new_player/player in unassigned) - if(jobban_isbanned(player, job.title)) - Debug("FOC isbanned failed, Player: [player]") - continue - if(!job.player_old_enough(player.client)) - Debug("FOC player not old enough, Player: [player]") - continue - if(flag && (!player.client.prefs.be_special & flag)) - Debug("FOC flag failed, Player: [player], Flag: [flag], ") - continue - - if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human") - Debug("FOC non-human failed, Player: [player]") - continue - - if(player.client.prefs.GetJobDepartment(job, level) & job.flag) - Debug("FOC pass, Player: [player], Level:[level]") - candidates += player - return candidates - -/datum/controller/occupations/proc/GiveRandomJob(var/mob/new_player/player) - Debug("GRJ Giving random job, Player: [player]") - for(var/datum/job/job in shuffle(occupations)) - if(!job) - continue - - if(istype(job, GetJob("Assistant"))) // We don't want to give him assistant, that's boring! - continue - - if(job in command_positions) //If you want a command position, select it! - continue - - if(jobban_isbanned(player, job.title)) - Debug("GRJ isbanned failed, Player: [player], Job: [job.title]") - continue - - if(!job.player_old_enough(player.client)) - Debug("GRJ player not old enough, Player: [player]") - continue - - if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human") - Debug("GRJ non-human failed, Player: [player]") - continue - - - if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) - Debug("GRJ Random job given, Player: [player], Job: [job]") - AssignRole(player, job.title) - unassigned -= player - break - -/datum/controller/occupations/proc/ResetOccupations() - for(var/mob/new_player/player in player_list) - if((player) && (player.mind)) - player.mind.assigned_role = null - player.mind.special_role = null - SetupOccupations() - unassigned = list() - return - - -//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until -//it locates a head or runs out of levels to check -//This is basically to ensure that there's atleast a few heads in the round -/datum/controller/occupations/proc/FillHeadPosition() - for(var/level = 1 to 3) - for(var/command_position in command_positions) - var/datum/job/job = GetJob(command_position) - if(!job) continue - var/list/candidates = FindOccupationCandidates(job, level) - if(!candidates.len) continue - var/mob/new_player/candidate = pick(candidates) - if(AssignRole(candidate, command_position)) - return 1 - return 0 - - -//This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level -//This is also to ensure we get as many heads as possible -/datum/controller/occupations/proc/CheckHeadPositions(var/level) - for(var/command_position in command_positions) - var/datum/job/job = GetJob(command_position) - if(!job) continue - var/list/candidates = FindOccupationCandidates(job, level) - if(!candidates.len) continue - var/mob/new_player/candidate = pick(candidates) - AssignRole(candidate, command_position) - return - - -/datum/controller/occupations/proc/FillAIPosition() - var/ai_selected = 0 - var/datum/job/job = GetJob("AI") - if(!job) return 0 - if(ticker.mode.name == "AI malfunction") // malf. AIs are pre-selected before jobs - for (var/datum/mind/mAI in ticker.mode.malf_ai) - AssignRole(mAI.current, "AI") - ai_selected++ - if(ai_selected) return 1 - return 0 - - for(var/i = job.total_positions, i > 0, i--) - for(var/level = 1 to 3) - var/list/candidates = list() - candidates = FindOccupationCandidates(job, level) - if(candidates.len) - var/mob/new_player/candidate = pick(candidates) - if(AssignRole(candidate, "AI")) - ai_selected++ - break - if(ai_selected) return 1 - return 0 - - -/** Proc DivideOccupations - * fills var "assigned_role" for all ready players. - * This proc must not have any side effect besides of modifying "assigned_role". - **/ -/datum/controller/occupations/proc/DivideOccupations() - //Setup new player list and get the jobs list - Debug("Running DO") - SetupOccupations() - - //Holder for Triumvirate is stored in the ticker, this just processes it - if(ticker) - for(var/datum/job/ai/A in occupations) - if(ticker.triai) - A.spawn_positions = 3 - - //Get the players who are ready - for(var/mob/new_player/player in player_list) - if(player.ready && player.mind && !player.mind.assigned_role) - unassigned += player - - Debug("DO, Len: [unassigned.len]") - if(unassigned.len == 0) return 0 - - //Scale number of open security officer slots to population - setup_officer_positions() - - //Shuffle players and jobs - unassigned = shuffle(unassigned) - - HandleFeedbackGathering() - - //People who wants to be assistants, sure, go on. - Debug("DO, Running Assistant Check 1") - var/datum/job/assist = new /datum/job/assistant() - var/list/assistant_candidates = FindOccupationCandidates(assist, 3) - Debug("AC1, Candidates: [assistant_candidates.len]") - for(var/mob/new_player/player in assistant_candidates) - Debug("AC1 pass, Player: [player]") - AssignRole(player, "Assistant") - assistant_candidates -= player - Debug("DO, AC1 end") - - //Select one head - Debug("DO, Running Head Check") - FillHeadPosition() - Debug("DO, Head Check end") - - //Check for an AI - Debug("DO, Running AI Check") - FillAIPosition() - Debug("DO, AI Check end") - - //Other jobs are now checked - Debug("DO, Running Standard Check") - - - // New job giving system by Donkie - // This will cause lots of more loops, but since it's only done once it shouldn't really matter much at all. - // Hopefully this will add more randomness and fairness to job giving. - - // Loop through all levels from high to low - var/list/shuffledoccupations = shuffle(occupations) - for(var/level = 1 to 3) - //Check the head jobs first each level - CheckHeadPositions(level) - - // Loop through all unassigned players - for(var/mob/new_player/player in unassigned) - - // Loop through all jobs - for(var/datum/job/job in shuffledoccupations) // SHUFFLE ME BABY - if(!job) - continue - - if(jobban_isbanned(player, job.title)) - Debug("DO isbanned failed, Player: [player], Job:[job.title]") - continue - - if(!job.player_old_enough(player.client)) - Debug("DO player not old enough, Player: [player], Job:[job.title]") - continue - - if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human") - Debug("DO non-human failed, Player: [player], Job:[job.title]") - continue - - - // If the player wants that job on this level, then try give it to him. - if(player.client.prefs.GetJobDepartment(job, level) & job.flag) - - // If the job isn't filled - if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) - Debug("DO pass, Player: [player], Level:[level], Job:[job.title]") - AssignRole(player, job.title) - unassigned -= player - break - - // Hand out random jobs to the people who didn't get any in the last check - // Also makes sure that they got their preference correct - for(var/mob/new_player/player in unassigned) - if(jobban_isbanned(player, "Assistant")) - GiveRandomJob(player) //you get to roll for random before everyone else just to be sure you don't get assistant. you're so speshul - - for(var/mob/new_player/player in unassigned) - if(player.client.prefs.userandomjob) - GiveRandomJob(player) - - Debug("DO, Standard Check end") - - Debug("DO, Running AC2") - - // For those who wanted to be assistant if their preferences were filled, here you go. - for(var/mob/new_player/player in unassigned) - Debug("AC2 Assistant located, Player: [player]") - AssignRole(player, "Assistant") - return 1 - -//Gives the player the stuff he should have with his rank -/datum/controller/occupations/proc/EquipRank(var/mob/living/H, var/rank, var/joined_late = 0) - - var/datum/job/job = GetJob(rank) - - H.job = rank - - //If we joined at roundstart we should be positioned at our workstation - if(!joined_late) - var/obj/S = null - for(var/obj/effect/landmark/start/sloc in landmarks_list) - if(sloc.name != rank) continue - if(locate(/mob/living) in sloc.loc) continue - S = sloc - break - if(!S) - S = locate("start*[rank]") // use old stype - if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf)) - H.loc = S.loc - - if(H.mind) - H.mind.assigned_role = rank - - if(job) - var/new_mob = job.equip(H) - if(ismob(new_mob)) - H = new_mob - job.apply_fingerprints(H) - - H << "You are the [rank]." - H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." - H << "To speak on your departments radio, use the :h button. To see others, look closely at your headset." - if(job.req_admin_notify) - H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." - - H.update_hud() // Tmp fix for Github issue 1006. TODO: make all procs in update_icons.dm do client.screen |= equipment no matter what. - return 1 - - -/datum/controller/occupations/proc/setup_officer_positions() - var/officer_positions = 5 //Number of open security officer positions at round start - - if(config.security_scaling_coeff > 0) - officer_positions = min(12, max(5, round(unassigned.len/config.security_scaling_coeff))) //Scale between 5 and 12 officers - var/datum/job/J = job_master.GetJob("Security Officer") - if(J || J.spawn_positions > 0) - Debug("Setting open security officer positions to [officer_positions]") - J.total_positions = officer_positions - J.spawn_positions = officer_positions - for(var/i=officer_positions-5, i>0, i--) //Spawn some extra eqipment lockers if we have more than 5 officers - if(secequipment.len) - var/spawnloc = secequipment[1] - new /obj/structure/closet/secure_closet/security(spawnloc) - secequipment -= spawnloc - else //We ran out of spare locker spawns! - break - -/datum/controller/occupations/proc/LoadJobs(jobsfile) //ran during round setup, reads info from jobs.txt -- Urist - if(!config.load_jobs_from_txt) - return 0 - - var/list/jobEntries = file2list(jobsfile) - - for(var/job in jobEntries) - if(!job) - continue - - job = trim(job) - if (!length(job)) - continue - - var/pos = findtext(job, "=") - var/name = null - var/value = null - - if(pos) - name = copytext(job, 1, pos) - value = copytext(job, pos + 1) - else - continue - - if(name && value) - var/datum/job/J = GetJob(name) - if(!J) continue - J.total_positions = text2num(value) - J.spawn_positions = text2num(value) - if(name == "AI" || name == "Cyborg")//I dont like this here but it will do for now - J.total_positions = 0 - - return 1 - - -/datum/controller/occupations/proc/HandleFeedbackGathering() - for(var/datum/job/job in occupations) - var/tmp_str = "|[job.title]|" - - var/level1 = 0 //high - var/level2 = 0 //medium - var/level3 = 0 //low - var/level4 = 0 //never - var/level5 = 0 //banned - var/level6 = 0 //account too young - for(var/mob/new_player/player in player_list) - if(!(player.ready && player.mind && !player.mind.assigned_role)) - continue //This player is not ready - if(jobban_isbanned(player, job.title)) - level5++ - continue - if(!job.player_old_enough(player.client)) - level6++ - continue - if(player.client.prefs.GetJobDepartment(job, 1) & job.flag) - level1++ - else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag) - level2++ - else if(player.client.prefs.GetJobDepartment(job, 3) & job.flag) - level3++ - else level4++ //not selected - - tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|-" - feedback_add_details("job_preferences",tmp_str) +var/datum/subsystem/job/SSjob + +/datum/subsystem/job + name = "Jobs" + priority = 5 + + var/list/occupations = list() //List of all jobs + var/list/unassigned = list() //Players who need jobs + var/list/job_debug = list() //Debug info + +/datum/subsystem/job/New() + NEW_SS_GLOBAL(SSjob) + + +/datum/subsystem/job/Initialize() + SetupOccupations() + LoadJobs("config/jobs.txt") + ..() + + +/datum/subsystem/job/proc/SetupOccupations(faction = "Station") + occupations = list() + var/list/all_jobs = typesof(/datum/job) + if(!all_jobs.len) + world << "Error setting up jobs, no job datums found" + return 0 + + for(var/J in all_jobs) + var/datum/job/job = new J() + if(!job) continue + if(job.faction != faction) continue + if(!job.config_check()) continue + occupations += job + + return 1 + + +/datum/subsystem/job/proc/Debug(text) + if(!Debug2) return 0 + job_debug.Add(text) + return 1 + + +/datum/subsystem/job/proc/GetJob(rank) + if(!rank) return null + for(var/datum/job/J in occupations) + if(!J) continue + if(J.title == rank) return J + return null + +/datum/subsystem/job/proc/AssignRole(mob/new_player/player, rank, latejoin=0) + Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]") + if(player && player.mind && rank) + var/datum/job/job = GetJob(rank) + if(!job) return 0 + if(jobban_isbanned(player, rank)) return 0 + if(!job.player_old_enough(player.client)) return 0 + var/position_limit = job.total_positions + if(!latejoin) + position_limit = job.spawn_positions + if((job.current_positions < position_limit) || position_limit == -1) + Debug("Player: [player] is now Rank: [rank], JCP:[job.current_positions], JPL:[position_limit]") + player.mind.assigned_role = rank + unassigned -= player + job.current_positions++ + return 1 + Debug("AR has failed, Player: [player], Rank: [rank]") + return 0 + + +/datum/subsystem/job/proc/FindOccupationCandidates(datum/job/job, level, flag) + Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]") + var/list/candidates = list() + for(var/mob/new_player/player in unassigned) + if(jobban_isbanned(player, job.title)) + Debug("FOC isbanned failed, Player: [player]") + continue + if(!job.player_old_enough(player.client)) + Debug("FOC player not old enough, Player: [player]") + continue + if(flag && (!player.client.prefs.be_special & flag)) + Debug("FOC flag failed, Player: [player], Flag: [flag], ") + continue + + if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human") + Debug("FOC non-human failed, Player: [player]") + continue + + if(player.client.prefs.GetJobDepartment(job, level) & job.flag) + Debug("FOC pass, Player: [player], Level:[level]") + candidates += player + return candidates + +/datum/subsystem/job/proc/GiveRandomJob(mob/new_player/player) + Debug("GRJ Giving random job, Player: [player]") + for(var/datum/job/job in shuffle(occupations)) + if(!job) + continue + + if(istype(job, GetJob("Assistant"))) // We don't want to give him assistant, that's boring! + continue + + if(job in command_positions) //If you want a command position, select it! + continue + + if(jobban_isbanned(player, job.title)) + Debug("GRJ isbanned failed, Player: [player], Job: [job.title]") + continue + + if(!job.player_old_enough(player.client)) + Debug("GRJ player not old enough, Player: [player]") + continue + + if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human") + Debug("GRJ non-human failed, Player: [player]") + continue + + + if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) + Debug("GRJ Random job given, Player: [player], Job: [job]") + AssignRole(player, job.title) + unassigned -= player + break + +/datum/subsystem/job/proc/ResetOccupations() + for(var/mob/new_player/player in player_list) + if((player) && (player.mind)) + player.mind.assigned_role = null + player.mind.special_role = null + SetupOccupations() + unassigned = list() + return + + +//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until +//it locates a head or runs out of levels to check +//This is basically to ensure that there's atleast a few heads in the round +/datum/subsystem/job/proc/FillHeadPosition() + for(var/level = 1 to 3) + for(var/command_position in command_positions) + var/datum/job/job = GetJob(command_position) + if(!job) continue + var/list/candidates = FindOccupationCandidates(job, level) + if(!candidates.len) continue + var/mob/new_player/candidate = pick(candidates) + if(AssignRole(candidate, command_position)) + return 1 + return 0 + + +//This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level +//This is also to ensure we get as many heads as possible +/datum/subsystem/job/proc/CheckHeadPositions(level) + for(var/command_position in command_positions) + var/datum/job/job = GetJob(command_position) + if(!job) continue + var/list/candidates = FindOccupationCandidates(job, level) + if(!candidates.len) continue + var/mob/new_player/candidate = pick(candidates) + AssignRole(candidate, command_position) + return + + +/datum/subsystem/job/proc/FillAIPosition() + var/ai_selected = 0 + var/datum/job/job = GetJob("AI") + if(!job) return 0 + if(ticker.mode.name == "AI malfunction") // malf. AIs are pre-selected before jobs + for (var/datum/mind/mAI in ticker.mode.malf_ai) + AssignRole(mAI.current, "AI") + ai_selected++ + if(ai_selected) return 1 + return 0 + + for(var/i = job.total_positions, i > 0, i--) + for(var/level = 1 to 3) + var/list/candidates = list() + candidates = FindOccupationCandidates(job, level) + if(candidates.len) + var/mob/new_player/candidate = pick(candidates) + if(AssignRole(candidate, "AI")) + ai_selected++ + break + if(ai_selected) return 1 + return 0 + + +/** Proc DivideOccupations + * fills var "assigned_role" for all ready players. + * This proc must not have any side effect besides of modifying "assigned_role". + **/ +/datum/subsystem/job/proc/DivideOccupations() + //Setup new player list and get the jobs list + Debug("Running DO") + SetupOccupations() + + //Holder for Triumvirate is stored in the ticker, this just processes it + if(ticker) + for(var/datum/job/ai/A in occupations) + if(ticker.triai) + A.spawn_positions = 3 + + //Get the players who are ready + for(var/mob/new_player/player in player_list) + if(player.ready && player.mind && !player.mind.assigned_role) + unassigned += player + + Debug("DO, Len: [unassigned.len]") + if(unassigned.len == 0) return 0 + + //Scale number of open security officer slots to population + setup_officer_positions() + + //Shuffle players and jobs + unassigned = shuffle(unassigned) + + HandleFeedbackGathering() + + //People who wants to be assistants, sure, go on. + Debug("DO, Running Assistant Check 1") + var/datum/job/assist = new /datum/job/assistant() + var/list/assistant_candidates = FindOccupationCandidates(assist, 3) + Debug("AC1, Candidates: [assistant_candidates.len]") + for(var/mob/new_player/player in assistant_candidates) + Debug("AC1 pass, Player: [player]") + AssignRole(player, "Assistant") + assistant_candidates -= player + Debug("DO, AC1 end") + + //Select one head + Debug("DO, Running Head Check") + FillHeadPosition() + Debug("DO, Head Check end") + + //Check for an AI + Debug("DO, Running AI Check") + FillAIPosition() + Debug("DO, AI Check end") + + //Other jobs are now checked + Debug("DO, Running Standard Check") + + + // New job giving system by Donkie + // This will cause lots of more loops, but since it's only done once it shouldn't really matter much at all. + // Hopefully this will add more randomness and fairness to job giving. + + // Loop through all levels from high to low + var/list/shuffledoccupations = shuffle(occupations) + for(var/level = 1 to 3) + //Check the head jobs first each level + CheckHeadPositions(level) + + // Loop through all unassigned players + for(var/mob/new_player/player in unassigned) + + // Loop through all jobs + for(var/datum/job/job in shuffledoccupations) // SHUFFLE ME BABY + if(!job) + continue + + if(jobban_isbanned(player, job.title)) + Debug("DO isbanned failed, Player: [player], Job:[job.title]") + continue + + if(!job.player_old_enough(player.client)) + Debug("DO player not old enough, Player: [player], Job:[job.title]") + continue + + if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human") + Debug("DO non-human failed, Player: [player], Job:[job.title]") + continue + + + // If the player wants that job on this level, then try give it to him. + if(player.client.prefs.GetJobDepartment(job, level) & job.flag) + + // If the job isn't filled + if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) + Debug("DO pass, Player: [player], Level:[level], Job:[job.title]") + AssignRole(player, job.title) + unassigned -= player + break + + // Hand out random jobs to the people who didn't get any in the last check + // Also makes sure that they got their preference correct + for(var/mob/new_player/player in unassigned) + if(jobban_isbanned(player, "Assistant")) + GiveRandomJob(player) //you get to roll for random before everyone else just to be sure you don't get assistant. you're so speshul + + for(var/mob/new_player/player in unassigned) + if(player.client.prefs.userandomjob) + GiveRandomJob(player) + + Debug("DO, Standard Check end") + + Debug("DO, Running AC2") + + // For those who wanted to be assistant if their preferences were filled, here you go. + for(var/mob/new_player/player in unassigned) + Debug("AC2 Assistant located, Player: [player]") + AssignRole(player, "Assistant") + return 1 + +//Gives the player the stuff he should have with his rank +/datum/subsystem/job/proc/EquipRank(mob/living/H, rank, joined_late=0) + var/datum/job/job = GetJob(rank) + + H.job = rank + + //If we joined at roundstart we should be positioned at our workstation + if(!joined_late) + var/obj/S = null + for(var/obj/effect/landmark/start/sloc in landmarks_list) + if(sloc.name != rank) continue + if(locate(/mob/living) in sloc.loc) continue + S = sloc + break + if(!S) + S = locate("start*[rank]") // use old stype + if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf)) + H.loc = S.loc + + if(H.mind) + H.mind.assigned_role = rank + + if(job) + var/new_mob = job.equip(H) + if(ismob(new_mob)) + H = new_mob + job.apply_fingerprints(H) + + H << "You are the [rank]." + H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." + H << "To speak on your departments radio, use the :h button. To see others, look closely at your headset." + if(job.req_admin_notify) + H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." + + H.update_hud() // Tmp fix for Github issue 1006. TODO: make all procs in update_icons.dm do client.screen |= equipment no matter what. + return 1 + + +/datum/subsystem/job/proc/setup_officer_positions() + var/officer_positions = 5 //Number of open security officer positions at round start + + if(config.security_scaling_coeff > 0) + officer_positions = min(12, max(5, round(unassigned.len/config.security_scaling_coeff))) //Scale between 5 and 12 officers + var/datum/job/J = SSjob.GetJob("Security Officer") + if(J || J.spawn_positions > 0) + Debug("Setting open security officer positions to [officer_positions]") + J.total_positions = officer_positions + J.spawn_positions = officer_positions + for(var/i=officer_positions-5, i>0, i--) //Spawn some extra eqipment lockers if we have more than 5 officers + if(secequipment.len) + var/spawnloc = secequipment[1] + new /obj/structure/closet/secure_closet/security(spawnloc) + secequipment -= spawnloc + else //We ran out of spare locker spawns! + break + +/datum/subsystem/job/proc/LoadJobs(jobsfile) //ran during round setup, reads info from jobs.txt -- Urist + if(!config.load_jobs_from_txt) + return 0 + + var/list/jobEntries = file2list(jobsfile) + + for(var/job in jobEntries) + if(!job) + continue + + job = trim(job) + if (!length(job)) + continue + + var/pos = findtext(job, "=") + var/name = null + var/value = null + + if(pos) + name = copytext(job, 1, pos) + value = copytext(job, pos + 1) + else + continue + + if(name && value) + var/datum/job/J = GetJob(name) + if(!J) continue + J.total_positions = text2num(value) + J.spawn_positions = text2num(value) + if(name == "AI" || name == "Cyborg")//I dont like this here but it will do for now + J.total_positions = 0 + + return 1 + + +/datum/subsystem/job/proc/HandleFeedbackGathering() + for(var/datum/job/job in occupations) + var/tmp_str = "|[job.title]|" + + var/level1 = 0 //high + var/level2 = 0 //medium + var/level3 = 0 //low + var/level4 = 0 //never + var/level5 = 0 //banned + var/level6 = 0 //account too young + for(var/mob/new_player/player in player_list) + if(!(player.ready && player.mind && !player.mind.assigned_role)) + continue //This player is not ready + if(jobban_isbanned(player, job.title)) + level5++ + continue + if(!job.player_old_enough(player.client)) + level6++ + continue + if(player.client.prefs.GetJobDepartment(job, 1) & job.flag) + level1++ + else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag) + level2++ + else if(player.client.prefs.GetJobDepartment(job, 3) & job.flag) + level3++ + else level4++ //not selected + + tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|-" + feedback_add_details("job_preferences",tmp_str) diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm new file mode 100644 index 00000000000..c6eeee7b78a --- /dev/null +++ b/code/controllers/subsystem/lighting.dm @@ -0,0 +1,130 @@ +var/datum/subsystem/lighting/SSlighting + +#define MC_AVERAGE(average, current) (0.8*(average) + 0.2*(current)) +#define LIGHTING_ICON 'icons/effects/ss13_dark_alpha6.dmi' +#define LIGHTING_LAYER 10 //Drawing layer for lighting overlays + +/datum/subsystem/lighting + name = "Lighting" + wait = 5 + priority = 1 + + var/list/lighting_images = list() //replaces lighting_states (use lighting_images.len) ~carn + var/list/lights = list() //list of all datum/light_source + var/lights_workload = 0 //stats on the largest number of lights (max lights.len) + var/list/changed_turfs = list() //list of all turfs which need moving to a new lighting subarea + var/changed_turfs_workload = 0 //stats on the largest number of turfs changed (max changed_turfs.len) + + +/datum/subsystem/lighting/New() + NEW_SS_GLOBAL(SSlighting) + + //cache lighting images + if(!lighting_images.len) + for(var/icon_state in icon_states(LIGHTING_ICON)) + lighting_images += image(LIGHTING_ICON, null, icon_state, LIGHTING_LAYER) + + return ..() + + +/datum/subsystem/lighting/stat_entry() + stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%) L:[round(lights_workload,1)]/T:[round(changed_turfs_workload,1)]") + + +//Workhorse of lighting. It cycles through each light to see which ones need their effects updating. It updates their +//effects and then processes every turf in the queue, moving the turfs to the corresponing lighting sub-area. +//All queue lists prune themselves, which will cause lights with no luminosity to be garbage collected (cheaper and safer +//than deleting them). +//By using queues we are ensuring we don't perform more updates than are necessary +/datum/subsystem/lighting/fire() + lights_workload = MC_AVERAGE(lights_workload, lights.len) + var/i=1 + for(var/thing in lights) + if(thing && !thing:check()) //yes, cry that I'm using the : operator, it's much faster looping like this. And this gets called a lot. Dealwithit. + ++i + continue + lights.Cut(i, i+1) + + changed_turfs_workload = MC_AVERAGE(changed_turfs_workload, changed_turfs.len) + for(var/thing in changed_turfs) + if(thing && thing:lighting_changed) + thing:shift_to_subarea() + changed_turfs.Cut() + + +//same as above except it attempts to shift ALL turfs in the world regardless of lighting_changed status +//Does not loop. Should be run prior to process() being called for the first time. +//Note: if we get additional z-levels at runtime (e.g. if the gateway thin ever gets finished) we can initialize specific +//z-levels with the z_level argument +/datum/subsystem/lighting/Initialize(timeofday, z_level) + var/i=1 + for(var/thing in lights) + if(thing && !thing:check()) + ++i + continue + lights.Cut(i, i+1) + + var/z_start = 1 + var/z_finish = world.maxz + if(1 <= z_level && z_level <= world.maxz) + z_level = round(z_level) + z_start = z_level + z_finish = z_level + + for(var/z=z_start, z<=z_finish, ++z) + for(var/x=1, x<=world.maxx, ++x) + for(var/y=1, y<=world.maxy, ++y) + var/turf/T = locate(x,y,z) + if(T) + T.shift_to_subarea() + + if(z_level) + //we need to loop through to clear only shifted turfs from the list. or we will cause errors + i=1 + for(var/thing in changed_turfs) + if(thing && thing:z < z_start && z_finish < thing:z) + ++i + continue + changed_turfs.Cut(i, i+1) + else + changed_turfs.Cut() + + ..() + +//Used to strip valid information from an existing instance and transfer it to the replacement. i.e. when a crash occurs +//It works by using spawn(-1) to transfer the data, if there is a runtime the data does not get transfered but the loop +//does not crash +/datum/subsystem/lighting/Recover() + if(!istype(SSlighting.changed_turfs)) + SSlighting.changed_turfs = list() + if(!istype(SSlighting.lights)) + SSlighting.lights = list() + + if(istype(SSlighting.lighting_images)) + lighting_images = SSlighting.lighting_images + + for(var/datum/light_source/L in SSlighting.lights) + spawn(-1) //so we don't crash the loop (inefficient) + L.check() + lights += L //If we didn't runtime then this will get transferred over + + for(var/turf/T in changed_turfs) + if(T.lighting_changed) + spawn(-1) + T.shift_to_subarea() + + var/msg = "## DEBUG: [time2text(world.timeofday)] [name] subsystem restarted. Reports:\n" + for(var/varname in SSlighting.vars) + switch(varname) + if("tag","bestF","type","parent_type","vars") continue + else + var/varval1 = SSlighting.vars[varname] + var/varval2 = vars[varname] + if(istype(varval1,/list)) + varval1 = "/list([length(varval1)])" + varval2 = "/list([length(varval2)])" + msg += "\t [varname] = [varval1] -> [varval2]\n" + world.log << msg + +#undef LIGHTING_ICON +#undef LIGHTING_LAYER \ No newline at end of file diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm new file mode 100644 index 00000000000..15976cf1b53 --- /dev/null +++ b/code/controllers/subsystem/machines.dm @@ -0,0 +1,31 @@ +var/datum/subsystem/machines/SSmachine + +/datum/subsystem/machines + name = "Machines" + priority = 9 + + var/list/processing = list() + + +/datum/subsystem/machines/Initialize() + fire() + ..() + + +/datum/subsystem/machines/New() + NEW_SS_GLOBAL(SSmachine) + + +/datum/subsystem/machines/stat_entry() + stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%)\t[processing.len]") + + +/datum/subsystem/machines/fire() + var/seconds = wait * 0.1 + for(var/thing in processing) + if(thing && (thing:process(seconds) != PROCESS_KILL)) + if(thing:use_power) + thing:auto_use_power() + continue + processing.Remove(thing) + diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm new file mode 100644 index 00000000000..bbf78e8db0b --- /dev/null +++ b/code/controllers/subsystem/mobs.dm @@ -0,0 +1,24 @@ +var/datum/subsystem/mobs/SSmob + +/datum/subsystem/mobs + name = "Mobs" + priority = 4 + + +/datum/subsystem/mobs/New() + NEW_SS_GLOBAL(SSmob) + + +/datum/subsystem/mobs/stat_entry() + stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%) [mob_list.len]") + + +/datum/subsystem/mobs/fire() + var/seconds = wait * 0.1 + var/i=1 + for(var/thing in mob_list) + if(thing) + thing:Life(seconds) + ++i + continue + mob_list.Cut(i, i+1) \ No newline at end of file diff --git a/code/controllers/subsystem/nanoUI.dm b/code/controllers/subsystem/nanoUI.dm new file mode 100644 index 00000000000..f9083f7e8ed --- /dev/null +++ b/code/controllers/subsystem/nanoUI.dm @@ -0,0 +1,30 @@ +var/datum/subsystem/nano/SSnano + +/datum/subsystem/nano + name = "NanoUI" + can_fire = 1 + wait = 5 + priority = 16 + + var/list/open_uis = list() //a list of current open /nanoui UIs, grouped by src_object and ui_key + var/list/processing_uis = list() //a list of current open /nanoui UIs, not grouped, for use in processing + + +/datum/subsystem/nano/New() + NEW_SS_GLOBAL(SSnano) + + +/datum/subsystem/nano/stat_entry() + stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%) [processing_uis.len]") + + +/datum/subsystem/nano/fire() + var/i=1 + for(var/thing in SSnano.processing_uis) + if(thing) + var/datum/nanoui/ui = thing + if(ui.src_object && ui.user) + ui.process() + ++i + continue + processing_uis.Cut(i, i+1) \ No newline at end of file diff --git a/code/controllers/subsystem/objects.dm b/code/controllers/subsystem/objects.dm new file mode 100644 index 00000000000..98c805080fb --- /dev/null +++ b/code/controllers/subsystem/objects.dm @@ -0,0 +1,42 @@ +var/datum/subsystem/objects/SSobj + +/datum/subsystem/objects + name = "Objects" + priority = 12 + + var/list/processing = list() + +/datum/subsystem/objects/New() + NEW_SS_GLOBAL(SSobj) + +/datum/subsystem/objects/Initialize() + for(var/atom/movable/AM in machines) + AM.initialize() + for(var/turf/simulated/floor/F in machines) + F.MakeDirty() + ..() + + +/datum/subsystem/objects/stat_entry() + stat(name, "[round(cost,0.001)]ds\t(CPU:[round(cpu,1)]%)\t[processing.len]") + + +/datum/subsystem/objects/fire() + var/i=1 + for(var/thing in SSobj.processing) + if(thing) + thing:process(wait) + ++i + continue + SSobj.processing.Cut(i, i+1) + + +/* This is FPSS13 code, has not yet been ported/implemented +/obj/New() + ..() + if(map_ready) + spawn(0) + if(garbage_collecting) + return + initialize() +*/ \ No newline at end of file diff --git a/code/controllers/subsystem/pipenets.dm b/code/controllers/subsystem/pipenets.dm new file mode 100644 index 00000000000..eb0c3fa5639 --- /dev/null +++ b/code/controllers/subsystem/pipenets.dm @@ -0,0 +1,36 @@ +var/datum/subsystem/pipenets/SSpipe + +/datum/subsystem/pipenets + name = "Pipenets" + priority = 11 + + var/list/networks = list() + +/datum/subsystem/pipenets/New() + NEW_SS_GLOBAL(SSpipe) + +/datum/subsystem/pipenets/Initialize() + set background = BACKGROUND_ENABLED + + //is it possible to combine all these procs into initialize() ?? + for(var/obj/machinery/atmospherics/M in world) + M.build_network() + + for(var/obj/machinery/atmospherics/unary/U in world) + if(istype(U, /obj/machinery/atmospherics/unary/vent_pump)) + var/obj/machinery/atmospherics/unary/vent_pump/V = U + V.broadcast_status() + else if(istype(U, /obj/machinery/atmospherics/unary/vent_scrubber)) + var/obj/machinery/atmospherics/unary/vent_scrubber/V = U + V.broadcast_status() + + ..() + +/datum/subsystem/pipenets/fire() + var/i=1 + for(var/thing in networks) + if(thing) + thing:process() + ++i + continue + networks.Cut(i, i+1) diff --git a/code/controllers/subsystem/power.dm b/code/controllers/subsystem/power.dm new file mode 100644 index 00000000000..e48a6f465e8 --- /dev/null +++ b/code/controllers/subsystem/power.dm @@ -0,0 +1,18 @@ +var/datum/subsystem/power/SSpower + +/datum/subsystem/power + name = "Power" + priority = 10 + + var/list/powernets = list() + +/datum/subsystem/power/New() + NEW_SS_GLOBAL(SSpower) + +/datum/subsystem/power/Initialize() + makepowernets() + ..() + +/datum/subsystem/power/fire() + for(var/datum/powernet/Powernet in powernets) + Powernet.reset() \ No newline at end of file diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm new file mode 100644 index 00000000000..84e117f3f64 --- /dev/null +++ b/code/controllers/subsystem/radio.dm @@ -0,0 +1,46 @@ +var/datum/subsystem/radio/radio_controller + +/datum/subsystem/radio + name = "Radio" + priority = 18 + + var/list/datum/radio_frequency/frequencies = list() + +/datum/subsystem/radio/New() + NEW_SS_GLOBAL(radio_controller) + +/datum/subsystem/radio/proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null) + var/f_text = num2text(new_frequency) + var/datum/radio_frequency/frequency = frequencies[f_text] + + if(!frequency) + frequency = new + frequency.frequency = new_frequency + frequencies[f_text] = frequency + + frequency.add_listener(device, filter) + return frequency + +/datum/subsystem/radio/proc/remove_object(obj/device, old_frequency) + var/f_text = num2text(old_frequency) + var/datum/radio_frequency/frequency = frequencies[f_text] + + if(frequency) + frequency.remove_listener(device) + + if(frequency.devices.len == 0) + del(frequency) + frequencies -= f_text + + return 1 + +/datum/subsystem/radio/proc/return_frequency(var/new_frequency as num) + var/f_text = num2text(new_frequency) + var/datum/radio_frequency/frequency = frequencies[f_text] + + if(!frequency) + frequency = new + frequency.frequency = new_frequency + frequencies[f_text] = frequency + + return frequency \ No newline at end of file diff --git a/code/controllers/subsystem/server_maintenance.dm b/code/controllers/subsystem/server_maintenance.dm new file mode 100644 index 00000000000..1aa7ef7d1cc --- /dev/null +++ b/code/controllers/subsystem/server_maintenance.dm @@ -0,0 +1,18 @@ +/datum/subsystem/server_maint + name = "Server Tasks" + wait = 6000 + priority = 19 + +/datum/subsystem/server_maint/fire() + //handle kicking inactive players + if(config.kick_inactive > 0) + for(var/client/C in clients) + if(C.is_afk(INACTIVITY_KICK)) + if(!istype(C.mob, /mob/dead)) + log_access("AFK: [key_name(C)]") + C << "You have been inactive for more than 10 minutes and have been disconnected." + del(C) + + if(config.sql_enabled) + sql_poll_players() + sql_poll_admins() diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm new file mode 100644 index 00000000000..1f94610f046 --- /dev/null +++ b/code/controllers/subsystem/shuttles.dm @@ -0,0 +1,325 @@ +var/datum/subsystem/shuttle/SSshuttle + +/datum/subsystem/shuttle + name = "Shuttles" + wait = 10 + priority = 3 + + var/list/mobile = list() + var/list/stationary = list() + var/list/transit = list() + + //emergency shuttle stuff + var/obj/docking_port/mobile/emergency/emergency + var/emergencyCallTime = 6000 //time taken for emergency shuttle to reach the station when called (in deciseconds) + var/emergencyDockTime = 1800 //time taken for emergency shuttle to leave again once it has docked (in deciseconds) + var/emergencyEscapeTime = 1200 //time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds) + var/area/emergencyLastCallLoc + var/emergencyAlwaysFakeRecall + var/emergencyFakeRecall + + //supply shuttle stuff + var/obj/docking_port/mobile/supply/supply + var/ordernum = 1 //order number given to next order + var/points = 50 //number of trade-points we have + var/points_per_decisecond = 0.005 //points gained every decisecond + var/points_per_slip = 2 //points gained per slip returned + var/points_per_crate = 5 //points gained per crate returned + var/points_per_intel = 100 //points gained per intel returned + var/points_per_plasma = 5 //points gained per plasma returned + var/centcom_message = "" //Remarks from Centcom on how well you checked the last order. + var/list/discoveredPlants = list() //Unique typepaths for unusual things we've already sent CentComm, associated with their potencies + var/list/shoppinglist = list() + var/list/requestlist = list() + var/list/supply_packs = list() + var/datum/round_event/shuttle_loan/shuttle_loan + var/sold_atoms = "" + + +/datum/subsystem/shuttle/New() + NEW_SS_GLOBAL(SSshuttle) + + +/datum/subsystem/shuttle/Initialize() + if(!emergency) + WARNING("No /obj/docking_port/mobile/emergency placed on the map!") + if(!supply) + WARNING("No /obj/docking_port/mobile/supply placed on the map!") + + ordernum = rand(1,9000) + + for(var/typepath in typesof(/datum/supply_packs)) + if(typepath == /datum/supply_packs) + continue + var/datum/supply_packs/P = new typepath() + if(P.name == "HEADER") continue // To filter out group headers + supply_packs["[P.type]"] = P + + ..() + + +/datum/subsystem/shuttle/fire() + points += points_per_decisecond * wait + + var/i=1 + for(var/thing in mobile) + if(thing) + var/obj/docking_port/mobile/P = thing + P.check() + ++i + continue + mobile.Cut(i, i+1) + +/datum/subsystem/shuttle/proc/getShuttle(id) + for(var/obj/docking_port/mobile/M in mobile) + if(M.id == id) + return M + WARNING("couldn't find shuttle with id: [id]") + +/datum/subsystem/shuttle/proc/getDock(id) + for(var/obj/docking_port/stationary/S in stationary) + if(S.id == id) + return S + WARNING("couldn't find dock with id: [id]") + +/datum/subsystem/shuttle/proc/requestEvac(mob/user, call_reason) + if(!emergency) + ERROR("There is no emergency shuttle! The game will be unresolvable. This is likely due to a mapping error") + return + + if(world.time - round_start_time < config.shuttle_refuel_delay) + user << "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again." + return + + switch(emergency.mode) + if(SHUTTLE_RECALL) + user << "The emergency shuttle may not be called while returning to Centcom." + return + if(SHUTTLE_CALL) + user << "The emergency shuttle is already on its way." + return + if(SHUTTLE_DOCKED) + user << "The emergency shuttle is already here." + return + if(SHUTTLE_ESCAPE) + user << "The emergency shuttle is moving away to a safe distance." + return + + call_reason = strip_html_properly(trim(call_reason)) + + if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) + user << "You must provide a reason." + return + + var/area/signal_origin = get_area(user) + var/emergency_reason = "\nNature of emergency:\n\n[call_reason]" + if(seclevel2num(get_security_level()) == SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. + emergency.request(null, 0.5, signal_origin, emergency_reason, 1) + else + emergency.request(null, 1, signal_origin, emergency_reason, 0) + + log_game("[key_name(user)] has called the shuttle.") + message_admins("[key_name_admin(user)] has called the shuttle.") + + return + +/datum/subsystem/shuttle/proc/cancelEvac(mob/user) + if(emergency.mode != SHUTTLE_CALL) + return + + if(ticker.mode.name == "meteor") + return + + if((seclevel2num(get_security_level()) == SEC_LEVEL_RED)) + if(emergency.timeLeft(1) < emergencyCallTime * 0.25) + return + else if(emergency.timeLeft(1) < emergencyCallTime * 0.5) + return + + emergency.cancel(get_area(user)) + log_game("[key_name(user)] has recalled the shuttle.") + message_admins("[key_name_admin(user)] has recalled the shuttle.") + return 1 + +/datum/subsystem/shuttle/proc/autoEvac() + var/callShuttle = 1 + + for(var/thing in shuttle_caller_list) + if(istype(thing, /mob/living/silicon/ai)) + var/mob/living/silicon/ai/AI = thing + if(AI.stat || !AI.client) + continue + else if(istype(thing, /obj/machinery/computer/communications)) + var/obj/machinery/computer/communications/C = thing + if(C.stat & BROKEN) + continue + + var/turf/T = get_turf(thing) + if(T && T.z == 1) + callShuttle = 0 + break + + if(callShuttle) + if(emergency.mode < SHUTTLE_DOCKED) + emergency.request(null, 2.5) + log_game("There is no means of calling the shuttle anymore. Shuttle automatically called.") + message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.") + +//try to move/request to dockHome if possible, otherwise dockAway. Mainly used for admin buttons +/datum/subsystem/shuttle/proc/toggleShuttle(shuttleId, dockHome, dockAway, timed) + var/obj/docking_port/mobile/M = getShuttle(shuttleId) + if(!M) + return 1 + var/obj/docking_port/stationary/dockedAt = M.get_docked() + var/destination = dockHome + if(dockedAt && dockedAt.id == dockHome) + destination = dockAway + if(timed) + if(M.request(getDock(destination))) + return 2 + else + if(M.dock(getDock(destination))) + return 2 + return 0 //dock successful + + +/datum/subsystem/shuttle/proc/moveShuttle(shuttleId, dockId, timed) + var/obj/docking_port/mobile/M = getShuttle(shuttleId) + if(!M) + return 1 + if(timed) + if(M.request(getDock(dockId))) + return 2 + else + if(M.dock(getDock(dockId))) + return 2 + return 0 //dock successful + + +/* +/proc/push_mob_back(var/mob/living/L, var/dir) + if(iscarbon(L) && isturf(L.loc)) + if(prob(88)) + var/turf/T = get_step(L, dir) + if(T) + for(var/obj/O in T) // For doors and such (kinda ugly but we can't have people opening doors) + if(!O.CanPass(L, L.loc, 1)) + return + L.Move(get_step(L, dir), dir) +*/ + +/datum/supply_order + var/ordernum + var/datum/supply_packs/object = null + var/orderedby = null + var/orderedbyRank + var/comment = null + +/datum/supply_order/proc/generateRequisition(atom/_loc) + if(!object) + return + + var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc) + reqform.name = "requisition form - [object.name]" + reqform.info += "
[station_name] Supply Requisition Form
" + reqform.info += "INDEX: #[ordernum]
" + reqform.info += "REQUESTED BY: [orderedby]
" + reqform.info += "RANK: [orderedbyRank]
" + reqform.info += "REASON: [comment]
" + reqform.info += "SUPPLY CRATE TYPE: [object.name]
" + reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(object.access))]
" + reqform.info += "CONTENTS:
" + reqform.info += object.manifest + reqform.info += "
" + reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" + + reqform.update_icon() //Fix for appearing blank when printed. + + return reqform + +/datum/supply_order/proc/createObject(atom/_loc, errors=0) + if(!object) + return + + //create the crate + var/atom/Crate = new object.containertype(_loc) + Crate.name = "[object.containername] [comment ? "([comment])":"" ]" + if(object.access) + Crate:req_access = list(text2num(object.access)) + + //create the manifest slip + var/obj/item/weapon/paper/manifest/slip = new /obj/item/weapon/paper/manifest() + slip.erroneous = errors + slip.points = object.cost + slip.ordernumber = ordernum + + var/stationName = (errors & MANIFEST_ERROR_NAME) ? new_station_name() : station_name() + var/packagesAmt = SSshuttle.shoppinglist.len + ((errors & MANIFEST_ERROR_COUNT) ? 0 : rand(1,2)) + + slip.info = "
[command_name()] Shipping Manifest
" + slip.info +="Order #[ordernum]
" + slip.info +="Destination: [stationName]
" + slip.info +="[packagesAmt] PACKAGES IN THIS SHIPMENT
" + slip.info +="CONTENTS:
- "
+
+ //we now create the actual contents
+ var/list/contains
+ if(istype(object, /datum/supply_packs/misc/randomised))
+ var/datum/supply_packs/misc/randomised/SO = object
+ contains = list()
+ if(object.contains.len)
+ for(var/j=1, j<=SO.num_contained, j++)
+ contains += pick(object.contains)
+ else
+ contains = object.contains
+
+ for(var/typepath in contains)
+ if(!typepath) continue
+ var/atom/A = new typepath(Crate)
+ if(object.amount && A.vars.Find("amount") && A:amount)
+ A:amount = object.amount
+ slip.info += "
- [A.name] " //add the item to the manifest (even if it was misplaced) + + if((errors & MANIFEST_ERROR_ITEM)) + //secure and large crates cannot lose items + if(findtext("[object.containertype]", "/secure/") || findtext("[object.containertype]","/largecrate/")) + errors &= ~MANIFEST_ERROR_ITEM + else + var/lostAmt = max(round(Crate.contents.len/10), 1) + //lose some of the items + while(--lostAmt >= 0) + qdel(pick(Crate.contents)) + + //manifest finalisation + slip.info += "
" + slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS
" // And now this is actually meaningful. + slip.loc = Crate + + return Crate + +/datum/subsystem/shuttle/proc/generateSupplyOrder(packId, _orderedby, _orderedbyRank, _comment) + if(!packId) + return + var/datum/supply_packs/P = supply_packs["[packId]"] + if(!P) + return + + var/datum/supply_order/O = new() + O.ordernum = ordernum++ + O.object = P + O.orderedby = _orderedby + O.orderedbyRank = _orderedbyRank + O.comment = _comment + + shoppinglist += O + + return O + +/* +/datum/subsystem/shuttle/proc/getShuttleFromArea(area/A) + if(!A) + return + for(var/obj/docking_port/mobile/M in SSshuttle.mobile) + if(M.areaInstance == A) + return M +*/ \ No newline at end of file diff --git a/code/controllers/subsystem/shuttles/emergency.dm b/code/controllers/subsystem/shuttles/emergency.dm new file mode 100644 index 00000000000..b629b92d222 --- /dev/null +++ b/code/controllers/subsystem/shuttles/emergency.dm @@ -0,0 +1,141 @@ +/obj/docking_port/mobile/emergency + name = "emergency shuttle" + id = "emergency" + + dwidth = 9 + width = 22 + height = 11 + dir = 4 + travelDir = -90 + +/obj/docking_port/mobile/emergency/New() + ..() + SSshuttle.emergency = src + +/obj/docking_port/mobile/emergency/timeLeft(divisor) + if(divisor <= 0) + divisor = 10 + if(!timer) + return round(SSshuttle.emergencyCallTime/divisor, 1) + + var/dtime = world.time - timer + switch(mode) + if(SHUTTLE_ESCAPE) + dtime = max(SSshuttle.emergencyEscapeTime - dtime, 0) + if(SHUTTLE_DOCKED) + dtime = max(SSshuttle.emergencyDockTime - dtime, 0) + else + dtime = max(SSshuttle.emergencyCallTime - dtime, 0) + return round(dtime/divisor, 1) + +/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, coefficient=1, area/signalOrigin, reason, redAlert) + SSshuttle.emergencyCallTime = initial(SSshuttle.emergencyCallTime) * coefficient + switch(mode) + if(SHUTTLE_RECALL) + mode = SHUTTLE_CALL + timer = world.time - timeLeft(1) + if(SHUTTLE_IDLE) + mode = SHUTTLE_CALL + timer = world.time + if(SHUTTLE_CALL) + if(world.time < timer) //this is just failsafe + timer = world.time + else + return + + SSshuttle.emergencyLastCallLoc = signalOrigin + + priority_announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][SSshuttle.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communcations console." : "" ]", null, 'sound/AI/shuttlecalled.ogg', "Priority") + + if(SSshuttle.emergencyAlwaysFakeRecall) + if((seclevel2num(get_security_level()) == SEC_LEVEL_RED)) + SSshuttle.emergencyFakeRecall = rand(0.2, 0.5) + else + SSshuttle.emergencyFakeRecall = rand(0.5, 0.8) + + +/obj/docking_port/mobile/emergency/cancel(area/signalOrigin) + if(mode != SHUTTLE_CALL) + return + + timer = world.time - timeLeft(1) + mode = SHUTTLE_RECALL + + if(prob(70)) + SSshuttle.emergencyLastCallLoc = signalOrigin + priority_announce("The emergency shuttle has been recalled.[SSshuttle.emergencyLastCallLoc ? " Recall signal traced. Results can be viewed on any communcations console." : "" ]", null, 'sound/AI/shuttlerecalled.ogg', "Priority") + +/* +/obj/docking_port/mobile/emergency/findTransitDock() + . = SSshuttle.getDock("emergency_transit") + if(.) return . + return ..() +*/ + + +/obj/docking_port/mobile/emergency/check() + if(!timer) + return + + var/time_left = timeLeft(1) + switch(mode) + if(SHUTTLE_RECALL) + if(time_left <= 0) + mode = SHUTTLE_IDLE + timer = 0 + if(SHUTTLE_CALL) + if(time_left < SSshuttle.emergencyFakeRecall * SSshuttle.emergencyCallTime) //recall due to fake recalls + cancel() + SSshuttle.emergencyFakeRecall = 0 + else if(time_left <= 0) + //move emergency shuttle to station + if(dock(SSshuttle.getDock("emergency_home"))) + setTimer(20) + return + mode = SHUTTLE_DOCKED + timer = world.time + if(SHUTTLE_DOCKED) + if(time_left <= 0) + //move each escape pod to its corresponding transit dock + for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) + M.enterTransit() + //now move the actual emergency shuttle to its transit dock + enterTransit() + mode = SHUTTLE_ESCAPE + timer = world.time + if(SHUTTLE_ESCAPE) + if(time_left <= 0) + //move each escape pod to its corresponding escape dock + for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) + M.dock(SSshuttle.getDock("[M.id]_away")) + //now move the actual emergency shuttle to centcomm + dock(SSshuttle.getDock("emergency_away")) + mode = SHUTTLE_ENDGAME + timer = 0 + + +/obj/docking_port/mobile/pod + name = "escape pod" + id = "pod" + + dwidth = 1 + width = 3 + height = 4 + + New() + if(id == "pod") + WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.") + ..() + + request() + return + + cancel() + return + +/* + findTransitDock() + . = SSshuttle.getDock("[id]_transit") + if(.) return . + return ..() +*/ \ No newline at end of file diff --git a/code/controllers/subsystem/shuttles/supply.dm b/code/controllers/subsystem/shuttles/supply.dm new file mode 100644 index 00000000000..9986e892808 --- /dev/null +++ b/code/controllers/subsystem/shuttles/supply.dm @@ -0,0 +1,541 @@ +/obj/item/weapon/paper/manifest + name = "supply manifest" + var/erroneous = 0 + var/points = 0 + var/ordernumber = 0 + +/obj/docking_port/mobile/supply + name = "supply shuttle" + id = "supply" + callTime = 1200 + + dir = 8 + travelDir = 90 + width = 12 + dwidth = 5 + height = 7 + +/obj/docking_port/mobile/supply/New() + ..() + SSshuttle.supply = src + +/obj/docking_port/mobile/supply/canMove() + if(z == ZLEVEL_STATION) + return forbidden_atoms_check(areaInstance) + return ..() + +/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S) + if(mode != SHUTTLE_IDLE) + return 2 + return ..() + +/obj/docking_port/mobile/supply/dock() + . = ..() + if(.) return . + + buy() + sell() + +/obj/docking_port/mobile/supply/proc/buy() + if(z != ZLEVEL_STATION) //we only buy when we are -at- the station + return 1 + + if(!SSshuttle.shoppinglist.len) + return 2 + + var/list/emptyTurfs = list() + for(var/turf/simulated/shuttle/T in areaInstance) + if(T.density || T.contents.len) continue + emptyTurfs += T + + for(var/datum/supply_order/SO in SSshuttle.shoppinglist) + if(!SO.object) continue + + var/turf/T = pick_n_take(emptyTurfs) //turf we will place it in + if(!T) + SSshuttle.shoppinglist.Cut(1, SSshuttle.shoppinglist.Find(SO)) + return + + var/errors = 0 + if(prob(5)) + errors |= MANIFEST_ERROR_COUNT + if(prob(5)) + errors |= MANIFEST_ERROR_NAME + if(prob(5)) + errors |= MANIFEST_ERROR_ITEM + SO.createObject(T, errors) + + SSshuttle.shoppinglist.Cut() + + +/obj/docking_port/mobile/supply/proc/sell() + if(z != ZLEVEL_CENTCOM) //we only sell when we are -at- centcomm + return 1 + + var/plasma_count = 0 + var/intel_count = 0 + var/crate_count = 0 + + var/msg = "" + var/pointsEarned + + for(var/atom/movable/MA in areaInstance) + SSshuttle.sold_atoms += " [MA.name]" + if(MA.anchored) continue + + // Must be in a crate (or a critter crate)! + if(istype(MA,/obj/structure/closet/crate) || istype(MA,/obj/structure/closet/critter)) + SSshuttle.sold_atoms += ":" + ++crate_count + + var/find_slip = 1 + for(var/thing in MA) + // Sell manifests + SSshuttle.sold_atoms += " [thing:name]" + if(find_slip && istype(thing,/obj/item/weapon/paper/manifest)) + var/obj/item/weapon/paper/manifest/slip = thing + // TODO: Check for a signature, too. + if(slip.stamped && slip.stamped.len) //yes, the clown stamp will work. clown is the highest authority on the station, it makes sense + // Did they mark it as erroneous? + var/denied = 0 + for(var/i=1,i<=slip.stamped.len,i++) + if(slip.stamped[i] == /obj/item/weapon/stamp/denied) + denied = 1 + if(slip.erroneous && denied) // Caught a mistake by Centcom (IDEA: maybe Centcom rarely gets offended by this) + pointsEarned = slip.points - SSshuttle.points_per_crate + SSshuttle.points += pointsEarned // For now, give a full refund for paying attention (minus the crate cost) + msg += "+[pointsEarned]: Station correctly denied package [slip.ordernumber]: " + if(slip.erroneous & MANIFEST_ERROR_NAME) + msg += "Destination station incorrect. " + else if(slip.erroneous & MANIFEST_ERROR_COUNT) + msg += "Packages incorrectly counted. " + else if(slip.erroneous & MANIFEST_ERROR_ITEM) + msg += "Package incomplete. " + msg += "Points refunded.
" + else if(!slip.erroneous && !denied) // Approving a proper order awards the relatively tiny points_per_slip + SSshuttle.points += SSshuttle.points_per_slip + msg += "+[SSshuttle.points_per_slip]: Package [slip.ordernumber] accorded.
" + else // You done goofed. + if(slip.erroneous) + msg += "+0: Station approved package [slip.ordernumber] despite error: " + if(slip.erroneous & MANIFEST_ERROR_NAME) + msg += "Destination station incorrect." + else if(slip.erroneous & MANIFEST_ERROR_COUNT) + msg += "Packages incorrectly counted." + else if(slip.erroneous & MANIFEST_ERROR_ITEM) + msg += "We found unshipped items on our dock." + msg += " Be more vigilant.
" + else + pointsEarned = round(SSshuttle.points_per_crate - slip.points) + SSshuttle.points += pointsEarned + msg += "[pointsEarned]: Station denied package [slip.ordernumber]. Our records show no fault on our part.
" + find_slip = 0 + continue + + // Sell plasma + if(istype(thing, /obj/item/stack/sheet/mineral/plasma)) + var/obj/item/stack/sheet/mineral/plasma/P = thing + plasma_count += P.amount + + // Sell syndicate intel + if(istype(thing, /obj/item/documents/syndicate)) + ++intel_count + + if(istype(thing, /obj/item/seeds)) + var/obj/item/seeds/S = thing + if(S.rarity == 0) // Mundane species + msg += "+0: We don't need samples of mundane species \"[capitalize(S.species)]\".
" + else if(SSshuttle.discoveredPlants[S.type]) // This species has already been sent to CentComm + var/potDiff = S.potency - SSshuttle.discoveredPlants[S.type] // Compare it to the previous best + if(potDiff > 0) // This sample is better + SSshuttle.discoveredPlants[S.type] = S.potency + msg += "+[potDiff]: New sample of \"[capitalize(S.species)]\" is superior. Good work.
" + SSshuttle.points += potDiff + else // This sample is worthless + msg += "+0: New sample of \"[capitalize(S.species)]\" is not more potent than existing sample ([SSshuttle.discoveredPlants[S.type]] potency).
" + else // This is a new discovery! + SSshuttle.discoveredPlants[S.type] = S.potency + msg += "+[S.rarity]: New species discovered: \"[capitalize(S.species)]\". Excellent work.
" + SSshuttle.points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later + qdel(MA) + SSshuttle.sold_atoms += "." + + if(plasma_count > 0) + pointsEarned = round(plasma_count * SSshuttle.points_per_plasma) + msg += "+[pointsEarned]: Received [plasma_count] unit(s) of exotic material.
" + SSshuttle.points += pointsEarned + + if(intel_count > 0) + pointsEarned = round(intel_count * SSshuttle.points_per_intel) + msg += "+[pointsEarned]: Received [intel_count] article(s) of enemy intelligence.
" + SSshuttle.points += pointsEarned + + if(crate_count > 0) + pointsEarned = round(crate_count * SSshuttle.points_per_crate) + msg += "+[pointsEarned]: Received [crate_count] crate(s).
" + SSshuttle.points += pointsEarned + + SSshuttle.centcom_message = msg + + +/proc/forbidden_atoms_check(atom/A) + if(A) + if(istype(A,/mob/living)) + return 1 + if(istype(A,/obj)) + if(istype(A,/obj/effect/blob)) + return 1 + if(istype(A,/obj/effect/spider/spiderling)) + return 1 + if(istype(A,/obj/item/weapon/disk/nuclear)) + return 1 + if(istype(A,/obj/machinery/nuclearbomb)) + return 1 + if(istype(A,/obj/item/device/radio/beacon)) + return 1 + + for(var/thing in A) + if(.(thing)) + return 1 + + return 0 + + + + +/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob) + if(..()) + return + user.set_machine(src) + var/dat + if(temp) + dat = temp + else + dat += {"
Shuttle Location: [SSshuttle.supply.name]
+
Supply Points: [SSshuttle.points]
+
+ +
Supply Points: [SSshuttle.points]
\nRequest items
+ View approved orders
+ View requests
+ Close"} + + // Removing the old window method but leaving it here for reference + //user << browse(dat, "window=computer;size=575x450") + //onclose(user, "computer") + + // Added the new browser window method + var/datum/browser/popup = new(user, "computer", "Supply Ordering Console", 575, 450) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/ordercomp/Topic(href, href_list) + if(..()) + return + + if( isturf(loc) && (in_range(src, usr) || istype(usr, /mob/living/silicon)) ) + usr.set_machine(src) + + if(href_list["order"]) + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "
" + temp += "Select a category
" + for(var/cat in all_supply_groups ) + temp += "[get_supply_group_name(cat)]
" + else + last_viewed_group = href_list["order"] + var/cat = text2num(last_viewed_group) + temp = "
" + temp += "Request from: [get_supply_group_name(cat)]
" + for(var/supply_type in SSshuttle.supply_packs ) + var/datum/supply_packs/N = SSshuttle.supply_packs[supply_type] + if(N.hidden || N.contraband || N.group != cat) continue //Have to send the type instead of a reference to + temp += "[N.name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + else if (href_list["doorder"]) + if(world.time < reqtime) + say("[world.time - reqtime] seconds remaining until another requisition form may be printed.") + return + + //Find the correct supply_pack datum + if(!SSshuttle.supply_packs[href_list["doorder"]]) return + + var/timeout = world.time + 600 + var/reason = stripped_input(usr,"Reason:","Why do you require this item?","") + if(world.time > timeout) return + if(!reason) return + + var/idname = "*None Provided*" + var/idrank = "*None Provided*" + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + idname = H.get_authentification_name() + idrank = H.get_assignment() + else if(issilicon(usr)) + idname = usr.real_name + + var/datum/supply_order/O = SSshuttle.generateSupplyOrder(href_list["doorder"], idname, idrank, reason) + if(!O) return + O.generateRequisition(loc) + + reqtime = (world.time + 5) % 1e5 + + temp = "Thanks for your request. The cargo team will process it as soon as possible.
" + temp += "
Back Main Menu" + + else if (href_list["vieworders"]) + temp = "Main Menu
Current approved orders:
" + for(var/datum/supply_order/SO in SSshuttle.shoppinglist) + temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]
" + temp += "
Main Menu" + + else if (href_list["viewrequests"]) + temp = "Current requests:
" + for(var/datum/supply_order/SO in SSshuttle.requestlist) + temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]
" + temp += "
Main Menu" + + else if (href_list["mainmenu"]) + temp = null + + add_fingerprint(usr) + updateUsrDialog() + return + +/obj/machinery/computer/ordercomp/say_quote(text) + return "flashes, \"[text]\"" + + +/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) + if(!allowed(user)) + user << "Access Denied." + return + + if(..()) + return + user.set_machine(src) + post_signal("supply") + var/dat + if (temp) + dat = temp + else + var/atDepot = (SSshuttle.supply.getDockedId() == "supply_away") + var/inTransit = (SSshuttle.supply.mode != SHUTTLE_IDLE) + var/canOrder = atDepot && !inTransit + + dat += {"
Supply shuttle
+ Location: [SSshuttle.supply.getStatusText()]
+
\nSupply Points: [SSshuttle.points]
\n
+ Location: [SSshuttle.supply.getStatusText()]
+
\nSupply Points: [SSshuttle.points]
\n
+ [canOrder ? "\nOrder items
\n
" : "\n*Must be away to order items*
\n
"] + [inTransit ? "\n*Shuttle already called*
\n
": atDepot ? "\nSend to station
\n
":"\nSend to centcom
\n
"] + [SSshuttle.shuttle_loan ? (SSshuttle.shuttle_loan.dispatched ? "\n*Shuttle loaned to Centcom*
\n
" : "\nLoan shuttle to Centcom (5 mins duration)
\n
") : "\n*No pending external shuttle requests*
\n
"] + \nView requests
\n
+ \nView orders
\n
+ \nClose
+
\nCentral Command messages:
[SSshuttle.centcom_message ? SSshuttle.centcom_message : "Remember to stamp and send back the supply manifests."]"} + + var/datum/browser/popup = new(user, "computer", "Supply Shuttle Console", 700, 455) + popup.set_content(dat) + popup.open() + return + +/obj/machinery/computer/supplycomp/emag_act(mob/user) + if(!hacked) + user << "Special supplies unlocked." + hacked = 1 + +/obj/machinery/computer/supplycomp/Topic(href, href_list) + if(..()) + return + + if(isturf(loc) && ( in_range(src, usr) || istype(usr, /mob/living/silicon) ) ) + usr.set_machine(src) + + //Calling the shuttle + if(href_list["send"]) + if(SSshuttle.supply.canMove()) + if(SSshuttle.shuttle_loan) + temp = "The supply shuttle must be docked to send new commands.
Main Menu" + else + temp = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.
Main Menu" + + else if(SSshuttle.supply.getDockedId() == "supply_home") + if(href_list["loan"] && SSshuttle.shuttle_loan) + if(!SSshuttle.shuttle_loan.dispatched) + SSshuttle.shuttle_loan.loan_shuttle() + temp = "The supply shuttle has been loaned to Centcom.
Main Menu" + post_signal("supply") + else + temp = "You can not loan the supply shuttle at this time.
Main Menu" + else + temp = "The supply shuttle has departed.
Main Menu" + SSshuttle.toggleShuttle("supply", "supply_home", "supply_away", 1) + investigate_log("[usr.key] has sent the supply shuttle away. Remaining points: [SSshuttle.points]. Shuttle contents:[SSshuttle.sold_atoms].", "cargo") + else + if(href_list["loan"] && SSshuttle.shuttle_loan) + if(!SSshuttle.shuttle_loan.dispatched) + SSshuttle.shuttle_loan.loan_shuttle() + temp = "The supply shuttle has been loaned to Centcom.
Main Menu" + post_signal("supply") + else + temp = "You can not loan the supply shuttle at this time.
Main Menu" + else + if(!SSshuttle.supply.request(SSshuttle.getDock("supply_home"))) + temp = "The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.
Main Menu" + post_signal("supply") + + else if (href_list["order"]) + if(SSshuttle.supply.mode != SHUTTLE_IDLE) return + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "
" + temp += "Select a category
" + for(var/cat in all_supply_groups ) + temp += "[get_supply_group_name(cat)]
" + else + last_viewed_group = href_list["order"] + var/cat = text2num(last_viewed_group) + temp = "
" + temp += "Request from: [get_supply_group_name(cat)]
" + for(var/supply_type in SSshuttle.supply_packs ) + var/datum/supply_packs/N = SSshuttle.supply_packs[supply_type] + if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) + continue //Have to send the type instead of a reference to + temp += "[N.name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + + /*temp = "Supply points: [supply_shuttle.points]
Request what?
" + + for(var/supply_name in supply_shuttle.supply_packs ) + var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] + if(N.hidden && !hacked) continue + if(N.contraband && !can_order_contraband) continue + temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + temp += "
OK"*/ + + else if (href_list["doorder"]) + if(world.time < reqtime) + say("[world.time - reqtime] seconds remaining until another requisition form may be printed.") + return + + //Find the correct supply_pack datum + if(!SSshuttle.supply_packs[href_list["doorder"]]) + return + + var/timeout = world.time + 600 + var/reason = stripped_input(usr,"Reason:","Why do you require this item?","") + if(world.time > timeout) return +// if(!reason) return + + var/idname = "*None Provided*" + var/idrank = "*None Provided*" + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + idname = H.get_authentification_name() + idrank = H.get_assignment() + else if(issilicon(usr)) + idname = usr.real_name + + var/datum/supply_order/O = SSshuttle.generateSupplyOrder(href_list["doorder"], idname, idrank, reason) + if(!O) return + O.generateRequisition(loc) + + reqtime = (world.time + 5) % 1e5 + + temp = "Order request placed.
" + temp += "
Back | Main Menu | Authorize Order" + + else if(href_list["confirmorder"]) + //Find the correct supply_order datum + var/ordernum = text2num(href_list["confirmorder"]) + var/datum/supply_order/O + var/datum/supply_packs/P + temp = "Invalid Request" + for(var/i=1, i<=SSshuttle.requestlist.len, i++) + var/datum/supply_order/SO = SSshuttle.requestlist[i] + if(SO && SO.ordernum == ordernum) + O = SO + P = O.object + if(SSshuttle.points >= P.cost) + SSshuttle.requestlist.Cut(i,i+1) + SSshuttle.points -= P.cost + SSshuttle.shoppinglist += O + temp = "Thanks for your order." + investigate_log("[usr.key] has authorized an order for [P.name]. Remaining points: [SSshuttle.points].", "cargo") + else + temp = "Not enough supply points." + break + temp += "
Back Main Menu" + + else if (href_list["vieworders"]) + temp = "Main Menu
Current approved orders:
" + for(var/datum/supply_order/SO in SSshuttle.shoppinglist) + temp += "#[SO.ordernum] - [SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]
"// (Cancel)
" + temp += "
Main Menu" +/* + else if (href_list["cancelorder"]) + var/datum/supply_order/remove_supply = href_list["cancelorder"] + supply_shuttle_shoppinglist -= remove_supply + supply_shuttle_points += remove_supply.object.cost + temp += "Canceled: [remove_supply.object.name]
" + + for(var/S in supply_shuttle_shoppinglist) + var/datum/supply_order/SO = S + temp += "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""] (Cancel)
" + temp += "
Main Menu" +*/ + else if (href_list["viewrequests"]) + temp = "Current requests:
" + for(var/datum/supply_order/SO in SSshuttle.requestlist) + temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] [SSshuttle.supply.mode != SHUTTLE_IDLE ? "":SSshuttle.supply.getDockedId() == "supply_away" ? "":"Approve Remove"]
" + + temp += "
Clear list" + temp += "
Main Menu" + + else if (href_list["rreq"]) + var/ordernum = text2num(href_list["rreq"]) + temp = "Invalid Request.
" + for(var/i=1, i<=SSshuttle.requestlist.len, i++) + var/datum/supply_order/SO = SSshuttle.requestlist[i] + if(SO && SO.ordernum == ordernum) + SSshuttle.requestlist.Cut(i,i+1) + temp = "Request removed.
" + break + temp += "
Back Main Menu" + + else if (href_list["clearreq"]) + SSshuttle.requestlist.Cut() + temp = "List cleared.
" + temp += "
Main Menu" + + else if (href_list["mainmenu"]) + temp = null + + add_fingerprint(usr) + updateUsrDialog() + return + +/obj/machinery/computer/supplycomp/proc/post_signal(var/command) + + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + + if(!frequency) return + + var/datum/signal/status_signal = new + status_signal.source = src + status_signal.transmission_method = 1 + status_signal.data["command"] = command + + frequency.post_signal(src, status_signal) + + +/obj/machinery/computer/supplycomp/say_quote(text) + return "flashes, \"[text]\"" \ No newline at end of file diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm new file mode 100644 index 00000000000..8637aff5efd --- /dev/null +++ b/code/controllers/subsystem/sun.dm @@ -0,0 +1,51 @@ +var/datum/subsystem/sun/SSsun + +/datum/subsystem/sun + name = "Sun" + wait = 600 + priority = 2 + + var/angle + var/dx + var/dy + var/rate + var/list/solars = list() + +/datum/subsystem/sun/New() + NEW_SS_GLOBAL(SSsun) + + angle = rand (0,360) // the station position to the sun is randomised at round start + rate = rand(50,200)/100 // 50% - 200% of standard rotation + if(prob(50)) // same chance to rotate clockwise than counter-clockwise + rate = -rate + +/datum/subsystem/sun/fire() + angle = (360 + angle + rate * 6) % 360 // increase/decrease the angle to the sun, adjusted by the rate + + // now calculate and cache the (dx,dy) increments for line drawing + var/s = sin(angle) + var/c = cos(angle) + + // Either "abs(s) < abs(c)" or "abs(s) >= abs(c)" + // In both cases, the greater is greater than 0, so, no "if 0" check is needed for the divisions + + if(abs(s) < abs(c)) + dx = s / abs(c) + dy = c / abs(c) + else + dx = s / abs(s) + dy = c / abs(s) + + //now tell the solar control computers to update their status and linked devices + for(var/obj/machinery/power/solar_control/SC in solars) + if(!SC.powernet) + solars.Remove(SC) + continue + SC.update() + + + + + + + diff --git a/code/game/gamemodes/gameticker.dm b/code/controllers/subsystem/ticker.dm similarity index 62% rename from code/game/gamemodes/gameticker.dm rename to code/controllers/subsystem/ticker.dm index e828b3d1014..7e10c360348 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -1,421 +1,418 @@ -var/global/datum/controller/gameticker/ticker -var/round_start_time = 0 - -#define GAME_STATE_PREGAME 1 -#define GAME_STATE_SETTING_UP 2 -#define GAME_STATE_PLAYING 3 -#define GAME_STATE_FINISHED 4 - -/datum/controller/gameticker - var/const/restart_timeout = 250 - var/current_state = GAME_STATE_PREGAME - - var/hide_mode = 0 - var/datum/game_mode/mode = null - var/event_time = null - var/event = 0 - - var/login_music // music played in pregame lobby - - var/list/datum/mind/minds = list()//The people in the game. Used for objective tracking. - - var/Bible_icon_state // icon_state the chaplain has chosen for his bible - var/Bible_item_state // item_state the chaplain has chosen for his bible - var/Bible_name // name of the bible - var/Bible_deity_name - - var/list/syndicate_coalition = list() // list of traitor-compatible factions - var/list/factions = list() // list of all factions - var/list/availablefactions = list() // list of factions with openings - - var/pregame_timeleft = 0 - - var/delay_end = 0 //if set to nonzero, the round will not restart on it's own - - var/triai = 0//Global holder for Triumvirate - -/datum/controller/gameticker/proc/pregame() - - login_music = pickweight(list('sound/ambience/title2.ogg' = 49, 'sound/ambience/title1.ogg' = 49, 'sound/ambience/clown.ogg' = 2)) // choose title music! - if(events.holiday == "April Fool's Day") - login_music = 'sound/ambience/clown.ogg' - for(var/client/C in clients) - C.playtitlemusic() - - do - if(config) - pregame_timeleft = config.lobby_countdown - else - ERROR("configuration was null when retrieving the lobby_countdown value.") - pregame_timeleft = 120 - world << "Welcome to the pre-game lobby!" - world << "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds" - while(current_state == GAME_STATE_PREGAME) - sleep(10) - if(going) - pregame_timeleft-- - - if(pregame_timeleft <= 0) - current_state = GAME_STATE_SETTING_UP - while (!setup()) - -/datum/controller/gameticker/proc/setup() - //Create and announce mode - if(master_mode=="secret") - src.hide_mode = 1 - var/list/datum/game_mode/runnable_modes - if((master_mode=="random") || (master_mode=="secret")) - runnable_modes = config.get_runnable_modes() - - if((master_mode=="secret") && (secret_force_mode != "secret")) - var/datum/game_mode/smode = config.pick_mode(secret_force_mode) - if (!smode.can_start()) - message_admins("\blue Unable to force secret [secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.") - else - src.mode = smode - - if(!src.mode) - if (runnable_modes.len==0) - current_state = GAME_STATE_PREGAME - world << "Unable to choose playable game mode. Reverting to pre-game lobby." - return 0 - src.mode = pickweight(runnable_modes) - - else - src.mode = config.pick_mode(master_mode) - if (!src.mode.can_start()) - world << "Unable to start [mode.name]. Not enough players, [mode.required_players] players and [mode.required_enemies] eligible antagonists needed. Reverting to pre-game lobby." - del(mode) - current_state = GAME_STATE_PREGAME - job_master.ResetOccupations() - return 0 - - //Configure mode and assign player to special mode stuff - var/can_continue = 0 - if (src.mode.pre_setup_before_jobs) can_continue = src.mode.pre_setup() - job_master.DivideOccupations() //Distribute jobs - if (!src.mode.pre_setup_before_jobs) can_continue = src.mode.pre_setup() - - if(!Debug2) - if(!can_continue) - del(mode) - current_state = GAME_STATE_PREGAME - world << "Error setting up [master_mode]. Reverting to pre-game lobby." - job_master.ResetOccupations() - return 0 - else - world << "DEBUG: Bypassing prestart checks..." - - if(hide_mode) - var/list/modes = new - for (var/datum/game_mode/M in runnable_modes) - modes+=M.name - modes = sortList(modes) - world << "The current game mode is - Secret!" - world << "Possibilities: [english_list(modes)]" - else - src.mode.announce() - - round_start_time = world.time - - supply_shuttle.process() //Start the supply shuttle regenerating points - master_controller.process() //Start master_controller.process() - lighting_controller.process() //Start processing DynamicAreaLighting updates - - sleep(10) - - create_characters() //Create player characters and transfer them - collect_minds() - equip_characters() - data_core.manifest() - current_state = GAME_STATE_PLAYING - - spawn(0)//Forking here so we dont have to wait for this to finish - mode.post_setup() - //Cleanup some stuff - for(var/obj/effect/landmark/start/S in landmarks_list) - //Deleting Startpoints but we need the ai point to AI-ize people later - if (S.name != "AI") - qdel(S) - world << "Welcome to [station_name()], enjoy your stay!" - world << sound('sound/AI/welcome.ogg') // Skie - //Holiday Round-start stuff ~Carn - if(events.holiday) - world << "and..." - world << "
Happy [events.holiday] Everybody!
" - - if(!admins.len) - send2irc("Server", "Round just started with no admins online!") - auto_toggle_ooc(0) // Turn it off - - if(config.sql_enabled) - spawn(3000) - statistic_cycle() // Polls population totals regularly and stores them in an SQL DB - return 1 - -/datum/controller/gameticker - //station_explosion used to be a variable for every mob's hud. Which was a waste! - //Now we have a general cinematic centrally held within the gameticker....far more efficient! - var/obj/screen/cinematic = null - - //Plus it provides an easy way to make cinematics for other events. Just use this as a template -/datum/controller/gameticker/proc/station_explosion_cinematic(var/station_missed=0, var/override = null) - if( cinematic ) return //already a cinematic in progress! - auto_toggle_ooc(1) // Turn it on - //initialise our cinematic screen object - cinematic = new(src) - cinematic.icon = 'icons/effects/station_explosion.dmi' - cinematic.icon_state = "station_intact" - cinematic.layer = 20 - cinematic.mouse_opacity = 0 - cinematic.screen_loc = "1,0" - - var/obj/structure/stool/bed/temp_buckle = new(src) - if(station_missed) - for(var/mob/M in mob_list) - M.buckled = temp_buckle //buckles the mob so it can't do anything - if(M.client) - M.client.screen += cinematic //show every client the cinematic - else //nuke kills everyone on z-level 1 to prevent "hurr-durr I survived" - for(var/mob/M in mob_list) - M.buckled = temp_buckle - if(M.client) - M.client.screen += cinematic - if(M.stat != DEAD) - var/turf/T = get_turf(M) - if(T && T.z==1) - M.death(0) //no mercy - - //Now animate the cinematic - switch(station_missed) - if(1) //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) - world << sound('sound/effects/explosionfar.ogg') - flick("station_intact_fade_red",cinematic) - cinematic.icon_state = "summary_nukefail" - if("fake") //The round isn't over, we're just freaking people out for fun - flick("intro_nuke",cinematic) - sleep(35) - world << sound('sound/items/bikehorn.ogg') - flick("summary_selfdes",cinematic) - else - flick("intro_nuke",cinematic) - sleep(35) - world << sound('sound/effects/explosionfar.ogg') - //flick("end",cinematic) - - - if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation - sleep(50) - world << sound('sound/effects/explosionfar.ogg') - - - 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) - world << sound('sound/effects/explosionfar.ogg') - cinematic.icon_state = "summary_nukewin" - if("AI malfunction") //Malf (screen,explosion,summary) - flick("intro_malf",cinematic) - sleep(76) - flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') - cinematic.icon_state = "summary_malf" - if("blob") //Station nuked (nuke,explosion,summary) - flick("intro_nuke",cinematic) - sleep(35) - flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') - cinematic.icon_state = "summary_selfdes" - else //Station nuked (nuke,explosion,summary) - flick("intro_nuke",cinematic) - sleep(35) - flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') - 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. - sleep(300) - - if(cinematic) qdel(cinematic) //end the cinematic - if(temp_buckle) qdel(temp_buckle) //release everybody - return - - -/datum/controller/gameticker/proc/create_characters() - for(var/mob/new_player/player in player_list) - if(player.ready && player.mind) - joined_player_list += player.ckey - if(player.mind.assigned_role=="AI") - player.close_spawn_windows() - player.AIize() - else - player.create_character() - qdel(player) - else - player.new_player_panel() - - -/datum/controller/gameticker/proc/collect_minds() - for(var/mob/living/player in player_list) - if(player.mind) - ticker.minds += player.mind - - -/datum/controller/gameticker/proc/equip_characters() - var/captainless=1 - for(var/mob/living/carbon/human/player in player_list) - if(player && player.mind && player.mind.assigned_role) - if(player.mind.assigned_role == "Captain") - captainless=0 - if(player.mind.assigned_role != "MODE") - job_master.EquipRank(player, player.mind.assigned_role, 0) - if(captainless) - for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) - M << "Captainship not forced on anyone." - - -/datum/controller/gameticker/proc/process() - if(current_state != GAME_STATE_PLAYING) - return 0 - - mode.process() - - emergency_shuttle.process() - - if(!mode.explosion_in_progress && mode.check_finished()) - current_state = GAME_STATE_FINISHED - auto_toggle_ooc(1) // Turn it on - spawn - declare_completion() - - spawn(50) - if (mode.station_was_nuked) - feedback_set_details("end_proper","nuke") - if(!delay_end) - world << "\blue Rebooting due to destruction of station in [restart_timeout/10] seconds" - else - feedback_set_details("end_proper","proper completion") - if(!delay_end) - world << "\blue Restarting in [restart_timeout/10] seconds" - - - if(blackbox) - blackbox.save_all_data_to_sql() - - if(!delay_end) - sleep(restart_timeout) - kick_clients_in_lobby("\red The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked - world.Reboot() - else - world << "\blue An admin has delayed the round end" - - return 1 - -/datum/controller/gameticker/proc/getfactionbyname(var/name) - for(var/datum/faction/F in factions) - if(F.name == name) - return F - - -/datum/controller/gameticker/proc/declare_completion() - var/station_evacuated - if(emergency_shuttle.location > 0) - station_evacuated = 1 - var/num_survivors = 0 - var/num_escapees = 0 - - world << "The round has ended." - - //Player status report - for(var/mob/Player in mob_list) - if(Player.mind && !isnewplayer(Player)) - if(Player.stat != DEAD && !isbrain(Player)) - num_survivors++ - if(station_evacuated) //If the shuttle has already left the station - var/turf/playerTurf = get_turf(Player) - if(playerTurf.z != 2) - Player << "You managed to survive, but were marooned on [station_name()]..." - else - num_escapees++ - Player << "You managed to survive the events on [station_name()] as [Player.real_name]." - else - Player << "You managed to survive the events on [station_name()] as [Player.real_name]." - else - Player << "You did not survive the events on [station_name()]..." - - //Round statistics report - var/datum/station_state/end_state = new /datum/station_state() - end_state.count() - var/station_integrity = round( 100.0 * start_state.score(end_state), 0.1) - - world << "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]" - world << "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" - if(joined_player_list.len) - world << "
[TAB]Total Population: [joined_player_list.len]" - if(station_evacuated) - world << "
[TAB]Evacuation Rate: [num_escapees] ([round((num_escapees/joined_player_list.len)*100, 0.1)]%)" - else - world << "
[TAB]Survival Rate: [num_survivors] ([round((num_survivors/joined_player_list.len)*100, 0.1)]%)" - world << "
" - - //Silicon laws report - for (var/mob/living/silicon/ai/aiPlayer in mob_list) - if (aiPlayer.stat != 2 && aiPlayer.mind) - 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 - world << "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws when it was deactivated were:" - aiPlayer.show_laws(1) - - if (aiPlayer.connected_robots.len) - var/robolist = "[aiPlayer.real_name]'s minions were: " - for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) - robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.mind.key]), ":" (Played by: [robo.mind.key]), "]" - world << "[robolist]" - for (var/mob/living/silicon/robot/robo in mob_list) - if (!robo.connected_ai && robo.mind) - if (robo.stat != 2) - world << "[robo.name] (Played by: [robo.mind.key]) survived as an AI-less borg! Its laws were:" - else - world << "[robo.name] (Played by: [robo.mind.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" - - if(robo) //How the hell do we lose robo between here and the world messages directly above this? - robo.laws.show_laws(world) - - mode.declare_completion()//To declare normal completion. - - //calls auto_declare_completion_* for all modes - for(var/handler in typesof(/datum/game_mode/proc)) - if (findtext("[handler]","auto_declare_completion_")) - call(mode, handler)() - - //Print a list of antagonists to the server log - var/list/total_antagonists = list() - //Look into all mobs in world, dead or alive - for(var/datum/mind/Mind in minds) - var/temprole = Mind.special_role - if(temprole) //if they are an antagonist of some sort. - if(temprole in total_antagonists) //If the role exists already, add the name to it - total_antagonists[temprole] += ", [Mind.name]([Mind.key])" - else - total_antagonists.Add(temprole) //If the role doesnt exist in the list, create it and add the mob - total_antagonists[temprole] += ": [Mind.name]([Mind.key])" - - //Now print them all into the log! - log_game("Antagonists at round end were...") - for(var/i in total_antagonists) - log_game("[i]s[total_antagonists[i]].") - - return 1 +var/round_start_time = 0 + +var/datum/subsystem/ticker/ticker + +/datum/subsystem/ticker + name = "Ticker" + can_fire = 1 + priority = 0 + + var/restart_timeout = 250 //delay when restarting server + var/current_state = GAME_STATE_STARTUP //state of current round (used by process()) Use the defines GAME_STATE_* ! + + var/hide_mode = 0 + var/datum/game_mode/mode = null + var/event_time = null + var/event = 0 + + var/login_music //music played in pregame lobby + + var/list/datum/mind/minds = list() //The characters in the game. Used for objective tracking. + + //These bible variables should be a preference + var/Bible_icon_state //icon_state the chaplain has chosen for his bible + var/Bible_item_state //item_state the chaplain has chosen for his bible + var/Bible_name //name of the bible + var/Bible_deity_name //name of chaplin's deity + + var/list/syndicate_coalition = list() //list of traitor-compatible factions + var/list/factions = list() //list of all factions + var/list/availablefactions = list() //list of factions with openings + + var/delay_end = 0 //if set true, the round will not restart on it's own + + var/triai = 0 //Global holder for Triumvirate + + var/timeLeft = 1200 //pregame timer + + var/totalPlayers = 0 //used for pregame stats on statpanel + var/totalPlayersReady = 0 //used for pregame stats on statpanel + + var/obj/screen/cinematic = null //used for station explosion cinematic + + +/datum/subsystem/ticker/New() + NEW_SS_GLOBAL(ticker) + + login_music = pickweight(list('sound/ambience/title2.ogg' = 49, 'sound/ambience/title1.ogg' = 49, 'sound/ambience/clown.ogg' = 2)) // choose title music! + if(SSevent.holiday == "April Fool's Day") + login_music = 'sound/ambience/clown.ogg' + +/datum/subsystem/ticker/Initialize() + if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase() + if(!syndicate_code_response) syndicate_code_response = generate_code_phrase() + setupGenetics() + setupFactions() + ..() + +/datum/subsystem/ticker/fire() + switch(current_state) + if(GAME_STATE_STARTUP) + timeLeft = config.lobby_countdown * 10 + world << "Welcome to the pre-game lobby!" + world << "Please, setup your character and select ready. Game will start in [config.lobby_countdown] seconds" + current_state = GAME_STATE_PREGAME + + if(GAME_STATE_PREGAME) + //lobby stats for statpanels + totalPlayers = 0 + totalPlayersReady = 0 + for(var/mob/new_player/player in player_list) + ++totalPlayers + if(player.ready) + ++totalPlayersReady + + //countdown + timeLeft -= wait + if(timeLeft <= 0) + current_state = GAME_STATE_SETTING_UP + + if(GAME_STATE_SETTING_UP) + if(!setup()) + //setup failed + current_state = GAME_STATE_STARTUP + + if(GAME_STATE_PLAYING) + mode.process(wait * 0.1) + + if(!mode.explosion_in_progress && mode.check_finished()) + current_state = GAME_STATE_FINISHED + auto_toggle_ooc(1) // Turn it on + declare_completion() + spawn(50) + if(mode.station_was_nuked) + feedback_set_details("end_proper","nuke") + if(!delay_end) + world << "\blue Rebooting due to destruction of station in [restart_timeout/10] seconds" + else + feedback_set_details("end_proper","proper completion") + if(!delay_end) + world << "\blue Restarting in [restart_timeout/10] seconds" + + + if(blackbox) + blackbox.save_all_data_to_sql() + + if(delay_end) + world << "\blue An admin has delayed the round end" + else + sleep(restart_timeout) + kick_clients_in_lobby("\red The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked + world.Reboot() + + +/datum/subsystem/ticker/proc/setup() + //Create and announce mode + var/list/datum/game_mode/runnable_modes + if(master_mode == "random" || master_mode == "secret") + runnable_modes = config.get_runnable_modes() + + if(master_mode == "secret") + hide_mode = 1 + if(secret_force_mode != "secret") + var/datum/game_mode/smode = config.pick_mode(secret_force_mode) + if(!smode.can_start()) + message_admins("\blue Unable to force secret [secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.") + else + mode = smode + + if(!mode) + if(!runnable_modes.len) + world << "Unable to choose playable game mode. Reverting to pre-game lobby." + return 0 + mode = pickweight(runnable_modes) + + else + mode = config.pick_mode(master_mode) + if(!mode.can_start()) + world << "Unable to start [mode.name]. Not enough players, [mode.required_players] players and [mode.required_enemies] eligible antagonists needed. Reverting to pre-game lobby." + del(mode) + SSjob.ResetOccupations() + return 0 + + //Configure mode and assign player to special mode stuff + var/can_continue = 0 + if(mode.pre_setup_before_jobs) + can_continue = src.mode.pre_setup() + SSjob.DivideOccupations() //Distribute jobs + if(!mode.pre_setup_before_jobs) + can_continue = src.mode.pre_setup() + + if(!Debug2) + if(!can_continue) + del(mode) + world << "Error setting up [master_mode]. Reverting to pre-game lobby." + SSjob.ResetOccupations() + return 0 + else + world << "DEBUG: Bypassing prestart checks..." + + if(hide_mode) + var/list/modes = new + for (var/datum/game_mode/M in runnable_modes) + modes += M.name + modes = sortList(modes) + world << "The current game mode is - Secret!" + world << "Possibilities: [english_list(modes)]" + else + mode.announce() + + current_state = GAME_STATE_PLAYING + auto_toggle_ooc(0) // Turn it off + round_start_time = world.time + + create_characters() //Create player characters and transfer them + collect_minds() + equip_characters() + data_core.manifest() + + master_controller.roundHasStarted() + + + world << "Welcome to [station_name()], enjoy your stay!" + world << sound('sound/AI/welcome.ogg') // Skie + //Holiday Round-start stuff ~Carn + if(SSevent.holiday) + world << "and..." + world << "
Happy [SSevent.holiday] Everybody!
" + + + spawn(0)//Forking here so we dont have to wait for this to finish + mode.post_setup() + //Cleanup some stuff + for(var/obj/effect/landmark/start/S in landmarks_list) + //Deleting Startpoints but we need the ai point to AI-ize people later + if(S.name != "AI") + qdel(S) + + if(!admins.len) + send2irc("Server", "Round just started with no admins online!") + + return 1 + + + //Plus it provides an easy way to make cinematics for other events. Just use this as a template +/datum/subsystem/ticker/proc/station_explosion_cinematic(var/station_missed=0, var/override = null) + if( cinematic ) return //already a cinematic in progress! + auto_toggle_ooc(1) // Turn it on + //initialise our cinematic screen object + cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=20;mouse_opacity=0;screen_loc="1,0";}(src) + + var/obj/structure/stool/bed/temp_buckle = new(src) + if(station_missed) + for(var/mob/M in mob_list) + M.buckled = temp_buckle //buckles the mob so it can't do anything + if(M.client) + M.client.screen += cinematic //show every client the cinematic + else //nuke kills everyone on z-level 1 to prevent "hurr-durr I survived" + for(var/mob/M in mob_list) + M.buckled = temp_buckle + if(M.client) + M.client.screen += cinematic + if(M.stat != DEAD) + var/turf/T = get_turf(M) + if(T && T.z==1) + M.death(0) //no mercy + + //Now animate the cinematic + switch(station_missed) + if(1) //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) + world << sound('sound/effects/explosionfar.ogg') + flick("station_intact_fade_red",cinematic) + cinematic.icon_state = "summary_nukefail" + if("fake") //The round isn't over, we're just freaking people out for fun + flick("intro_nuke",cinematic) + sleep(35) + world << sound('sound/items/bikehorn.ogg') + flick("summary_selfdes",cinematic) + else + flick("intro_nuke",cinematic) + sleep(35) + world << sound('sound/effects/explosionfar.ogg') + //flick("end",cinematic) + + + if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation + sleep(50) + world << sound('sound/effects/explosionfar.ogg') + + + 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) + world << sound('sound/effects/explosionfar.ogg') + cinematic.icon_state = "summary_nukewin" + if("AI malfunction") //Malf (screen,explosion,summary) + flick("intro_malf",cinematic) + sleep(76) + flick("station_explode_fade_red",cinematic) + world << sound('sound/effects/explosionfar.ogg') + cinematic.icon_state = "summary_malf" + if("blob") //Station nuked (nuke,explosion,summary) + flick("intro_nuke",cinematic) + sleep(35) + flick("station_explode_fade_red",cinematic) + world << sound('sound/effects/explosionfar.ogg') + cinematic.icon_state = "summary_selfdes" + else //Station nuked (nuke,explosion,summary) + flick("intro_nuke",cinematic) + sleep(35) + flick("station_explode_fade_red", cinematic) + world << sound('sound/effects/explosionfar.ogg') + 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. + sleep(300) + + if(cinematic) qdel(cinematic) //end the cinematic + if(temp_buckle) qdel(temp_buckle) //release everybody + return + + + +/datum/subsystem/ticker/proc/create_characters() + for(var/mob/new_player/player in player_list) + if(player.ready && player.mind) + joined_player_list += player.ckey + if(player.mind.assigned_role=="AI") + player.close_spawn_windows() + player.AIize() + else + player.create_character() + qdel(player) + else + player.new_player_panel() + + +/datum/subsystem/ticker/proc/collect_minds() + for(var/mob/living/player in player_list) + if(player.mind) + ticker.minds += player.mind + + +/datum/subsystem/ticker/proc/equip_characters() + var/captainless=1 + for(var/mob/living/carbon/human/player in player_list) + if(player && player.mind && player.mind.assigned_role) + if(player.mind.assigned_role == "Captain") + captainless=0 + if(player.mind.assigned_role != "MODE") + SSjob.EquipRank(player, player.mind.assigned_role, 0) + if(captainless) + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << "Captainship not forced on anyone." + + + +/datum/subsystem/ticker/proc/declare_completion() + var/station_evacuated + if(SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) + station_evacuated = 1 + var/num_survivors = 0 + var/num_escapees = 0 + + world << "The round has ended." + + //Player status report + for(var/mob/Player in mob_list) + if(Player.mind && !isnewplayer(Player)) + if(Player.stat != DEAD && !isbrain(Player)) + num_survivors++ + if(station_evacuated) //If the shuttle has already left the station + var/turf/playerTurf = get_turf(Player) + if(!playerTurf || playerTurf.z != ZLEVEL_CENTCOM) + Player << "You managed to survive, but were marooned on [station_name()]..." + else + num_escapees++ + Player << "You managed to survive the events on [station_name()] as [Player.real_name]." + else + Player << "You managed to survive the events on [station_name()] as [Player.real_name]." + else + Player << "You did not survive the events on [station_name()]..." + + //Round statistics report + var/datum/station_state/end_state = new /datum/station_state() + end_state.count() + var/station_integrity = round( 100.0 * start_state.score(end_state), 0.1) + + world << "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]" + world << "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" + if(joined_player_list.len) + world << "
[TAB]Total Population: [joined_player_list.len]" + if(station_evacuated) + world << "
[TAB]Evacuation Rate: [num_escapees] ([round((num_escapees/joined_player_list.len)*100, 0.1)]%)" + else + world << "
[TAB]Survival Rate: [num_survivors] ([round((num_survivors/joined_player_list.len)*100, 0.1)]%)" + world << "
" + + //Silicon laws report + for (var/mob/living/silicon/ai/aiPlayer in mob_list) + if (aiPlayer.stat != 2 && aiPlayer.mind) + 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 + world << "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws when it was deactivated were:" + aiPlayer.show_laws(1) + + if (aiPlayer.connected_robots.len) + var/robolist = "[aiPlayer.real_name]'s minions were: " + for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) + robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.mind.key]), ":" (Played by: [robo.mind.key]), "]" + world << "[robolist]" + for (var/mob/living/silicon/robot/robo in mob_list) + if (!robo.connected_ai && robo.mind) + if (robo.stat != 2) + world << "[robo.name] (Played by: [robo.mind.key]) survived as an AI-less borg! Its laws were:" + else + world << "[robo.name] (Played by: [robo.mind.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" + + if(robo) //How the hell do we lose robo between here and the world messages directly above this? + robo.laws.show_laws(world) + + mode.declare_completion()//To declare normal completion. + + //calls auto_declare_completion_* for all modes + for(var/handler in typesof(/datum/game_mode/proc)) + if (findtext("[handler]","auto_declare_completion_")) + call(mode, handler)() + + //Print a list of antagonists to the server log + var/list/total_antagonists = list() + //Look into all mobs in world, dead or alive + for(var/datum/mind/Mind in minds) + var/temprole = Mind.special_role + if(temprole) //if they are an antagonist of some sort. + if(temprole in total_antagonists) //If the role exists already, add the name to it + total_antagonists[temprole] += ", [Mind.name]([Mind.key])" + else + total_antagonists.Add(temprole) //If the role doesnt exist in the list, create it and add the mob + total_antagonists[temprole] += ": [Mind.name]([Mind.key])" + + //Now print them all into the log! + log_game("Antagonists at round end were...") + for(var/i in total_antagonists) + log_game("[i]s[total_antagonists[i]].") + + return 1 diff --git a/code/controllers/voting.dm b/code/controllers/subsystem/voting.dm similarity index 74% rename from code/controllers/voting.dm rename to code/controllers/subsystem/voting.dm index c9754a87c48..b10042486f9 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/subsystem/voting.dm @@ -1,8 +1,13 @@ -var/datum/controller/vote/vote = new() +var/datum/subsystem/vote/SSvote + +/datum/subsystem/vote + name = "Vote" + can_fire = 1 + wait = 10 + priority = -1 -/datum/controller/vote var/initiator = null - var/started_timeofday = null + var/started_time = null var/time_remaining = 0 var/mode = null var/question = null @@ -10,44 +15,28 @@ var/datum/controller/vote/vote = new() var/list/voted = list() var/list/voting = list() -/datum/controller/vote/New() - if(vote != src) - if(istype(vote)) - del(vote) - vote = src +/datum/subsystem/vote/New() + NEW_SS_GLOBAL(SSvote) -/datum/controller/vote/proc/process() //called by master_controller +/datum/subsystem/vote/fire() //called by master_controller if(mode) - time_remaining = started_timeofday + config.vote_period - if(world.timeofday < started_timeofday) - time_remaining -= 864000 - time_remaining = round((time_remaining - world.timeofday)/10) + time_remaining = round((started_time + config.vote_period - world.time)/10) - var/i=1 if(time_remaining < 0) result() - while(i<=voting.len) - var/client/C = voting[i] - if(C) - C << browse(null,"window=vote;can_close=0") - i++ + for(var/client/C in voting) + C << browse(null, "window=vote;can_close=0") reset() else var/datum/browser/client_popup - while(i<=voting.len) - var/client/C = voting[i] - if(C) - //C << browse(vote.interface(C),"window=vote;can_close=0") - client_popup = new(C, "vote", "Voting Panel") - client_popup.set_window_options("can_close=0") - client_popup.set_content(vote.interface(C)) - client_popup.open(0) + for(var/client/C in voting) + client_popup = new(C, "vote", "Voting Panel") + client_popup.set_window_options("can_close=0") + client_popup.set_content(interface(C)) + client_popup.open(0) - i++ - else - voting.Cut(i,i+1) -/datum/controller/vote/proc/reset() +/datum/subsystem/vote/proc/reset() initiator = null time_remaining = 0 mode = null @@ -56,7 +45,7 @@ var/datum/controller/vote/vote = new() voted.Cut() voting.Cut() -/datum/controller/vote/proc/get_result() +/datum/subsystem/vote/proc/get_result() //get the highest number of votes var/greatest_votes = 0 var/total_votes = 0 @@ -86,7 +75,7 @@ var/datum/controller/vote/vote = new() . += option return . -/datum/controller/vote/proc/announce_result() +/datum/subsystem/vote/proc/announce_result() var/list/winners = get_result() var/text if(winners.len > 0) @@ -111,7 +100,7 @@ var/datum/controller/vote/vote = new() world << "\n[text]" return . -/datum/controller/vote/proc/result() +/datum/subsystem/vote/proc/result() . = announce_result() var/restart = 0 if(.) @@ -137,7 +126,7 @@ var/datum/controller/vote/vote = new() return . -/datum/controller/vote/proc/submit_vote(var/vote) +/datum/subsystem/vote/proc/submit_vote(var/vote) if(mode) if(config.vote_no_dead && usr.stat == DEAD && !usr.client.holder) return 0 @@ -148,13 +137,11 @@ var/datum/controller/vote/vote = new() return vote return 0 -/datum/controller/vote/proc/initiate_vote(var/vote_type, var/initiator_key) +/datum/subsystem/vote/proc/initiate_vote(var/vote_type, var/initiator_key) if(!mode) - if(started_timeofday != null) - var/next_allowed_timeofday = (started_timeofday + config.vote_delay) - if(world.timeofday < started_timeofday) - next_allowed_timeofday -= 864000 - if(next_allowed_timeofday > world.timeofday) + if(started_time != null) + var/next_allowed_time = (started_time + config.vote_delay) + if(next_allowed_time > world.time) return 0 reset() @@ -171,7 +158,7 @@ var/datum/controller/vote/vote = new() else return 0 mode = vote_type initiator = initiator_key - started_timeofday = world.timeofday + started_time = world.time var/text = "[capitalize(mode)] vote started by [initiator]." if(mode == "custom") text += "\n[question]" @@ -181,7 +168,7 @@ var/datum/controller/vote/vote = new() return 1 return 0 -/datum/controller/vote/proc/interface(var/client/C) +/datum/subsystem/vote/proc/interface(var/client/C) if(!C) return var/admin = 0 var/trialmin = 0 @@ -229,7 +216,7 @@ var/datum/controller/vote/vote = new() return . -/datum/controller/vote/Topic(href,href_list[],hsrc) +/datum/subsystem/vote/Topic(href,href_list[],hsrc) if(!usr || !usr.client) return //not necessary but meh...just in-case somebody does something stupid switch(href_list["vote"]) if("close") @@ -263,9 +250,8 @@ var/datum/controller/vote/vote = new() set category = "OOC" set name = "Vote" - if(vote) - //src << browse(vote.interface(client),"window=vote;can_close=0") - var/datum/browser/popup = new(src, "vote", "Voting Panel") - popup.set_window_options("can_close=0") - popup.set_content(vote.interface(client)) - popup.open(0) + var/datum/browser/popup = new(src, "vote", "Voting Panel") + popup.set_window_options("can_close=0") + popup.set_content(SSvote.interface(client)) + popup.open(0) + diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm new file mode 100644 index 00000000000..3c9a3c4e0bb --- /dev/null +++ b/code/controllers/subsystems.dm @@ -0,0 +1,46 @@ +#define NEW_SS_GLOBAL(varname) if(varname != src){if(istype(varname)){Recover();qdel(varname);}varname = src;} + +/datum/subsystem + //things you will want to define + var/name //name of the subsystem + var/priority = 0 //priority affects order of initialization. Higher priorities are initialized first, lower priorities later. Can be decimal and negative values. + var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. + + //things you will probably want to leave alone + var/can_fire = 0 //prevent fire() calls + var/last_fire = 0 //last world.time we called fire() + var/next_fire = 0 //scheduled world.time for next fire() + var/cpu = 0 //cpu-usage stats (somewhat vague) + var/cost = 0 //average time to execute + var/times_fired = 0 //number of times we have called fire() + +//used to initialize the subsystem BEFORE the map has loaded +/datum/subsystem/New() + +//previously, this would have been named 'process()' but that name is used everywhere for different things! +//fire() seems more suitable. This is the procedure that gets called every 'wait' deciseconds. +//fire(), and the procs it calls, SHOULD NOT HAVE ANY SLEEP OPERATIONS in them! +//YE BE WARNED! +/datum/subsystem/proc/fire() + can_fire = 0 + +//used to initialize the subsystem AFTER the map has loaded +/datum/subsystem/proc/Initialize(start_timeofday) + var/time = (world.timeofday - start_timeofday) / 10 + var/msg = "Initialized [name] SubSystem within [time] seconds" + world << "[msg]" + world.log << msg + +//hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc. +/datum/subsystem/proc/stat_entry() + stat(name, "[round(cost,0.001)]ds\t(CPU:[round(cpu,1)]%)") + +//could be used to postpone a costly subsystem for one cycle +//for instance, during cpu intensive operations like explosions +/datum/subsystem/proc/postpone() + if(next_fire - world.time < wait) + next_fire += wait + +//usually called via datum/subsystem/New() when replacing a subsystem (i.e. due to a recurring crash) +//should attempt to salvage what it can from the old instance of subsystem +/datum/subsystem/proc/Recover() \ No newline at end of file diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm deleted file mode 100644 index 5242b0e77f4..00000000000 --- a/code/controllers/supply_shuttle.dm +++ /dev/null @@ -1,808 +0,0 @@ -//Config stuff -#define SUPPLY_DOCKZ 2 //Z-level of the Dock. -#define SUPPLY_STATIONZ 1 //Z-level of the Station. -#define SUPPLY_STATION_AREATYPE "/area/supply/station" //Type of the supply shuttle area for station -#define SUPPLY_DOCK_AREATYPE "/area/supply/dock" //Type of the supply shuttle area for dock - -var/global/datum/controller/supply_shuttle/supply_shuttle - -/area/supply/station //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS. - name = "supply shuttle" - icon_state = "shuttle3" - luminosity = 1 - lighting_use_dynamic = 0 - requires_power = 0 - -/area/supply/dock //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS. - name = "supply shuttle" - icon_state = "shuttle3" - luminosity = 1 - lighting_use_dynamic = 0 - requires_power = 0 - -//SUPPLY PACKS MOVED TO /code/defines/obj/supplypacks.dm - -/obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY - name = "plastic flaps" - desc = "Definitely can't get past those. No way." - icon = 'icons/obj/stationobjs.dmi' //Change this. - icon_state = "plasticflaps" - density = 0 - anchored = 1 - layer = 4 - -/obj/structure/plasticflaps/CanPass(atom/movable/A, turf/T) - if(istype(A) && A.checkpass(PASSGLASS)) - return prob(60) - - var/obj/structure/stool/bed/B = A - if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass - return 0 - - else if(istype(A, /mob/living)) // You Shall Not Pass! - var/mob/living/M = A - if(!M.lying && !istype(M, /mob/living/carbon/monkey) && !istype(M, /mob/living/carbon/slime)) //If your not laying down, or a small creature, no pass. - return 0 - return ..() - -/obj/structure/plasticflaps/ex_act(severity, target) - ..() - switch(severity) - if (1) - qdel(src) - if (2) - if (prob(50)) - qdel(src) - if (3) - if (prob(5)) - qdel(src) - -/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates - name = "airtight plastic flaps" - desc = "Heavy duty, airtight, plastic flaps." - -/obj/structure/plasticflaps/mining/New() //set the turf below the flaps to block air - var/turf/T = get_turf(loc) - if(T) - T.blocks_air = 1 - ..() - -/obj/structure/plasticflaps/mining/Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor //wow this is terrible - var/turf/T = get_turf(loc) - if(T) - if(istype(T, /turf/simulated/floor)) - T.blocks_air = 0 - ..() - -/obj/machinery/computer/supplycomp - name = "supply shuttle console" - desc = "Used to order supplies." - icon = 'icons/obj/computer.dmi' - icon_state = "supply" - req_access = list(access_cargo) - circuit = /obj/item/weapon/circuitboard/supplycomp - var/temp = null - var/reqtime = 0 //Cooldown for requisitions - Quarxink - var/hacked = 0 - var/can_order_contraband = 0 - var/last_viewed_group = "categories" - - -/obj/machinery/computer/ordercomp - name = "supply ordering console" - desc = "Used to order supplies from cargo staff." - icon = 'icons/obj/computer.dmi' - icon_state = "request" - circuit = /obj/item/weapon/circuitboard/ordercomp - var/temp = null - var/reqtime = 0 //Cooldown for requisitions - Quarxink - var/last_viewed_group = "categories" - -/* -/obj/effect/marker/supplymarker - icon_state = "X" - icon = 'icons/misc/mark.dmi' - name = "X" - invisibility = 101 - anchored = 1 - opacity = 0 -*/ - -/datum/supply_order - var/ordernum - var/datum/supply_packs/object = null - var/orderedby = null - var/comment = null - -/datum/controller/supply_shuttle - var/processing = 1 - var/processing_interval = 300 - var/iteration = 0 - //supply points - var/points = 50 - var/points_per_process = 1 - var/points_per_slip = 2 - var/points_per_crate = 5 - var/points_per_intel = 100 - var/plasma_per_point = 0.2 //5 points per plasma sheet due to increased rarity - var/centcom_message = "" // Remarks from Centcom on how well you checked the last order. - // Unique typepaths for unusual things we've already sent CentComm, associated with their potencies - var/list/discoveredPlants = list() - //control - var/ordernum - var/list/shoppinglist = list() - var/list/requestlist = list() - var/list/supply_packs = list() - //shuttle movement - var/at_station = 0 - var/movetime = 1200 - var/moving = 0 - var/eta_timeofday - var/eta - //shuttle loan - var/datum/round_event/shuttle_loan/shuttle_loan - //for logging - var/sold_atoms = "" - -/datum/controller/supply_shuttle/New() - ordernum = rand(1,9000) - for(var/typepath in (typesof(/datum/supply_packs) - /datum/supply_packs)) - var/datum/supply_packs/P = new typepath() - if(P.name == "HEADER") continue // To filter out group headers - supply_packs[P.name] = P - -//Supply shuttle ticker - handles supply point regenertion and shuttle travelling between centcom and the station -/datum/controller/supply_shuttle/proc/process() - - spawn(0) - set background = BACKGROUND_ENABLED - while(1) - if(processing) - iteration++ - points += points_per_process - - if(moving == 1) - var/ticksleft = (eta_timeofday - world.timeofday) - if(ticksleft > 0) - eta = round(ticksleft/600,1) - else - eta = 0 - send() - - - sleep(processing_interval) - -/datum/controller/supply_shuttle/proc/send() - var/area/from - var/area/dest - switch(at_station) - if(1) - from = locate(SUPPLY_STATION_AREATYPE) - dest = locate(SUPPLY_DOCK_AREATYPE) - at_station = 0 - if(0) - from = locate(SUPPLY_DOCK_AREATYPE) - dest = locate(SUPPLY_STATION_AREATYPE) - at_station = 1 - dest.clear_docking_area() - moving = 0 - - from.move_contents_to(dest) - -//Check whether the shuttle is allowed to move -/datum/controller/supply_shuttle/proc/can_move() - if(moving) return 0 - - var/area/shuttle = locate(/area/supply/station) - if(!shuttle) return 0 - - if(forbidden_atoms_check(shuttle) && at_station) - return 0 - - return 1 - -//To stop things being sent to centcom which should not be sent to centcom Recursively checks for these types. -/datum/controller/supply_shuttle/proc/forbidden_atoms_check(atom/A) - if(istype(A,/mob/living)) - return 1 - if(istype(A,/obj/item/weapon/disk/nuclear)) - return 1 - if(istype(A,/obj/machinery/nuclearbomb)) - return 1 - if(istype(A,/obj/item/device/radio/beacon)) - return 1 - if(istype(A,/obj/effect/blob)) - return 1 - if(istype(A,/obj/effect/spider/spiderling)) - return 1 - - for(var/i=1, i<=A.contents.len, i++) - var/atom/B = A.contents[i] - if(.(B)) - return 1 - -//Sellin -/datum/controller/supply_shuttle/proc/sell() - var/shuttle_at - if(at_station) shuttle_at = SUPPLY_STATION_AREATYPE - else shuttle_at = SUPPLY_DOCK_AREATYPE - - var/area/shuttle = locate(shuttle_at) - if(!shuttle) return - - var/plasma_count = 0 - var/intel_count = 0 - var/crate_count = 0 - - centcom_message = "" - - for(var/atom/movable/MA in shuttle) - sold_atoms += " [MA.name]" - if(MA.anchored) continue - - - // Must be in a crate (or a critter crate)! - if(istype(MA,/obj/structure/closet/crate) || istype(MA,/obj/structure/closet/critter)) - sold_atoms += ":" - crate_count++ - var/find_slip = 1 - - for(var/atom in MA) - // Sell manifests - var/atom/A = atom - sold_atoms += " [A.name]" - if(find_slip && istype(A,/obj/item/weapon/paper/manifest)) - var/obj/item/weapon/paper/manifest/slip = A - // TODO: Check for a signature, too. - if(slip.stamped && slip.stamped.len) //yes, the clown stamp will work. clown is the highest authority on the station, it makes sense - // Did they mark it as erroneous? - var/denied = 0 - for(var/i=1,i<=slip.stamped.len,i++) - if(slip.stamped[i] == /obj/item/weapon/stamp/denied) - denied = 1 - if(slip.erroneous && denied) // Caught a mistake by Centcom (IDEA: maybe Centcom rarely gets offended by this) - points += slip.points-points_per_crate // For now, give a full refund for paying attention (minus the crate cost) - centcom_message += "+[slip.points-points_per_crate]: Station correctly denied package [slip.ordernumber]: " - if(slip.erroneous & MANIFEST_ERROR_NAME) - centcom_message += "Destination station incorrect. " - else if(slip.erroneous & MANIFEST_ERROR_COUNT) - centcom_message += "Packages incorrectly counted. " - else if(slip.erroneous & MANIFEST_ERROR_ITEM) - centcom_message += "Package incomplete. " - centcom_message += "Points refunded.
" - else if(!slip.erroneous && !denied) // Approving a proper order awards the relatively tiny points_per_slip - points += points_per_slip - centcom_message += "+1: Package [slip.ordernumber] accorded.
" - else // You done goofed. - if(slip.erroneous) - centcom_message += "+0: Station approved package [slip.ordernumber] despite error: " - if(slip.erroneous & MANIFEST_ERROR_NAME) - centcom_message += "Destination station incorrect." - else if(slip.erroneous & MANIFEST_ERROR_COUNT) - centcom_message += "Packages incorrectly counted." - else if(slip.erroneous & MANIFEST_ERROR_ITEM) - centcom_message += "We found unshipped items on our dock." - centcom_message += " Be more vigilant.
" - else - points -= slip.points-points_per_crate - centcom_message += "-[slip.points-points_per_crate]: Station denied package [slip.ordernumber]. Our records show no fault on our part.
" - find_slip = 0 - continue - - // Sell plasma - if(istype(A, /obj/item/stack/sheet/mineral/plasma)) - var/obj/item/stack/sheet/mineral/plasma/P = A - plasma_count += P.amount - - // Sell syndicate intel - if(istype(A, /obj/item/documents/syndicate)) - intel_count += 1 - - if(istype(A, /obj/item/seeds)) - var/obj/item/seeds/S = A - if(S.rarity == 0) // Mundane species - centcom_message += "+0: We don't need samples of mundane species \"[capitalize(S.species)]\".
" - else if(discoveredPlants[S.type]) // This species has already been sent to CentComm - var/potDiff = S.potency - discoveredPlants[S.type] // Compare it to the previous best - if(potDiff > 0) // This sample is better - discoveredPlants[S.type] = S.potency - centcom_message += "+[potDiff]: New sample of \"[capitalize(S.species)]\" is superior. Good work.
" - points += potDiff - else // This sample is worthless - centcom_message += "+0: New sample of \"[capitalize(S.species)]\" is not more potent than existing sample ([discoveredPlants[S.type]] potency).
" - else // This is a new discovery! - discoveredPlants[S.type] = S.potency - centcom_message += "+[S.rarity]: New species discovered: \"[capitalize(S.species)]\". Excellent work.
" - points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later - qdel(MA) - sold_atoms += "." - - if(plasma_count) - centcom_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] unit(s) of exotic material.
" - points += round(plasma_count / plasma_per_point) - - if(intel_count) - centcom_message += "+[round(intel_count*points_per_intel)]: Received [intel_count] article(s) of enemy intelligence.
" - points += round(intel_count*points_per_intel) - - if(crate_count) - centcom_message += "+[round(crate_count*points_per_crate)]: Received [crate_count] crate(s).
" - points += crate_count * points_per_crate - -//Buyin -/datum/controller/supply_shuttle/proc/buy() - if(!shoppinglist.len) return - - var/shuttle_at - if(at_station) shuttle_at = SUPPLY_STATION_AREATYPE - else shuttle_at = SUPPLY_DOCK_AREATYPE - - var/area/shuttle = locate(shuttle_at) - if(!shuttle) return - - var/list/clear_turfs = list() - - for(var/turf/T in shuttle) - if(T.density || T.contents.len) continue - clear_turfs += T - - for(var/S in shoppinglist) - if(!clear_turfs.len) break - var/i = rand(1,clear_turfs.len) - var/turf/pickedloc = clear_turfs[i] - clear_turfs.Cut(i,i+1) - - var/datum/supply_order/SO = S - var/datum/supply_packs/SP = SO.object - - var/atom/A = new SP.containertype(pickedloc) - A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]" - - //supply manifest generation begin - - var/obj/item/weapon/paper/manifest/slip = new /obj/item/weapon/paper/manifest(A) - - var printed_station_name = station_name() - if(prob(5)) - printed_station_name = new_station_name() - slip.erroneous |= MANIFEST_ERROR_NAME // They got our station name wrong. BASTARDS! - // IDEA: Have Centcom accidentally send random low-value crates in large orders, give large bonus for returning them intact. - var printed_packages_amount = supply_shuttle.shoppinglist.len - if(prob(5)) - printed_packages_amount += rand(1,2) // I considered rand(-2,2), but that could be zero. Heh. - slip.erroneous |= MANIFEST_ERROR_COUNT // They typoed the number of crates in this shipment. It won't match the other manifests. - - slip.points = SP.cost - slip.ordernumber = SO.ordernum - slip.info = "
[command_name()] Shipping Manifest
" - slip.info +="Order #[SO.ordernum]
" - slip.info +="Destination: [printed_station_name]
" - slip.info +="[printed_packages_amount] PACKAGES IN THIS SHIPMENT
" - slip.info +="CONTENTS:
- "
-
- //spawn the stuff, finish generating the manifest while you're at it
- if(SP.access)
- A:req_access = list()
- A:req_access += text2num(SP.access)
-
- var/list/contains
- if(istype(SP,/datum/supply_packs/misc/randomised))
- var/datum/supply_packs/misc/randomised/SPR = SP
- contains = list()
- if(SPR.contains.len)
- for(var/j=1,j<=SPR.num_contained,j++)
- contains += pick(SPR.contains)
- else
- contains = SP.contains
-
- for(var/typepath in contains)
- if(!typepath) continue
- var/atom/B2 = new typepath(A)
- if(SP.amount && B2:amount) B2:amount = SP.amount
- slip.info += "
- [B2.name] " //add the item to the manifest (even if it was misplaced) - // If it has multiple items, there's a 1% of each going missing... Not for secure crates or those large wooden ones, though. - if(contains.len > 1 && prob(1) && !findtext(SP.containertype,"/secure/") && !findtext(SP.containertype,"/largecrate/")) - slip.erroneous |= MANIFEST_ERROR_ITEM // This item was not included in the shipment! - qdel(B2) // Lost in space... or the loading dock. - - //manifest finalisation - slip.info += "
" - slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS
" // And now this is actually meaningful. - - supply_shuttle.shoppinglist.Cut() - return - -/obj/item/weapon/paper/manifest - name = "supply manifest" - var/erroneous = 0 - var/points = 0 - var/ordernumber = 0 - -/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob) - if(..()) - return - user.set_machine(src) - var/dat - if(temp) - dat = temp - else - dat += {"
Shuttle Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
-
Supply Points: [supply_shuttle.points]
-
- -
Supply Points: [supply_shuttle.points]
\nRequest items
- View approved orders
- View requests
- Close"} - - // Removing the old window method but leaving it here for reference - //user << browse(dat, "window=computer;size=575x450") - //onclose(user, "computer") - - // Added the new browser window method - var/datum/browser/popup = new(user, "computer", "Supply Ordering Console", 575, 450) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - -/obj/machinery/computer/ordercomp/Topic(href, href_list) - if(..()) - return - - if( isturf(loc) && (in_range(src, usr) || istype(usr, /mob/living/silicon)) ) - usr.set_machine(src) - - if(href_list["order"]) - if(href_list["order"] == "categories") - //all_supply_groups - //Request what? - last_viewed_group = "categories" - temp = "
" - temp += "Select a category
" - for(var/cat in all_supply_groups ) - temp += "[get_supply_group_name(cat)]
" - else - last_viewed_group = href_list["order"] - var/cat = text2num(last_viewed_group) - temp = "
" - temp += "Request from: [get_supply_group_name(cat)]
" - for(var/supply_name in supply_shuttle.supply_packs ) - var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] - if(N.hidden || N.contraband || N.group != cat) continue //Have to send the type instead of a reference to - temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - else if (href_list["doorder"]) - if(world.time < reqtime) - say("[world.time - reqtime] seconds remaining until another requisition form may be printed.") - return - - //Find the correct supply_pack datum - var/datum/supply_packs/P = supply_shuttle.supply_packs[href_list["doorder"]] - if(!istype(P) || P.hidden || P.contraband) //href protection - return - - var/timeout = world.time + 600 - var/reason = stripped_input(usr,"Reason:","Why do you require this item?","") - if(world.time > timeout) return - if(!reason) return - - var/idname = "*None Provided*" - var/idrank = "*None Provided*" - if(ishuman(usr)) - var/mob/living/carbon/human/H = usr - idname = H.get_authentification_name() - idrank = H.get_assignment() - else if(issilicon(usr)) - idname = usr.real_name - - supply_shuttle.ordernum++ - var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) - reqform.name = "requisition form - [P.name]" - reqform.info += "
[station_name] Supply Requisition Form
" - reqform.info += "INDEX: #[supply_shuttle.ordernum]
" - reqform.info += "REQUESTED BY: [idname]
" - reqform.info += "RANK: [idrank]
" - reqform.info += "REASON: [reason]
" - reqform.info += "SUPPLY CRATE TYPE: [P.name]
" - reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
" - reqform.info += "CONTENTS:
" - reqform.info += P.manifest - reqform.info += "
" - reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" - - reqform.update_icon() //Fix for appearing blank when printed. - reqtime = (world.time + 5) % 1e5 - - //make our supply_order datum - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = supply_shuttle.ordernum - O.object = P - O.orderedby = idname - supply_shuttle.requestlist += O - - temp = "Thanks for your request. The cargo team will process it as soon as possible.
" - temp += "
Back Main Menu" - - else if (href_list["vieworders"]) - temp = "Main Menu
Current approved orders:
" - for(var/S in supply_shuttle.shoppinglist) - var/datum/supply_order/SO = S - temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]
" - temp += "
Main Menu" - - else if (href_list["viewrequests"]) - temp = "Current requests:
" - for(var/S in supply_shuttle.requestlist) - var/datum/supply_order/SO = S - temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]
" - temp += "
Main Menu" - - else if (href_list["mainmenu"]) - temp = null - - add_fingerprint(usr) - updateUsrDialog() - return - -/obj/machinery/computer/ordercomp/say_quote(text) - return "flashes, \"[text]\"" - - -/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) - if(!allowed(user)) - user << "Access Denied." - return - - if(..()) - return - user.set_machine(src) - post_signal("supply") - var/dat - if (temp) - dat = temp - else - dat += {"
Supply shuttle
- \nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
-
\nSupply Points: [supply_shuttle.points]
\n
- \nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
-
\nSupply Points: [supply_shuttle.points]
\n
- [supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] - [supply_shuttle.moving ? "\n*Shuttle already called*
\n
":supply_shuttle.at_station ? "\nSend away
\n
":"\nSend to station
\n
"] - [supply_shuttle.shuttle_loan ? (supply_shuttle.shuttle_loan.dispatched ? "\n*Shuttle loaned to Centcom*
\n
" : "\nLoan shuttle to Centcom (5 mins duration)
\n
") : "\n*No pending external shuttle requests*
\n
"] - \nView requests
\n
- \nView orders
\n
- \nClose
-
\nCentral Command messages:
[supply_shuttle.centcom_message ? supply_shuttle.centcom_message : "Remember to stamp and send back the supply manifests."]"} - - var/datum/browser/popup = new(user, "computer", "Supply Shuttle Console", 700, 455) - popup.set_content(dat) - popup.open() - return - -/obj/machinery/computer/supplycomp/emag_act(user as mob) - if(!hacked) - user << "Special supplies unlocked." - hacked = 1 - -/obj/machinery/computer/supplycomp/Topic(href, href_list) - if(!supply_shuttle) - world.log << "## ERROR: Eek. The supply_shuttle controller datum is missing somehow." - return - if(..()) - return - - if(isturf(loc) && ( in_range(src, usr) || istype(usr, /mob/living/silicon) ) ) - usr.set_machine(src) - - //Calling the shuttle - if(href_list["send"]) - if(!supply_shuttle.can_move()) - if(supply_shuttle.shuttle_loan) - temp = "The supply shuttle must be docked to send new commands.
Main Menu" - else - temp = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.
Main Menu" - - else if(supply_shuttle.at_station) - if(href_list["loan"] && supply_shuttle.shuttle_loan) - if(!supply_shuttle.shuttle_loan.dispatched) - supply_shuttle.sell() - supply_shuttle.send() - supply_shuttle.shuttle_loan.loan_shuttle() - temp = "The supply shuttle has been loaned to Centcom.
Main Menu" - post_signal("supply") - else - temp = "You can not loan the supply shuttle at this time.
Main Menu" - else - temp = "The supply shuttle has departed.
Main Menu" - supply_shuttle.moving = -1 - supply_shuttle.sell() - supply_shuttle.send() - investigate_log("[usr.key] has sent the supply shuttle away. Remaining points: [supply_shuttle.points]. Shuttle contents:[supply_shuttle.sold_atoms].", "cargo") - else - if(href_list["loan"] && supply_shuttle.shuttle_loan) - if(!supply_shuttle.shuttle_loan.dispatched) - supply_shuttle.shuttle_loan.loan_shuttle() - temp = "The supply shuttle has been loaned to Centcom.
Main Menu" - post_signal("supply") - else - temp = "You can not loan the supply shuttle at this time.
Main Menu" - else - supply_shuttle.buy() - temp = "The supply shuttle has been called and will arrive in [round(supply_shuttle.movetime/600,1)] minutes.
Main Menu" - supply_shuttle.moving = 1 - supply_shuttle.eta_timeofday = (world.timeofday + supply_shuttle.movetime) % 864000 - post_signal("supply") - - else if (href_list["order"]) - if(supply_shuttle.moving) return - if(href_list["order"] == "categories") - //all_supply_groups - //Request what? - last_viewed_group = "categories" - temp = "
" - temp += "Select a category
" - for(var/cat in all_supply_groups ) - temp += "[get_supply_group_name(cat)]
" - else - last_viewed_group = href_list["order"] - var/cat = text2num(last_viewed_group) - temp = "
" - temp += "Request from: [get_supply_group_name(cat)]
" - for(var/supply_name in supply_shuttle.supply_packs ) - var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] - if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) //Have to send the type instead of a reference to - continue //the obj because it would get caught by the garbage - temp += "[supply_name] Cost: [N.cost]
" - - /*temp = "Supply points: [supply_shuttle.points]
Request what?
" - - for(var/supply_name in supply_shuttle.supply_packs ) - var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] - if(N.hidden && !hacked) continue - if(N.contraband && !can_order_contraband) continue - temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - temp += "
OK"*/ - - else if (href_list["doorder"]) - if(world.time < reqtime) - say("[world.time - reqtime] seconds remaining until another requisition form may be printed.") - return - - //Find the correct supply_pack datum - var/datum/supply_packs/P = supply_shuttle.supply_packs[href_list["doorder"]] - if(!istype(P) || (P.hidden && !hacked) || (P.contraband && !can_order_contraband)) //href exploit protection - return - - var/timeout = world.time + 600 - var/reason = stripped_input(usr,"Reason:","Why do you require this item?","") - if(world.time > timeout) return -// if(!reason) return - - var/idname = "*None Provided*" - var/idrank = "*None Provided*" - if(ishuman(usr)) - var/mob/living/carbon/human/H = usr - idname = H.get_authentification_name() - idrank = H.get_assignment() - else if(issilicon(usr)) - idname = usr.real_name - - supply_shuttle.ordernum++ - var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) - reqform.name = "requisition form - [P.name]" - reqform.info += "
[station_name] Supply Requisition Form
" - reqform.info += "INDEX: #[supply_shuttle.ordernum]
" - reqform.info += "REQUESTED BY: [idname]
" - reqform.info += "RANK: [idrank]
" - reqform.info += "REASON: [reason]
" - reqform.info += "SUPPLY CRATE TYPE: [P.name]
" - reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
" - reqform.info += "CONTENTS:
" - reqform.info += P.manifest - reqform.info += "
" - reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" - - reqform.update_icon() //Fix for appearing blank when printed. - reqtime = (world.time + 5) % 1e5 - - //make our supply_order datum - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = supply_shuttle.ordernum - O.object = P - O.orderedby = idname - supply_shuttle.requestlist += O - - temp = "Order request placed.
" - temp += "
Back | Main Menu | Authorize Order" - - else if(href_list["confirmorder"]) - //Find the correct supply_order datum - var/ordernum = text2num(href_list["confirmorder"]) - var/datum/supply_order/O - var/datum/supply_packs/P - temp = "Invalid Request" - for(var/i=1, i<=supply_shuttle.requestlist.len, i++) - var/datum/supply_order/SO = supply_shuttle.requestlist[i] - if(SO && SO.ordernum == ordernum) - O = SO - P = O.object - if(supply_shuttle.points >= P.cost) - supply_shuttle.requestlist.Cut(i,i+1) - supply_shuttle.points -= P.cost - supply_shuttle.shoppinglist += O - temp = "Thanks for your order." - investigate_log("[usr.key] has authorized an order for [P.name]. Remaining points: [supply_shuttle.points].", "cargo") - else - temp = "Not enough supply points." - break - temp += "
Back Main Menu" - - else if (href_list["vieworders"]) - temp = "Main Menu
Current approved orders:
" - for(var/S in supply_shuttle.shoppinglist) - var/datum/supply_order/SO = S - temp += "#[SO.ordernum] - [SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]
"// (Cancel)
" - temp += "
Main Menu" -/* - else if (href_list["cancelorder"]) - var/datum/supply_order/remove_supply = href_list["cancelorder"] - supply_shuttle_shoppinglist -= remove_supply - supply_shuttle_points += remove_supply.object.cost - temp += "Canceled: [remove_supply.object.name]
" - - for(var/S in supply_shuttle_shoppinglist) - var/datum/supply_order/SO = S - temp += "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""] (Cancel)
" - temp += "
Main Menu" -*/ - else if (href_list["viewrequests"]) - temp = "Current requests:
" - for(var/S in supply_shuttle.requestlist) - var/datum/supply_order/SO = S - temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] [supply_shuttle.moving ? "":supply_shuttle.at_station ? "":"Approve Remove"]
" - - temp += "
Clear list" - temp += "
Main Menu" - - else if (href_list["rreq"]) - var/ordernum = text2num(href_list["rreq"]) - temp = "Invalid Request.
" - for(var/i=1, i<=supply_shuttle.requestlist.len, i++) - var/datum/supply_order/SO = supply_shuttle.requestlist[i] - if(SO && SO.ordernum == ordernum) - supply_shuttle.requestlist.Cut(i,i+1) - temp = "Request removed.
" - break - temp += "
Back Main Menu" - - else if (href_list["clearreq"]) - supply_shuttle.requestlist.Cut() - temp = "List cleared.
" - temp += "
Main Menu" - - else if (href_list["mainmenu"]) - temp = null - - add_fingerprint(usr) - updateUsrDialog() - return - -/obj/machinery/computer/supplycomp/proc/post_signal(var/command) - - var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) - - if(!frequency) return - - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = 1 - status_signal.data["command"] = command - - frequency.post_signal(src, status_signal) - - -/obj/machinery/computer/supplycomp/say_quote(text) - return "flashes, \"[text]\"" - - diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index 729db3c2c17..923eff76e7f 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -1,7 +1,7 @@ //TODO: rewrite and standardise all controller datums to the datum/controller type //TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done -/client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply Shuttle")) +/client/proc/restart_controller(controller in list("Master","Failsafe")) set category = "Debug" set name = "Restart Controller" set desc = "Restart one of the various periodic loop controllers for the game (be careful!)" @@ -17,18 +17,12 @@ if("Failsafe") new /datum/controller/failsafe() feedback_add_details("admin_verb","RFailsafe") - if("Lighting") - new /datum/controller/lighting() - lighting_controller.process() - feedback_add_details("admin_verb","RLighting") - if("Supply Shuttle") - supply_shuttle.process() - feedback_add_details("admin_verb","RSupply") + message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.") return -/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Garbage","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras", "Events")) +/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Jobs","Radio","Configuration", "Cameras")) set category = "Debug" set name = "Debug Controller" set desc = "Debug the various periodic loop controllers for the game (be careful!)" @@ -37,48 +31,24 @@ switch(controller) if("Master") debug_variables(master_controller) - feedback_add_details("admin_verb","DMC") + if("Failsafe") debug_variables(Failsafe) - feedback_add_details("admin_verb","DFailsafe") + if("Ticker") debug_variables(ticker) - feedback_add_details("admin_verb","DTicker") - if("Lighting") - debug_variables(lighting_controller) - feedback_add_details("admin_verb","DLighting") - if("Garbage") - debug_variables(garbage) - feedback_add_details("admin_verb","DGarbage") - if("Air") - debug_variables(air_master) - feedback_add_details("admin_verb","DAir") + if("Jobs") - debug_variables(job_master) - feedback_add_details("admin_verb","DJobs") - if("Sun") - debug_variables(sun) - feedback_add_details("admin_verb","DSun") + debug_variables(SSjob) + if("Radio") debug_variables(radio_controller) - feedback_add_details("admin_verb","DRadio") - if("Supply Shuttle") - debug_variables(supply_shuttle) - feedback_add_details("admin_verb","DSupply") - if("Emergency Shuttle") - debug_variables(emergency_shuttle) - feedback_add_details("admin_verb","DEmergency") + if("Configuration") debug_variables(config) - feedback_add_details("admin_verb","DConf") - if("pAI") - debug_variables(paiController) - feedback_add_details("admin_verb","DpAI") + if("Cameras") debug_variables(cameranet) - feedback_add_details("admin_verb","DCameras") - if("Events") - debug_variables(events) - feedback_add_details("admin_verb","DEvents") + message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") return diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index a394b2c666a..cd55cc37db9 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -128,7 +128,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease /datum/disease/proc/process() if(!holder) - active_diseases -= src + SSdisease.processing -= src return if(prob(infectivity)) @@ -169,7 +169,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease cure() return - active_diseases += src + SSdisease.processing += src /datum/disease/proc/IsSame(var/datum/disease/D) @@ -187,7 +187,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease /datum/disease/Del() - active_diseases.Remove(src) + SSdisease.processing.Remove(src) ..() diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 50da4ca82f2..f61acbb4470 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -402,7 +402,7 @@ var/list/advance_cures = list( D.AssignName(new_name) D.Refresh() - for(var/datum/disease/advance/AD in active_diseases) + for(var/datum/disease/advance/AD in SSdisease.processing) AD.Refresh() for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) @@ -420,7 +420,7 @@ var/list/advance_cures = list( /* /mob/verb/test() - for(var/datum/disease/D in active_diseases) + for(var/datum/disease/D in SSdisease.processing) src << "[D.name] - [D.holder]" */ diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 156984be285..fdd1842460d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -66,7 +66,7 @@ if(current) //remove ourself from our old body's mind variable current.mind = null - nanomanager.user_transferred(current, new_character) + SSnano.user_transferred(current, new_character) if(key) if(new_character.key != key) //if we're transfering into a body with a key associated which is not ours diff --git a/code/datums/sun.dm b/code/datums/sun.dm deleted file mode 100644 index e1081a946ec..00000000000 --- a/code/datums/sun.dm +++ /dev/null @@ -1,57 +0,0 @@ -#define SOLAR_UPDATE_TIME 600 //duration between two updates of the whole sun/solars positions - -/datum/sun - var/angle - var/dx - var/dy - var/rate - var/list/solars // for debugging purposes, references solars_list at the constructor - var/solar_next_update // last time the sun position was checked and adjusted - -/datum/sun/New() - - solars = solars_list - rate = rand(50,200)/100 // 50% - 200% of standard rotation - if(prob(50)) // same chance to rotate clockwise than counter-clockwise - rate = -rate - solar_next_update = world.time // init the timer - angle = rand (0,360) // the station position to the sun is randomised at round start - -// calculate the sun's position given the time of day -// at the standard rate (100%) the angle is increase/decreased by 6 degrees every minute. -// a full rotation thus take a game hour in that case -/datum/sun/proc/calc_position() - - if(world.time < solar_next_update) //if less than 60 game secondes have passed, do nothing - return; - - angle = (360 + angle + rate * 6) % 360 // increase/decrease the angle to the sun, adjusted by the rate - - solar_next_update += SOLAR_UPDATE_TIME // since we updated the angle, set the proper time for the next loop - - // now calculate and cache the (dx,dy) increments for line drawing - - var/s = sin(angle) - var/c = cos(angle) - - // Either "abs(s) < abs(c)" or "abs(s) >= abs(c)" - // In both cases, the greater is greater than 0, so, no "if 0" check is needed for the divisions - - if( abs(s) < abs(c)) - - dx = s / abs(c) - dy = c / abs(c) - - else - dx = s/abs(s) - dy = c / abs(s) - - //now tell the solar control computers to update their status and linked devices - for(var/obj/machinery/power/solar_control/SC in solars_list) - if(!SC.powernet) - solars_list.Remove(SC) - continue - SC.update() - - - diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 13ebd0e529f..2e34238fe2c 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -582,6 +582,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat, /obj/item/weapon/reagent_containers/glass/bottle/brainrot, /obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion, + /obj/item/weapon/reagent_containers/glass/bottle/anxiety, + /obj/item/weapon/reagent_containers/glass/bottle/beesease, /obj/item/weapon/storage/box/syringes, /obj/item/weapon/storage/box/beakers, /obj/item/weapon/reagent_containers/glass/bottle/mutagen) diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm index 06c076af6ac..24f6436c353 100644 --- a/code/defines/procs/statistics.dm +++ b/code/defines/procs/statistics.dm @@ -110,14 +110,7 @@ proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H) log_game("SQL ERROR during death reporting. Error : \[[err]\]\n") -proc/statistic_cycle() - if(!config.sql_enabled) - return - while(1) - sql_poll_players() - sleep(600) - sql_poll_admins() - sleep(6000) // Poll every ten minutes + //This proc is used for feedback. It is executed at round end. proc/sql_commit_feedback() diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 7d3cd7b4440..b948a035658 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -59,23 +59,14 @@ var/list/teleportlocs = list() proc/process_teleport_locs() for(var/area/AR in world) - if(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station) || istype(AR, /area/wizard_station)) continue + if(istype(AR, /area/shuttle) || istype(AR, /area/wizard_station)) continue if(teleportlocs.Find(AR.name)) continue var/turf/picked = pick(get_area_turfs(AR.type)) if (picked.z == 1) teleportlocs += AR.name teleportlocs[AR.name] = AR - var/not_in_order = 0 - do - not_in_order = 0 - if(teleportlocs.len <= 1) - break - for(var/i = 1, i <= (teleportlocs.len - 1), i++) - if(sorttext(teleportlocs[i], teleportlocs[i+1]) == -1) - teleportlocs.Swap(i, i+1) - not_in_order = 1 - while(not_in_order) + sortTim(teleportlocs, /proc/cmp_text_dsc) var/list/ghostteleportlocs = list() @@ -90,16 +81,7 @@ proc/process_ghost_teleport_locs() ghostteleportlocs += AR.name ghostteleportlocs[AR.name] = AR - var/not_in_order = 0 - do - not_in_order = 0 - if(ghostteleportlocs.len <= 1) - break - for(var/i = 1, i <= (ghostteleportlocs.len - 1), i++) - if(sorttext(ghostteleportlocs[i], ghostteleportlocs[i+1]) == -1) - ghostteleportlocs.Swap(i, i+1) - not_in_order = 1 - while(not_in_order) + sortTim(ghostteleportlocs, /proc/cmp_text_dsc) /*-----------------------------------------------------------------------------*/ @@ -135,166 +117,15 @@ proc/process_ghost_teleport_locs() //place to another. Look at escape shuttle for example. //All shuttles show now be under shuttle since we have smooth-wall code. -/area/shuttle //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS. +/area/shuttle + name = "\improper Shuttle" requires_power = 0 luminosity = 1 - lighting_use_dynamic = 0 - var/push_dir = SOUTH - var/destination - -/area/shuttle/arrival - name = "\improper Arrival Shuttle" - -/area/shuttle/arrival/pre_game - icon_state = "shuttle2" - destination = /area/shuttle/arrival/station - -/area/shuttle/arrival/station - icon_state = "shuttle" - destination = /area/shuttle/arrival/pre_game - -/area/shuttle/escape - name = "\improper Emergency Shuttle" - -/area/shuttle/escape/station - name = "\improper Emergency Shuttle Station" - icon_state = "shuttle2" - destination = /area/shuttle/escape/transit - -/area/shuttle/escape/centcom - name = "\improper Emergency Shuttle Centcom" - icon_state = "shuttle" - destination = /area/shuttle/escape/station - -/area/shuttle/escape/transit // the area to pass through for 3 minute transit - name = "\improper Emergency Shuttle Transit" - icon_state = "shuttle" - destination = /area/shuttle/escape/centcom - -/area/shuttle/escape_pod1 - name = "\improper Escape Pod One" - -/area/shuttle/escape_pod1/station - icon_state = "shuttle2" - destination = /area/shuttle/escape_pod1/transit - -/area/shuttle/escape_pod1/centcom - icon_state = "shuttle" - destination = /area/shuttle/escape_pod1/station - -/area/shuttle/escape_pod1/transit - icon_state = "shuttle" - destination = /area/shuttle/escape_pod1/centcom + lighting_use_dynamic = 1 + has_gravity = 1 - mob_activate(var/mob/living/L) - push_mob_back(L, push_dir) - -/area/shuttle/escape_pod2 - name = "\improper Escape Pod Two" - -/area/shuttle/escape_pod2/station - icon_state = "shuttle2" - destination = /area/shuttle/escape_pod2/transit - -/area/shuttle/escape_pod2/centcom - icon_state = "shuttle" - destination = /area/shuttle/escape_pod2/station - -/area/shuttle/escape_pod2/transit - icon_state = "shuttle" - destination = /area/shuttle/escape_pod2/centcom - - mob_activate(var/mob/living/L) - push_mob_back(L, push_dir) - -/area/shuttle/escape_pod3 - name = "\improper Escape Pod Three" - push_dir = WEST - -/area/shuttle/escape_pod3/station - icon_state = "shuttle2" - destination = /area/shuttle/escape_pod3/transit - -/area/shuttle/escape_pod3/centcom - icon_state = "shuttle" - destination = /area/shuttle/escape_pod3/station - -/area/shuttle/escape_pod3/transit - icon_state = "shuttle" - destination = /area/shuttle/escape_pod3/centcom - - mob_activate(var/mob/living/L) - push_mob_back(L, push_dir) - -/area/shuttle/escape_pod4 //Renaming areas 2hard - name = "\improper Escape Pod Four" - push_dir = WEST - -/area/shuttle/escape_pod4/station - icon_state = "shuttle2" - destination = /area/shuttle/escape_pod4/transit - -/area/shuttle/escape_pod4/centcom - icon_state = "shuttle" - destination = /area/shuttle/escape_pod4/station - -/area/shuttle/escape_pod4/transit - icon_state = "shuttle" - destination = /area/shuttle/escape_pod4/centcom - - mob_activate(var/mob/living/L) - push_mob_back(L, push_dir) - -/area/shuttle/mining - name = "\improper Mining Shuttle" - -/area/shuttle/mining/station - icon_state = "shuttle2" - destination = /area/shuttle/mining/outpost - -/area/shuttle/mining/outpost - icon_state = "shuttle" - destination = /area/shuttle/mining/station - -/area/shuttle/laborcamp - name = "\improper Labor Camp Shuttle" - -/area/shuttle/laborcamp/station - icon_state = "shuttle" - destination = /area/shuttle/laborcamp/outpost - -/area/shuttle/laborcamp/outpost - icon_state = "shuttle" - destination = /area/shuttle/laborcamp/station - -/area/shuttle/transport1/centcom - icon_state = "shuttle" - name = "\improper Transport Shuttle Centcom" - destination = /area/shuttle/transport1/station - -/area/shuttle/transport1/station - icon_state = "shuttle" - name = "\improper Transport Shuttle" - destination = /area/shuttle/transport1/centcom - -/area/shuttle/prison/ - name = "\improper Prison Shuttle" - -/area/shuttle/specops/centcom - name = "\improper Special Ops Shuttle" - icon_state = "shuttlered" - destination = /area/shuttle/specops/station - -/area/shuttle/specops/station - name = "\improper Special Ops Shuttle" - icon_state = "shuttlered2" - destination = /area/shuttle/specops/centcom - -/area/shuttle/thunderdome - name = "honk" - -/area/start // will be unused once kurper gets his login interface patch done +/area/start name = "start area" icon_state = "start" requires_power = 0 @@ -302,8 +133,6 @@ proc/process_ghost_teleport_locs() lighting_use_dynamic = 0 has_gravity = 1 -// === end remove - // CENTCOM /area/centcom @@ -410,52 +239,6 @@ proc/process_ghost_teleport_locs() //ENEMY -//names are used -/area/syndicate_station - name = "\improper Syndicate Station" - icon_state = "yellow" - requires_power = 0 - -/area/syndicate_station/start - name = "\improper Syndicate Forward Operating Base" - icon_state = "yellow" - has_gravity = 1 - -/area/syndicate_station/southwest - name = "\improper south-west of SS13" - icon_state = "southwest" - -/area/syndicate_station/northwest - name = "\improper north-west of SS13" - icon_state = "northwest" - -/area/syndicate_station/northeast - name = "\improper north-east of SS13" - icon_state = "northeast" - -/area/syndicate_station/southeast - name = "\improper south-east of SS13" - icon_state = "southeast" - -/area/syndicate_station/north - name = "\improper north of SS13" - icon_state = "north" - -/area/syndicate_station/south - name = "\improper south of SS13" - icon_state = "south" - -/area/syndicate_station/commssat - name = "\improper south of the communication satellite" - icon_state = "south" - -/area/syndicate_station/mining - name = "\improper north east of the mining asteroid" - icon_state = "north" - -/area/syndicate_station/transit - name = "\improper hyperspace" - icon_state = "shuttle" /area/wizard_station name = "\improper Wizard's Den" @@ -1530,6 +1313,126 @@ proc/process_ghost_teleport_locs() + +//Hallways +/area/hallway/primary/fore + name = "Fore Hallway" + +/area/hallway/primary/forecentral + name = "Fore Central Hallway" + icon_state = "hallfc" + +/area/hallway/primary/starboard + name = "Starboard Hallway" + +/area/hallway/primary/aft + name = "Aft Hallway" + +/area/hallway/primary/aftcentral + name = "Aft Central Hallway" + icon_state = "hallac" + +/area/hallway/primary/port + name = "Port Hallway" + +/area/hallway/primary/portcentral + name = "Port Central Hallway" + icon_state = "hallpc" + + + + +//Maintenance +/area/maintenance/brig + name = "Brig Maintenance" + icon_state = "brigmaint" + +/area/maintenance/eva + name = "EVA Maintenance" + icon_state = "evamaint" + +/area/maintenance/rd + name = "Research Division Maintenance" + icon_state = "rdmaint" + +/area/maintenance/cargo + name = "Cargo Bay Maintenance" + icon_state = "cargomaint" + +/area/maintenance/medbay + name = "Medbay Maintenance" + icon_state = "medmaint" + +/area/maintenance/bridge + name = "Bridge Maintenance" + icon_state = "bridgemaint" + +/area/maintenance/telecomm + name = "Telecommunications Maintenance" + icon_state = "tcommaint" + +/area/maintenance/bar + name = "Bar Maintenance" + icon_state = "barmaint" + +/area/maintenance/port_interior + name = "Port Interior Maintenance" + icon_state = "pimaint" + +/area/maintenance/aft_interior + name = "Aft Interior Maintenance" + icon_state = "aimaint" + +/area/maintenance/fore_interior + name = "Fore Interior Maintenance" + icon_state = "fimaint" + +/area/maintenance/recycler + name = "Recycler" + icon_state = "recycler" + +/area/maintenance/transit + icon_state = "transit" + +/area/maintenance/transit/fore_port + name = "Fore Port Transit Station" + +/area/maintenance/transit/fore_starboard + name = "Fore Starboard Transit Station" + +/area/maintenance/transit/aft_port + name = "Aft Port Transit Station" + +/area/maintenance/transit/aft_starboard + name = "Aft Starboard Transit Station" + + + + +//Head Quarters +/area/crew_quarters/cmo + name = "Chief Medical Officer's Quarters" + icon_state = "cmo" + +/area/crew_quarters/ce + name = "Chief Engineer's Quarters" + icon_state = "ce" + +/area/crew_quarters/rd + name = "Research Director's Quarters" + icon_state = "rd" + +/area/crew_quarters/hos + name = "Head of Security's Quarters" + icon_state = "hos" + +/area/crew_quarters/hop + name = "Head of Personnel's Quarters" + icon_state = "hop" + + + + // Away Missions /area/awaymission name = "\improper Strange Location" @@ -1759,28 +1662,11 @@ proc/process_ghost_teleport_locs() // CENTCOM var/list/centcom_areas = list ( - /area/centcom, - /area/shuttle/escape/centcom, - /area/shuttle/escape_pod1/centcom, - /area/shuttle/escape_pod2/centcom, - /area/shuttle/escape_pod3/centcom, - /area/shuttle/escape_pod4/centcom, - /area/shuttle/transport1/centcom, - /area/shuttle/specops/centcom, + /area/centcom ) //SPACE STATION 13 var/list/the_station_areas = list ( - /area/shuttle/arrival, - /area/shuttle/escape/station, - /area/shuttle/escape_pod1/station, - /area/shuttle/escape_pod2/station, - /area/shuttle/escape_pod3/station, - /area/shuttle/escape_pod4/station, - /area/shuttle/mining/station, - /area/shuttle/transport1/station, -// /area/shuttle/transport2/station, //not present on map - /area/shuttle/specops/station, /area/atmos, /area/maintenance, /area/hallway, diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 827a8fe8e73..c70e912e6b0 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -346,9 +346,6 @@ if(L.&& L.client) L.client.played = 0 -/area/proc/mob_activate(var/mob/living/L) - return - /proc/has_gravity(atom/AT, turf/T) if(!T) T = get_turf(AT) @@ -362,7 +359,7 @@ if(T && gravity_generators["[T.z]"] && length(gravity_generators["[T.z]"])) return 1 return 0 - +/* /area/proc/clear_docking_area() var/list/dstturfs = list() var/throwy = world.maxy @@ -398,3 +395,4 @@ if(ismob(bug)) continue qdel(bug)*/ +*/ diff --git a/code/game/communications.dm b/code/game/communications.dm index fdaedb6ec11..08a79d05af5 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -64,7 +64,6 @@ so i made radios not use the radio controller. */ var/list/all_radios = list() - /proc/add_radio(var/obj/item/radio, freq) if(!freq || !radio) return @@ -181,48 +180,8 @@ var/const/RADIO_CLEANBOT = "10" var/const/RADIO_FLOORBOT = "11" var/const/RADIO_MEDBOT = "12" -var/global/datum/controller/radio/radio_controller +/datum/radio_frequency -datum/controller/radio - var/list/datum/radio_frequency/frequencies = list() - -datum/controller/radio/proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null) - var/f_text = num2text(new_frequency) - var/datum/radio_frequency/frequency = frequencies[f_text] - - if(!frequency) - frequency = new - frequency.frequency = new_frequency - frequencies[f_text] = frequency - - frequency.add_listener(device, filter) - return frequency - -datum/controller/radio/proc/remove_object(obj/device, old_frequency) - var/f_text = num2text(old_frequency) - var/datum/radio_frequency/frequency = frequencies[f_text] - - if(frequency) - frequency.remove_listener(device) - - if(frequency.devices.len == 0) - frequencies -= f_text - del(frequency) - - return 1 - -datum/controller/radio/proc/return_frequency(var/new_frequency as num) - var/f_text = num2text(new_frequency) - var/datum/radio_frequency/frequency = frequencies[f_text] - - if(!frequency) - frequency = new - frequency.frequency = new_frequency - frequencies[f_text] = frequency - - return frequency - -datum/radio_frequency var/frequency as num var/list/list/obj/devices = list() @@ -263,19 +222,23 @@ datum/radio_frequency/proc/add_listener(obj/device as obj, var/filter as text|nu if (!filter) filter = "_default" - if(!devices[filter]) - devices[filter] = list() - devices[filter] += device + var/list/devices_line = devices[filter] + if(!devices_line) + devices_line = list() + devices[filter] = devices_line + devices_line += device datum/radio_frequency/proc/remove_listener(obj/device) for(var/devices_filter in devices) var/list/devices_line = devices[devices_filter] - devices_line -= device - - if (devices_line.len==0) + if(!devices_line) devices -= devices_filter - del(devices_line) + devices_line -= device + if(!devices_line.len) + devices -= devices_filter + + var/list/pointers = list() diff --git a/code/game/dna.dm b/code/game/dna.dm index 8f77b850d01..399c8360ff6 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -92,7 +92,6 @@ if(istype(character)) real_name = character.real_name . += md5(character.real_name) - reg_dna[.] = real_name else . += repeat_string(DNA_UNIQUE_ENZYMES_LEN, "0") return . diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 903a983e7df..dd78119d0a8 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -99,16 +99,12 @@ var/list/blob_nodes = list() for(var/datum/mind/blob in infected_crew) greet_blob(blob) - if(emergency_shuttle) - emergency_shuttle.always_fake_recall = 1 + SSshuttle.emergencyAlwaysFakeRecall = 1 // Disable the blob event for this round. - if(events) - var/datum/round_event_control/blob/B = locate() in events.control - if(B) - B.max_occurrences = 0 // disable the event - else - ERROR("Events variable is null in blob gamemode post setup.") + var/datum/round_event_control/blob/B = locate() in SSevent.control + if(B) + B.max_occurrences = 0 // disable the event spawn(0) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index fd3ce5d5a5b..a5c9f6a8d1c 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -11,7 +11,7 @@ /obj/effect/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2) blob_cores += src - processing_objects.Add(src) + SSobj.processing.Add(src) if(!overmind) create_overmind(new_overmind) point_rate = new_rate @@ -22,7 +22,7 @@ blob_cores -= src if(overmind) qdel(overmind) - processing_objects.Remove(src) + SSobj.processing.Remove(src) ..() /obj/effect/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index 1b615aed0a8..e2ec5fea7f3 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -8,7 +8,7 @@ /obj/effect/blob/node/New(loc, var/h = 100) blob_nodes += src - processing_objects.Add(src) + SSobj.processing.Add(src) ..(loc, h) /obj/effect/blob/node/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) @@ -16,7 +16,7 @@ /obj/effect/blob/node/Destroy() blob_nodes -= src - processing_objects.Remove(src) + SSobj.processing.Remove(src) ..() /obj/effect/blob/node/Life() diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 8d6f84746df..a02321d79b1 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -260,7 +260,7 @@ ..() if(ismob(loc)) loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") - processing_objects += src + SSobj.processing += src /obj/item/clothing/suit/space/changeling/dropped() qdel(src) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index f2bc4034ad2..de9e1540a1a 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -169,7 +169,7 @@ var/list/sacrificed = list() return var/narsie_type = /obj/singularity/narsie/large // Moves narsie if she was already summoned. - var/obj/her = locate(narsie_type, machines) + var/obj/her = locate(narsie_type, SSmachine.processing) if(her) her.loc = get_turf(src) return diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 7974819cefb..03a424efb75 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -95,79 +95,13 @@ /datum/game_mode/proc/check_finished() //to be called by ticker - if(emergency_shuttle.location==2 || station_was_nuked) + if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked) return 1 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 - var/escaped_on_pod_1 = 0 - var/escaped_on_pod_2 = 0 - var/escaped_on_pod_3 = 0 - var/escaped_on_pod_5 = 0 - var/escaped_on_shuttle = 0 - - var/list/area/escape_locations = list(/area/shuttle/escape/centcom, /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod4/centcom) - - for(var/mob/M in player_list) - if(M.client) - clients++ - if(ishuman(M)) - if(!M.stat) - surviving_humans++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) - escaped_humans++ - if(!M.stat) - surviving_total++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) - escaped_total++ - - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape/centcom) - escaped_on_shuttle++ - - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod1/centcom) - escaped_on_pod_1++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod2/centcom) - escaped_on_pod_2++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod3/centcom) - escaped_on_pod_3++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod4/centcom) - escaped_on_pod_5++ - - if(isobserver(M)) - ghosts++ - - if(clients > 0) - feedback_set("round_end_clients",clients) - if(ghosts > 0) - feedback_set("round_end_ghosts",ghosts) - if(surviving_humans > 0) - feedback_set("survived_human",surviving_humans) - if(surviving_total > 0) - feedback_set("survived_total",surviving_total) - if(escaped_humans > 0) - feedback_set("escaped_human",escaped_humans) - if(escaped_total > 0) - feedback_set("escaped_total",escaped_total) - if(escaped_on_shuttle > 0) - feedback_set("escaped_on_shuttle",escaped_on_shuttle) - if(escaped_on_pod_1 > 0) - feedback_set("escaped_on_pod_1",escaped_on_pod_1) - if(escaped_on_pod_2 > 0) - feedback_set("escaped_on_pod_2",escaped_on_pod_2) - if(escaped_on_pod_3 > 0) - feedback_set("escaped_on_pod_3",escaped_on_pod_3) - if(escaped_on_pod_5 > 0) - feedback_set("escaped_on_pod_5",escaped_on_pod_5) - send2irc("Server", "Round just ended.") - return 0 diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 4ca3488ed64..cd57bdcef61 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -339,7 +339,7 @@ C.upgradeMotion() upgraded = 1 // Add it to machines that process - machines |= C + SSmachine.processing |= C//machines |= C if(upgraded) UC.uses -- diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 3ea9dc6294c..ea5984776d3 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -83,8 +83,7 @@ if(alert(AI_mind.current,"Do you want to use an alternative sprite for your real core?",,"Yes","No")=="Yes") AI_mind.current.icon_state = "ai-malf2" */ - if(emergency_shuttle) - emergency_shuttle.always_fake_recall = 1 + SSshuttle.emergencyAlwaysFakeRecall = 1 ..() @@ -97,9 +96,9 @@ malf.current << "When you feel you have enough APCs under your control, you may begin the takeover attempt." return -/datum/game_mode/malfunction/process() +/datum/game_mode/malfunction/process(seconds) if ((apcs > 0) && malf_mode_declared) - AI_win_timeleft -= apcs * last_tick_duration //Victory timer de-increments based on how many APCs are hacked + AI_win_timeleft -= apcs * seconds //Victory timer de-increments based on how many APCs are hacked ..() if (AI_win_timeleft<=0) check_win() @@ -147,8 +146,7 @@ return 1 if (is_malf_ai_dead()) if(config.continuous_round_malf) - if(emergency_shuttle) - emergency_shuttle.always_fake_recall = 0 + SSshuttle.emergencyAlwaysFakeRecall = 0 malf_mode_declared = 0 else return 1 @@ -214,7 +212,7 @@ /datum/game_mode/malfunction/declare_completion() var/malf_dead = is_malf_ai_dead() - var/crew_evacuated = (emergency_shuttle.location==2) + var/crew_evacuated = (SSshuttle.emergency.mode >= SHUTTLE_ENDGAME) if ( station_captured && station_was_nuked) feedback_set_details("round_end_result","win - AI win - nuke") diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index c7d9e07e3ae..2ae7f0fcece 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -27,18 +27,17 @@ /datum/game_mode/meteor/declare_completion() var/text var/survivors = 0 + for(var/mob/living/player in player_list) if(player.stat != DEAD) - var/turf/location = get_turf(player.loc) - if(!location) continue - switch(location.loc.type) - if( /area/shuttle/escape/centcom ) - text += "
[player.real_name] escaped on the emergency shuttle" - if( /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod4/centcom ) - text += "
[player.real_name] escaped in a life pod." - else - text += "
[player.real_name] survived but is stranded without any hope of rescue." - survivors++ + ++survivors + + var/turf/T = get_turf(player) + if(T && T.z == ZLEVEL_CENTCOM) + text += "
[player.real_name] escaped to the safety of Centcom." + else + text += "
[player.real_name] survived but is stranded without any hope of rescue." + if(survivors) world << "The following survived the meteor storm:[text]" diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 44abc4ce462..026e1e60d2f 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -210,7 +210,7 @@ if(!is_type_in_list(disk_area, centcom_areas)) disk_rescued = 0 break - var/crew_evacuated = (emergency_shuttle.location==2) + var/crew_evacuated = (SSshuttle.emergency.mode >= SHUTTLE_ENDGAME) //var/operatives_are_dead = is_operatives_are_dead() diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 0741a7c099c..d17ba590709 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -185,35 +185,33 @@ var/bomb_set else off_station = 2 - if(ticker) - if(ticker.mode && ticker.mode.name == "nuclear emergency") - var/obj/machinery/computer/syndicate_station/syndie_location = locate(/obj/machinery/computer/syndicate_station) - if(syndie_location) - ticker.mode:syndies_didnt_escape = (syndie_location.z > 1 ? 0 : 1) //muskets will make me change this, but it will do for now - ticker.mode:nuke_off_station = off_station - ticker.station_explosion_cinematic(off_station,null) - if(ticker.mode) - ticker.mode.explosion_in_progress = 0 - if(ticker.mode.name == "nuclear emergency") - ticker.mode:nukes_left -- - else - world << "The station was destoyed by the nuclear blast!" + if(ticker.mode && ticker.mode.name == "nuclear emergency") + var/obj/docking_port/mobile/Shuttle = SSshuttle.getShuttle("syndicate") + ticker.mode:syndies_didnt_escape = (Shuttle && Shuttle.z == ZLEVEL_CENTCOM) ? 0 : 1 + ticker.mode:nuke_off_station = off_station + ticker.station_explosion_cinematic(off_station,null) + if(ticker.mode) + ticker.mode.explosion_in_progress = 0 + if(ticker.mode.name == "nuclear emergency") + ticker.mode:nukes_left -- + else + world << "The station was destoyed by the nuclear blast!" - ticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. - //kinda shit but I couldn't get permission to do what I wanted to do. + ticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. + //kinda shit but I couldn't get permission to do what I wanted to do. - if(!ticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is - world << "Resetting in 30 seconds!" + if(!ticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is + world << "Resetting in 30 seconds!" - feedback_set_details("end_error","nuke - unhandled ending") + feedback_set_details("end_error","nuke - unhandled ending") - if(blackbox) - blackbox.save_all_data_to_sql() - sleep(300) - log_game("Rebooting due to nuclear detonation") - kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked - world.Reboot() - return + if(blackbox) + blackbox.save_all_data_to_sql() + sleep(300) + log_game("Rebooting due to nuclear detonation") + kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked + world.Reboot() + return return @@ -227,7 +225,7 @@ var/bomb_set /obj/item/weapon/disk/nuclear/New() ..() - processing_objects.Add(src) + SSobj.processing.Add(src) /obj/item/weapon/disk/nuclear/process() var/turf/disk_loc = get_turf(src) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 84f5828ea77..95762bc270b 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -160,7 +160,7 @@ /obj/item/weapon/pinpointer/nukeop var/mode = 0 //Mode 0 locates disk, mode 1 locates the shuttle - var/obj/machinery/computer/syndicate_station/home = null + var/obj/docking_port/mobile/home /obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob) @@ -220,7 +220,7 @@ visible_message("Authentication Disk Locator active.") return if(!home) - home = locate() + home = SSshuttle.getShuttle("syndicate") if(!home) icon_state = "pinonnull" return diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 6661498627b..f990d3c0bf5 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -109,19 +109,10 @@ datum/objective/maroon/check_completion() if(target && target.current) if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 - var/area/A = get_area(target.current) - if(istype(A, /area/shuttle/escape/centcom)) + + var/turf/T = get_turf(target.current) + if(T.z == ZLEVEL_CENTCOM) return 0 - if(istype(A, /area/shuttle/escape_pod1/centcom)) - return 0 - if(istype(A, /area/shuttle/escape_pod2/centcom)) - return 0 - if(istype(A, /area/shuttle/escape_pod3/centcom)) - return 0 - if(istype(A, /area/shuttle/escape_pod4/centcom)) - return 0 - else - return 1 return 1 datum/objective/maroon/update_explanation_text() @@ -198,21 +189,22 @@ datum/objective/hijack datum/objective/hijack/check_completion() if(!owner.current || owner.current.stat) return 0 - if(emergency_shuttle.location<2) + if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) return 0 if(issilicon(owner.current)) return 0 - var/area/shuttle = locate(/area/shuttle/escape/centcom) - if(!(get_turf(owner.current) in shuttle)) + var/area/A = get_area(owner.current) + if(SSshuttle.emergency.areaInstance != A) return 0 - var/list/protected_mobs = list(/mob/living/silicon/ai, /mob/living/silicon/pai) for(var/mob/living/player in player_list) - if(player.type in protected_mobs) continue - if (player.mind && (player.mind != owner)) - if(player.stat != DEAD) //they're not dead! - if(get_turf(player) in shuttle) + if(player.mind && player.mind != owner) + if(player.stat != DEAD) + switch(player.type) + if(/mob/living/silicon/ai, /mob/living/silicon/pai) + continue + if(get_area(player) == A) return 0 return 1 @@ -224,20 +216,20 @@ datum/objective/block datum/objective/block/check_completion() if(!istype(owner.current, /mob/living/silicon)) return 0 - if(emergency_shuttle.location<2) - return 0 - if(!owner.current) - return 0 - var/area/shuttle = locate(/area/shuttle/escape/centcom) - var/protected_mobs[] = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/silicon/robot) - for(var/mob/living/player in player_list) - if(player.type in protected_mobs) continue - if (player.mind) - if (player.stat != 2) - if (get_turf(player) in shuttle) - return 0 - return 1 + if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) + return 1 + var/area/A = SSshuttle.emergency.areaInstance + + for(var/mob/living/player in player_list) + if(istype(player, /mob/living/silicon)) + continue + if(player.mind) + if(player.stat != DEAD) + if(get_area(player) == A) + return 0 + + return 1 datum/objective/escape @@ -249,30 +241,21 @@ datum/objective/escape/check_completion() return 0 if(isbrain(owner.current)) return 0 - if(emergency_shuttle.location<2) + if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) return 0 - if(!owner.current || owner.current.stat ==2) + if(!owner.current || owner.current.stat == DEAD) return 0 - var/turf/location = get_turf(owner.current.loc) + var/turf/location = get_turf(owner.current) if(!location) return 0 if(istype(location, /turf/simulated/shuttle/floor4)) // Fails traitors if they are in the shuttle brig -- Polymorph return 0 - var/area/check_area = location.loc - if(istype(check_area, /area/shuttle/escape/centcom)) + if(location.z == ZLEVEL_CENTCOM) return 1 - if(istype(check_area, /area/shuttle/escape_pod1/centcom)) - return 1 - if(istype(check_area, /area/shuttle/escape_pod2/centcom)) - return 1 - if(istype(check_area, /area/shuttle/escape_pod3/centcom)) - return 1 - if(istype(check_area, /area/shuttle/escape_pod4/centcom)) - return 1 - else - return 0 + + return 0 datum/objective/escape/escape_with_identity dangerrating = 10 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 0e85d73d4a5..9b4a21fbc92 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -90,8 +90,7 @@ for(var/datum/mind/rev_mind in head_revolutionaries) greet_revolutionary(rev_mind) modePlayer += head_revolutionaries - if(emergency_shuttle) - emergency_shuttle.always_fake_recall = 1 + SSshuttle.emergencyAlwaysFakeRecall = 1 ..() @@ -208,8 +207,7 @@ /datum/game_mode/revolution/check_finished() if(config.continuous_round_rev) if(finished != 0) - if(emergency_shuttle) - emergency_shuttle.always_fake_recall = 0 + SSshuttle.emergencyAlwaysFakeRecall = 0 return ..() if(finished != 0) return 1 diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 8ebb488267a..4d8371d517d 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -14,5 +14,4 @@ /datum/game_mode/sandbox/post_setup() ..() - if(emergency_shuttle) - emergency_shuttle.always_fake_recall = 1 + SSshuttle.emergencyAlwaysFakeRecall = 1 diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index faa5086be54..2e5721b5fe7 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -1,5 +1,4 @@ -/proc/setupgenetics() - +/datum/subsystem/ticker/proc/setupGenetics() var/list/avnums = new /list(DNA_STRUC_ENZYMES_BLOCKS) for(var/i=1, i<=DNA_STRUC_ENZYMES_BLOCKS, i++) avnums[i] = i @@ -15,18 +14,17 @@ else if(B.quality == MINOR_NEGATIVE) not_good_mutations |= B -/proc/setupfactions() - +/datum/subsystem/ticker/proc/setupFactions() // Populate the factions list: - for(var/x in typesof(/datum/faction)) - var/datum/faction/F = new x + for(var/typepath in typesof(/datum/faction)) + var/datum/faction/F = new typepath() if(!F.name) - del(F) + qdel(F) continue else - ticker.factions.Add(F) - ticker.availablefactions.Add(F) + factions.Add(F) + availablefactions.Add(F) // Populate the syndicate coalition: - for(var/datum/faction/syndicate/S in ticker.factions) - ticker.syndicate_coalition.Add(S) + for(var/datum/faction/syndicate/S in factions) + syndicate_coalition.Add(S) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index ce62a41a371..0f6cae92702 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -58,7 +58,7 @@ var/cowsleft = 20 /obj/effect/rend/cow/New() - processing_objects.Add(src) + SSobj.processing.Add(src) return /obj/effect/rend/cow/process() diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm new file mode 100644 index 00000000000..add82be53ea --- /dev/null +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -0,0 +1,130 @@ +/datum/game_mode/wizard/raginmages + name = "ragin' mages" + config_tag = "raginmages" + required_players = 20 + var/max_mages = 0 + var/making_mage = 0 + var/mages_made = 1 + var/time_checked = 0 + +/datum/game_mode/wizard/announce() + world << "The current game mode is - Ragin' Mages!" + world << "The Space Wizard Federation is pissed, help defeat all the space wizards!" + +/datum/game_mode/wizard/raginmages/post_setup() + var/playercount = 0 + ..() + if(!max_mages) + for(var/mob/living/player in mob_list) + if (player.client && player.stat != 2) + playercount += 1 + max_mages = round(playercount / 2) + +/datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) + if (you_are) + wizard.current << "You are the Space Wizard!" + wizard.current << "The Space Wizards Federation has given you the following tasks:" + + var/obj_count = 1 + wizard.current << "Objective Alpha: Make sure the station pays for its actions against our diplomats" + for(var/datum/objective/objective in wizard.objectives) + wizard.current << "Objective #[obj_count]: [objective.explanation_text]" + obj_count++ + return + +/datum/game_mode/wizard/raginmages/check_finished() + var/wizards_alive = 0 + for(var/datum/mind/wizard in wizards) + if(!istype(wizard.current,/mob/living/carbon)) + continue + if(istype(wizard.current,/mob/living/carbon/brain)) + continue + if(wizard.current.stat==2) + continue + if(wizard.current.stat==1) + if(wizard.current.health < 0) + wizard.current << "The Space Wizard Federation is upset with your performance and have terminated your employment." + wizard.current.stat = 2 + continue + wizards_alive++ + + if (wizards_alive) + if(!time_checked) time_checked = world.time + if(world.time > time_checked + 500 && (mages_made < max_mages)) + time_checked = world.time + make_more_mages() + else + if(wizards.len >= max_mages) + finished = 1 + return 1 + else + make_more_mages() + return ..() + +/datum/game_mode/wizard/raginmages/proc/make_more_mages() + + if(making_mage) + return 0 + if(mages_made >= max_mages) + return 0 + making_mage = 1 + mages_made++ + var/list/mob/dead/observer/candidates = list() + var/mob/dead/observer/theghost = null + spawn(rand(100, 200)) + message_admins("SWF is still pissed, sending another wizard - [max_mages - mages_made] left.") + for(var/mob/dead/observer/G in player_list) + if(G.client && !G.client.holder && !G.client.is_afk() && G.client.prefs.be_special & BE_WIZARD) + if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate")) + candidates += G + if(!candidates.len) + message_admins("No applicable ghosts for the next ragin' mage, asking ghosts instead.") + var/time_passed = world.time + for(var/mob/dead/observer/G in player_list) + if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate")) + spawn(0) + switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No")) + if("Yes") + if((world.time-time_passed)>300)//If more than 30 game seconds passed. + continue + candidates += G + if("No") + continue + + sleep(300) + if(!candidates.len) + message_admins("This is awkward, sleeping until another mage check...") + making_mage = 0 + mages_made-- + return + else + shuffle(candidates) + for(var/mob/i in candidates) + if(!i || !i.client) continue //Dont bother removing them from the list since we only grab one wizard + + theghost = i + break + + if(theghost) + var/mob/living/carbon/human/new_character= makeBody(theghost) + new_character.mind.make_Wizard() + making_mage = 0 + return 1 + +/datum/game_mode/wizard/raginmages/declare_completion() + if(finished) + feedback_set_details("round_end_result","loss - wizard killed") + world << "The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!" + ..(1) + +/datum/game_mode/wizard/raginmages/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character + if(!G_found || !G_found.key) return + + //First we spawn a dude. + var/mob/living/carbon/human/new_character = new(pick(latejoin))//The mob being spawned. + + G_found.client.prefs.copy_to(new_character) + ready_dna(new_character) + new_character.key = G_found.key + + return new_character diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index b953d45005d..d6d3aadad1a 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -134,19 +134,18 @@ H << "You suddenly feel lucky." /proc/summonevents() - if(events) //if there isn't something is very wrong - if(!events.wizardmode) - events.frequency_lower = 600 //1 minute lower bound - events.frequency_upper = 3000 //5 minutes upper bound - events.toggleWizardmode() - events.reschedule() + if(!SSevent.wizardmode) + SSevent.frequency_lower = 600 //1 minute lower bound + SSevent.frequency_upper = 3000 //5 minutes upper bound + SSevent.toggleWizardmode() + SSevent.reschedule() - else //Speed it up - events.frequency_lower = round(events.frequency_lower * 0.8) //1 minute | 48 seconds | 34.8 seconds | 30.7 seconds | 24.6 seconds - events.frequency_upper = round(events.frequency_upper * 0.6) //5 minutes | 3 minutes | 1 minute 48 seconds | 1 minute 4.8 seconds | 38.9 seconds - if(events.frequency_upper < events.frequency_lower) - events.frequency_upper = events.frequency_lower //this can't happen unless somehow multiple spellbooks are used, but just in case + else //Speed it up + SSevent.frequency_lower = round(SSevent.frequency_lower * 0.8) //1 minute | 48 seconds | 34.8 seconds | 30.7 seconds | 24.6 seconds + SSevent.frequency_upper = round(SSevent.frequency_upper * 0.6) //5 minutes | 3 minutes | 1 minute 48 seconds | 1 minute 4.8 seconds | 38.9 seconds + if(SSevent.frequency_upper < SSevent.frequency_lower) + SSevent.frequency_upper = SSevent.frequency_lower //this can't happen unless somehow multiple spellbooks are used, but just in case - events.reschedule() - message_admins("Summon Events intensifies, events will now occur every [events.frequency_lower / 600] to [events.frequency_upper / 600] minutes.") - log_game("Summon Events was increased!") + SSevent.reschedule() + message_admins("Summon Events intensifies, events will now occur every [SSevent.frequency_lower / 600] to [SSevent.frequency_upper / 600] minutes.") + log_game("Summon Events was increased!") diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 1f545ddfeda..8b687b283b9 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -38,8 +38,8 @@ dat += "
" dat += "Learn and Improve Magical Abilities
" dat += "Summon Magical Tools and Weapons
" - dat += "Raise The Stakes For More Power
" - + if(ticker.mode != "raginmages") // we totally need summon guns x 200 + dat += "Raise The Stakes For More Power
" dat += "
" dat += "Re-memorize Spells
" @@ -559,4 +559,4 @@ /obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob) ..() user <<"[src] suddenly feels very warm!" - empulse(src, 1, 1) \ No newline at end of file + empulse(src, 1, 1) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 9e16d3f3b29..18ab0009f58 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1081,7 +1081,7 @@ FIRE ALARM src.alarm() src.time = 0 src.timing = 0 - processing_objects.Remove(src) + SSobj.processing.Remove(src) src.updateDialog() last_process = world.timeofday return @@ -1159,7 +1159,7 @@ FIRE ALARM else if (href_list["time"]) src.timing = text2num(href_list["time"]) last_process = world.timeofday - processing_objects.Add(src) + SSobj.processing.Add(src) else if (href_list["tp"]) var/tp = text2num(href_list["tp"]) src.time += tp diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 770bef55673..1253c55cd19 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -97,7 +97,7 @@ /obj/machinery/bot/New() ..() - aibots += src //Global bot list + SSbot.processing += src //Global bot list botcard = new /obj/item/weapon/card/id(src) set_custom_texts() Radio = new /obj/item/device/radio(src) @@ -118,7 +118,7 @@ /obj/machinery/bot/proc/explode() - aibots -= src + SSbot.processing -= src qdel(src) /obj/machinery/bot/proc/healthcheck() diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 58012daaf90..fa9295b00e8 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -19,7 +19,6 @@ icon_state = "id_mod" item_state = "electronic" origin_tech = "programming=2" - var/id = null var/frequency = null var/build_path = null var/board_type = "computer" @@ -74,12 +73,10 @@ name = "circuit board (Communications)" build_path = /obj/machinery/computer/communications origin_tech = "programming=2;magnets=2" - var/cooldown = 0 -/obj/item/weapon/circuitboard/communications/New() - ..() - processing_objects |= src -/obj/item/weapon/circuitboard/communications/process() - cooldown = max(cooldown - 1, 0) + var/lastTimeUsed = 0 +/obj/item/weapon/circuitboard/communications/proc/cooldownLeft(deciseconds=600) + return max(deciseconds - (world.time - lastTimeUsed), 0) + /obj/item/weapon/circuitboard/card name = "circuit board (ID Console)" build_path = /obj/machinery/computer/card @@ -204,7 +201,8 @@ /obj/item/weapon/circuitboard/shuttle name = "circuit board (Shuttle)" build_path = /obj/machinery/computer/shuttle - id = "1" + var/shuttleId + var/possible_destinations = "" /obj/item/weapon/circuitboard/labor_shuttle name = "circuit Board (Labor Shuttle)" build_path = /obj/machinery/computer/shuttle/labor @@ -276,9 +274,11 @@ /obj/item/weapon/circuitboard/shuttle/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/device/multitool)) - var/chosen_id = round(input(usr, "Choose an ID number:", "Input an Integer", null) as num|null) + var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null) if(chosen_id >= 0) - id = chosen_id + shuttleId = chosen_id + else + shuttleId = initial(shuttleId) return /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index bb6d6a5972c..f8dd1fc0ddd 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -121,7 +121,7 @@ var/time_last_changed_position = 0 ID = 1 else ID = 0 - for(var/datum/job/job in job_master.occupations) + for(var/datum/job/job in SSjob.occupations) dat += "
\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]" @@ -351,21 +350,20 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 switch(src.state) if(STATE_DEFAULT) if (src.authenticated) - if(emergency_shuttle.recall_count > 1) - if(emergency_shuttle.last_call_loc) - dat += "
Most recent shuttle call/recall traced to: [format_text(emergency_shuttle.last_call_loc.name)]" - else - dat += "
Unable to trace most recent shuttle call/recall signal." + if(SSshuttle.emergencyLastCallLoc) + dat += "
Most recent shuttle call/recall traced to: [format_text(SSshuttle.emergencyLastCallLoc.name)]" + else + dat += "
Unable to trace most recent shuttle call/recall signal." dat += "
Logged in as: [auth_id]" dat += "
" dat += "
\[ Log Out \]
" dat += "
General Functions" dat += "
\[ Message List \]" - if(emergency_shuttle.location==0) - if (emergency_shuttle.online) - dat += "
\[ Cancel Shuttle Call \]" - else + switch(SSshuttle.emergency.mode) + if(SHUTTLE_IDLE, SHUTTLE_RECALL) dat += "
\[ Call Emergency Shuttle \]" + else + dat += "
\[ Cancel Shuttle Call \]" dat += "
\[ Set Status Display \]" if (src.authenticated==2) @@ -481,18 +479,17 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/dat = "" switch(src.aistate) if(STATE_DEFAULT) - if(emergency_shuttle.recall_count > 1) - if(emergency_shuttle.last_call_loc) - dat += "
Latest emergency signal trace attempt successful.
Last signal origin: [format_text(emergency_shuttle.last_call_loc.name)].
" - else - dat += "
Latest emergency signal trace attempt failed.
" + if(SSshuttle.emergencyLastCallLoc) + dat += "
Latest emergency signal trace attempt successful.
Last signal origin: [format_text(SSshuttle.emergencyLastCallLoc.name)].
" + else + dat += "
Latest emergency signal trace attempt failed.
" if(authenticated) dat += "Current login: [auth_id]" else dat += "Current login: None" dat += "
General Functions" dat += "
\[ Message List \]" - if(emergency_shuttle.location==0 && !emergency_shuttle.online) + if(SSshuttle.emergency.mode <= SHUTTLE_IDLE) dat += "
\[ Call Emergency Shuttle \]" dat += "
\[ Set Status Display \]" dat += "
Special Functions" @@ -569,60 +566,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 log_say("[key_name(user)] has made a priority announcement: [input]") message_admins("[key_name_admin(user)] has made a priority announcement.") -/proc/call_shuttle_proc(var/mob/user, var/call_reason) - if ((!( ticker ) || emergency_shuttle.location)) - return - if(world.time - round_start_time < config.shuttle_refuel_delay) - user << "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again." - return - if(emergency_shuttle.direction == -1) - user << "The emergency shuttle may not be called while returning to Centcom." - return - - if(emergency_shuttle.online) - user << "The emergency shuttle is already on its way." - return - - call_reason = strip_html_properly(trim(call_reason)) - - if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) - user << "You must provide a reason." - return - - var/area/signal_origin = get_area(user) - var/emergency_reason = "\nNature of emergency:\n\n[call_reason]" - if (seclevel2num(get_security_level()) == SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. - emergency_shuttle.incall(0.6, signal_origin, emergency_reason, 1) - else - emergency_shuttle.incall(1, signal_origin, emergency_reason, 0) - - log_game("[key_name(user)] has called the shuttle.") - message_admins("[key_name_admin(user)] has called the shuttle.") - - return - - -/proc/cancel_call_proc(var/mob/user) - if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0)) - return - if(ticker.mode.name == "meteor") - return - - if ((seclevel2num(get_security_level()) == SEC_LEVEL_RED)) - if (emergency_shuttle.timeleft() < SHUTTLEARRIVETIME / 4) - return - else if (emergency_shuttle.timeleft() < SHUTTLEARRIVETIME / 2) - return - - - if(emergency_shuttle.direction != -1 && emergency_shuttle.online) //check that shuttle isn't already heading to centcom - var/area/signal_origin = get_area(user) - emergency_shuttle.recall(signal_origin) - log_game("[key_name(user)] has recalled the shuttle.") - message_admins("[key_name_admin(user)] has recalled the shuttle.") - return 1 - return /obj/machinery/computer/communications/proc/post_status(var/command, var/data1, var/data2) @@ -647,6 +591,6 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 /obj/machinery/computer/communications/Destroy() shuttle_caller_list -= src - emergency_shuttle.autoshuttlecall() + SSshuttle.autoEvac() ..() diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 56a58073c79..cc2d97ddd95 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -3,12 +3,19 @@ desc = "For shuttle control." icon_state = "shuttle" var/auth_need = 3.0 - var/list/authorized = list( ) + var/list/authorized = list() /obj/machinery/computer/emergency_shuttle/attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob) if(stat & (BROKEN|NOPOWER)) return - if (!( istype(W, /obj/item/weapon/card) ) || !( ticker ) || emergency_shuttle.location != DOCKED || !( user ) || emergency_shuttle.timeleft() < 11) return + if(!istype(W, /obj/item/weapon/card)) + return + if(SSshuttle.emergency.mode != SHUTTLE_DOCKED) + return + if(!user) + return + if(SSshuttle.emergency.timeLeft() < 11) + return if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (istype(W, /obj/item/device/pda)) var/obj/item/device/pda/pda = W @@ -27,26 +34,22 @@ return 0 var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") - if(emergency_shuttle.location != DOCKED && user.get_active_hand() != W) + if(SSshuttle.emergency.mode != SHUTTLE_DOCKED || user.get_active_hand() != W) return 0 switch(choice) if("Authorize") - src.authorized -= W:registered_name - src.authorized += W:registered_name + src.authorized |= W:registered_name if (src.auth_need - src.authorized.len > 0) message_admins("[key_name(user.client)](?) has authorized early shuttle launch in ([x],[y],[z] - JMP)",0,1) log_game("[user.ckey]([user]) has authorized early shuttle launch in ([x],[y],[z])") minor_announce("[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early",null,1) else - var/time = emergency_shuttle.timeleft() + var/time = SSshuttle.emergency.timeLeft() message_admins("[key_name(user.client)](?) has launched the emergency shuttle in ([x],[y],[z] - JMP) [time] seconds before launch.",0,1) log_game("[user.ckey]([user]) has launched the emergency shuttle in ([x],[y],[z]) [time] seconds before launch.") minor_announce("The emergency shuttle will launch in 10 seconds",null,1) - emergency_shuttle.online = 1 - emergency_shuttle.settimeleft(10) - //src.authorized = null - del(src.authorized) - src.authorized = list( ) + SSshuttle.emergency.setTimer(100) + authorized.Cut() if("Repeal") src.authorized -= W:registered_name @@ -56,19 +59,88 @@ minor_announce("All authorizations to launch the shuttle early have been revoked.") src.authorized.len = 0 src.authorized = list( ) - return /obj/machinery/computer/emergency_shuttle/emag_act(mob/user as mob) - var/choice = alert(user, "Would you like to launch the shuttle?","Shuttle control", "Launch", "Cancel") - if(!emagged) - if(emergency_shuttle.location == DOCKED) - switch(choice) - if("Launch") - var/time = emergency_shuttle.timeleft() - message_admins("[key_name(user.client)](?) has emagged the emergency shuttle in ([x],[y],[z] - JMP) [time] seconds before launch.",0,1) - log_game("[user.ckey]([user]) has emagged the emergency shuttle in ([x],[y],[z]) [time] seconds before launch.") - minor_announce("The emergency shuttle will launch in 10 seconds", "SYSTEM ERROR:",null,1) - emergency_shuttle.settimeleft( 10 ) - emagged = 1 - if("Cancel") - return \ No newline at end of file + if(!emagged && SSshuttle.emergency.mode == SHUTTLE_DOCKED) + var/time = SSshuttle.emergency.timeLeft() + message_admins("[key_name(user.client)](?) has emagged the emergency shuttle in ([x],[y],[z] - JMP) [time] seconds before launch.",0,1) + log_game("[user.ckey]([user]) has emagged the emergency shuttle in ([x],[y],[z]) [time] seconds before launch.") + minor_announce("The emergency shuttle will launch in 10 seconds", "SYSTEM ERROR:",null,1) + SSshuttle.emergency.setTimer(100) + emagged = 1 + +/obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY + name = "plastic flaps" + desc = "Definitely can't get past those. No way." + icon = 'icons/obj/stationobjs.dmi' //Change this. + icon_state = "plasticflaps" + density = 0 + anchored = 1 + layer = 4 + +/obj/structure/plasticflaps/CanPass(atom/movable/A, turf/T) + if(istype(A) && A.checkpass(PASSGLASS)) + return prob(60) + + var/obj/structure/stool/bed/B = A + if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass + return 0 + + else if(istype(A, /mob/living)) // You Shall Not Pass! + var/mob/living/M = A + if(!M.lying && !istype(M, /mob/living/carbon/monkey) && !istype(M, /mob/living/carbon/slime)) //If your not laying down, or a small creature, no pass. + return 0 + return ..() + +/obj/structure/plasticflaps/ex_act(severity) + ..() + switch(severity) + if (1) + qdel(src) + if (2) + if (prob(50)) + qdel(src) + if (3) + if (prob(5)) + qdel(src) + +/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates + name = "airtight plastic flaps" + desc = "Heavy duty, airtight, plastic flaps." + +/obj/structure/plasticflaps/mining/New() //set the turf below the flaps to block air + var/turf/T = get_turf(loc) + if(T) + T.blocks_air = 1 + ..() + +/obj/structure/plasticflaps/mining/Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor //wow this is terrible + var/turf/T = get_turf(loc) + if(T) + if(istype(T, /turf/simulated/floor)) + T.blocks_air = 0 + ..() + +/obj/machinery/computer/supplycomp + name = "supply shuttle console" + desc = "Used to order supplies." + icon = 'icons/obj/computer.dmi' + icon_state = "supply" + req_access = list(access_cargo) + circuit = /obj/item/weapon/circuitboard/supplycomp + var/temp = null + var/reqtime = 0 //Cooldown for requisitions - Quarxink + var/hacked = 0 + var/can_order_contraband = 0 + var/last_viewed_group = "categories" + + +/obj/machinery/computer/ordercomp + name = "supply ordering console" + desc = "Used to order supplies from cargo staff." + icon = 'icons/obj/computer.dmi' + icon_state = "request" + circuit = /obj/item/weapon/circuitboard/ordercomp + var/temp = null + var/reqtime = 0 //Cooldown for requisitions - Quarxink + var/last_viewed_group = "categories" \ No newline at end of file diff --git a/code/game/machinery/computer/syndicate_shuttle.dm b/code/game/machinery/computer/syndicate_shuttle.dm index 2c2b34faf52..086e657be43 100644 --- a/code/game/machinery/computer/syndicate_shuttle.dm +++ b/code/game/machinery/computer/syndicate_shuttle.dm @@ -1,97 +1,11 @@ -#define SYNDICATE_SHUTTLE_MOVE_TIME 240 -#define SYNDICATE_SHUTTLE_COOLDOWN 200 - -/var/area/synd_shuttle_curr_location -/var/synd_shuttle_moving = 0 -/var/synd_shuttle_lastMove = 0 - -/obj/machinery/computer/syndicate_station +/obj/machinery/computer/shuttle/syndicate name = "syndicate shuttle terminal" - icon = 'icons/obj/computer.dmi' icon_state = "syndishuttle" req_access = list(access_syndicate) - var/recall_only = 0 -/obj/machinery/computer/syndicate_station/recall + shuttleId = "syndicate" + possible_destinations = "syndicate_away;syndicate_mining;syndicate_commsat;home_ne;home_nw;home_n;home_se;home_sw;home_s" + +/obj/machinery/computer/shuttle/syndicate/recall name = "syndicate shuttle recall terminal" - recall_only = 1 - -/obj/machinery/computer/syndicate_station/New() - synd_shuttle_curr_location= locate(/area/syndicate_station/start) - - -/obj/machinery/computer/syndicate_station/proc/syndicate_move_to(area/destination as area) - if(synd_shuttle_moving) return - if(synd_shuttle_lastMove + SYNDICATE_SHUTTLE_COOLDOWN > world.time) return - var/area/dest_location = locate(destination) - if(synd_shuttle_curr_location == dest_location) return - - synd_shuttle_moving = 1 - synd_shuttle_lastMove = world.time - - if(synd_shuttle_curr_location.z != dest_location.z) - var/area/transit_location = locate(/area/syndicate_station/transit) - synd_shuttle_curr_location.move_contents_to(transit_location) - synd_shuttle_curr_location = transit_location - synd_shuttle_curr_location.has_gravity = 0 - transit_location.has_gravity = 1 - sleep(SYNDICATE_SHUTTLE_MOVE_TIME) - - synd_shuttle_curr_location.move_contents_to(dest_location) - synd_shuttle_curr_location = dest_location - synd_shuttle_moving = 0 - return 1 - -/obj/machinery/computer/syndicate_station/attack_hand(mob/user as mob) - if(!allowed(user)) - user << "Access Denied." - return - - user.set_machine(src) - - var/dat = {"Location: [synd_shuttle_curr_location]
- Ready to move[max(synd_shuttle_lastMove + SYNDICATE_SHUTTLE_COOLDOWN - world.time, 0) ? " in [max(round((synd_shuttle_lastMove + SYNDICATE_SHUTTLE_COOLDOWN - world.time) * 0.1), 0)] seconds" : ": now"]
- Syndicate Space
"} - if(!recall_only) - dat += {"North West of SS13 | - North of SS13 | - North East of SS13
- South West of SS13 | - South of SS13 | - South East of SS13
- North East of the Mining Asteroid
- Close"} - - user << browse(dat, "window=computer;size=575x450") - onclose(user, "computer") - return - - -/obj/machinery/computer/syndicate_station/Topic(href, href_list) - if(..()) - return - - var/mob/living/user = usr - - user.set_machine(src) - - if(href_list["syndicate"]) - syndicate_move_to(/area/syndicate_station/start) - else if(!recall_only) - if(href_list["station_nw"]) - syndicate_move_to(/area/syndicate_station/northwest) - else if(href_list["station_n"]) - syndicate_move_to(/area/syndicate_station/north) - else if(href_list["station_ne"]) - syndicate_move_to(/area/syndicate_station/northeast) - else if(href_list["station_sw"]) - syndicate_move_to(/area/syndicate_station/southwest) - else if(href_list["station_s"]) - syndicate_move_to(/area/syndicate_station/south) - else if(href_list["station_se"]) - syndicate_move_to(/area/syndicate_station/southeast) - else if(href_list["mining"]) - syndicate_move_to(/area/syndicate_station/mining) - - updateUsrDialog() - return \ No newline at end of file + possible_destinations = "syndicate_away" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 24312770103..0931108c7d9 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -174,7 +174,7 @@ beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list... data["beakerContents"] = beakerContents - var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, ui_key) + var/datum/nanoui/ui = SSnano.get_open_ui(user, src, ui_key) if (!ui) // the ui does not exist, so we'll create a new one ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 410) @@ -205,7 +205,7 @@ if(href_list["close"]) if(close_machine() == usr) - var/datum/nanoui/ui = nanomanager.get_open_ui(usr, src, "main") + var/datum/nanoui/ui = SSnano.get_open_ui(usr, src, "main") ui.close() on = 1 if(href_list["switchOff"]) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 6cd81597496..a536e5a485e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -896,7 +896,8 @@ About the new airlock wires panel: if(do_after(user,40,5,1)) if(density && !operating)//Door must be closed to weld. if( !istype(src, /obj/machinery/door/airlock) || !user || !W || !W.isOn() || !user.loc ) - return playsound(loc, 'sound/items/Welder2.ogg', 50, 1) + return + playsound(loc, 'sound/items/Welder2.ogg', 50, 1) welded = !welded user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ "You've [welded ? "welded the airlock shut":"unwelded the airlock"].") diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 9b86745a5a4..df568fa4a23 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -17,6 +17,7 @@ var/normalspeed = 1 var/heat_proof = 0 // For glass airlocks/opacity firedoors var/emergency = 0 // Emergency access override + var/sub_door = 0 // 1 if it's meant to go under another door. /obj/machinery/door/New() ..() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index c775105c5b6..fb3673b7e07 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -12,6 +12,7 @@ glass = 1 var/blocked = 0 var/nextstate = null + sub_door = 1 /obj/machinery/door/firedoor/Bumped(atom/AM) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 3f77034be02..24114f29b09 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -5,6 +5,7 @@ icon_state = "closed" var/id = 1 var/auto_close = 0 // Time in seconds to automatically close when opened, 0 if it doesn't. + sub_door = 1 /obj/machinery/door/poddoor/preopen icon_state = "open" @@ -22,12 +23,12 @@ /obj/machinery/door/poddoor/attackby(obj/item/I, mob/user) add_fingerprint(user) - if(!istype(I, /obj/item/weapon/crowbar)) - return if(istype(I, /obj/item/weapon/twohanded/fireaxe)) var/obj/item/weapon/twohanded/fireaxe/F = I if(!F.wielded) return + else if(!istype(I, /obj/item/weapon/crowbar)) + return if(stat & NOPOWER) open(1) //ignore the usual power requirement. diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index ed7c4eb85cf..08d947dabe6 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -115,10 +115,12 @@ Class Procs: /obj/machinery/New() ..() machines += src + SSmachine.processing += src auto_use_power() /obj/machinery/Destroy() machines.Remove(src) + SSmachine.processing -= src if(occupant) open_machine() ..() diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 85fc2a42869..f9e55ea906e 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -786,18 +786,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob) -/* if (istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda) ) //Name verification for channels or messages - if(src.screen == 4 || src.screen == 5) - if( istype(I, /obj/item/device/pda) ) - var/obj/item/device/pda/P = I - if(P.id) - src.scanned_user = "[P.id.registered_name] ([P.id.assignment])" - src.screen=2 - else - var/obj/item/weapon/card/id/T = I - src.scanned_user = text("[T.registered_name] ([T.assignment])") - src.screen=2*/ //Obsolete after autorecognition - if(istype(I, /obj/item/weapon/wrench)) user << "Now [anchored ? "un" : ""]securing [name]" playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -809,26 +797,24 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if (src.isbroken) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) - for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] further abuses the shattered [src.name].") + src.loc.audible_message("[user.name] further abuses the shattered [src.name].", null, 5 ) else if(istype(I, /obj/item/weapon) ) user.do_attack_animation(src) var/obj/item/weapon/W = I + if(W.damtype == STAMINA) + return if(W.force <15) - for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." ) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) + src.loc.audible_message("[user.name] hits the [src.name] with the [W.name] with no visible effect.", null , 5 ) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else src.hitstaken++ if(src.hitstaken==3) - for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] smashes the [src.name]!" ) + src.loc.audible_message("[user.name] smashes the [src.name]!", null, 5 ) src.isbroken=1 playsound(src.loc, 'sound/effects/Glassbr3.ogg', 100, 1) else - for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) + src.loc.audible_message("[user.name] forcefully slams the [src.name] with the [I.name]!", null, 5 ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else user << "This does nothing." diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index cda18f4b731..274e2f948ac 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -79,13 +79,16 @@ if(0) //blank remove_display() if(1) //emergency shuttle timer - if(emergency_shuttle.online) + if(SSshuttle.emergency.timer) var/line1 var/line2 = get_shuttle_timer() - if(emergency_shuttle.location == 1) - line1 = "-ETD-" - else - line1 = "-ETA-" + switch(SSshuttle.emergency.mode) + if(SHUTTLE_DOCKED) + line1 = "-ETD-" + if(SHUTTLE_ESCAPE) + line1 = "-----" + else + line1 = "-ETA-" if(length(line2) > CHARS_PER_LINE) line2 = "Error!" update_display(line1, line2) @@ -114,17 +117,18 @@ index2 -= message2_len update_display(line1, line2) if(4) // supply shuttle timer - var/line1 = "CARGO" + var/line1 var/line2 - if(supply_shuttle.moving) + if(SSshuttle.supply.mode == SHUTTLE_IDLE) + if(SSshuttle.supply.z == ZLEVEL_STATION) + line1 = "CARGO" + line2 = "Docked" + else + line1 = "CARGO" line2 = get_supply_shuttle_timer() if(lentext(line2) > CHARS_PER_LINE) line2 = "Error" - else - if(supply_shuttle.at_station) - line2 = "Docked" - else - line1 = "" + update_display(line1, line2) /obj/machinery/status_display/examine(mob/user) @@ -160,18 +164,16 @@ maptext = new_text /obj/machinery/status_display/proc/get_shuttle_timer() - var/timeleft = emergency_shuttle.timeleft() - if(timeleft) + var/timeleft = SSshuttle.emergency.timeLeft() + if(timeleft > 0) return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]" - return "" + return "00:00" /obj/machinery/status_display/proc/get_supply_shuttle_timer() - if(supply_shuttle.moving) - var/timeleft = round((supply_shuttle.eta_timeofday - world.timeofday) / 10,1) - if(timeleft < 0) - return "Late" + var/timeleft = SSshuttle.supply.timeLeft() + if(timeleft > 0) return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]" - return "" + return "00:00" /obj/machinery/status_display/proc/remove_display() if(overlays.len) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index e108a29571a..4a6920fa50b 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -791,7 +791,7 @@ steam.start() -- spawns the effect spawn(3 + metal*3) process() spawn(120) - processing_objects.Remove(src) + SSobj.processing.Remove(src) sleep(30) if(metal) diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index cf337d71a7b..bf8231f637a 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -24,10 +24,10 @@ /obj/effect/forcefield/mime/New() ..() last_process = world.time - processing_objects.Add(src) + SSobj.processing.Add(src) /obj/effect/forcefield/mime/process() timeleft -= (world.time - last_process) if(timeleft <= 0) - processing_objects.Remove(src) + SSobj.processing.Remove(src) qdel(src) \ No newline at end of file diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 6464868921f..1fa64b3c89c 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -13,10 +13,6 @@ landmarks_list += src switch(name) //some of these are probably obsolete - if("shuttle") - shuttle_z = z - qdel(src) - return if("monkey") monkeystart += loc qdel(src) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index cf8854b4bcd..5fb37eb3ab7 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -81,7 +81,7 @@ /obj/effect/spider/eggcluster/New() pixel_x = rand(3,-3) pixel_y = rand(3,-3) - processing_objects.Add(src) + SSobj.processing.Add(src) /obj/effect/spider/eggcluster/process() amount_grown += rand(0,2) @@ -109,7 +109,7 @@ /obj/effect/spider/spiderling/New() pixel_x = rand(6,-6) pixel_y = rand(6,-6) - processing_objects.Add(src) + SSobj.processing.Add(src) /obj/effect/spider/spiderling/Bump(atom/user) if(istype(user, /obj/structure/table)) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 571002155a4..c91e0a1eb9a 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -72,13 +72,8 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa far_volume += (dist <= far_dist * 0.5 ? 50 : 0) // add 50 volume if the mob is pretty close to the explosion M.playsound_local(epicenter, 'sound/effects/explosionfar.ogg', far_volume, 1, frequency, falloff = 5) - - - var/lighting_controller_was_processing = lighting_controller.processing //Pause the lighting updates for a bit - lighting_controller.processing = 0 -// var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild -// if(defer_powernet_rebuild != 2) -// defer_powernet_rebuild = 1 + //postpone light processing for a bit + SSlighting.postpone() if(heavy_impact_range > 1) var/datum/effect/system/explosion/E = new/datum/effect/system/explosion() @@ -121,13 +116,6 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(Array) Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range) - sleep(8) - - if(!lighting_controller.processing) lighting_controller.processing = lighting_controller_was_processing -// if(!powernet_rebuild_was_deferred_already) -// if(defer_powernet_rebuild != 2) -// defer_powernet_rebuild = 0 - return 1 diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 4ba21eaa553..90d6b97cf2d 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -116,7 +116,6 @@ /area/centcom, /area/asteroid, /area/tdome, - /area/syndicate_station, /area/wizard_station, /area/prison ) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 2935773a75d..746d7892d30 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -54,7 +54,7 @@ for(var/mob/O in viewers(usr, null)) O.show_message(flavor_text, 1) SetLuminosity(CANDLE_LUMINOSITY) - processing_objects.Add(src) + SSobj.processing.Add(src) /obj/item/candle/process() diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index c38f0e68912..9f9b4164c3e 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -561,15 +561,29 @@ Code: menu = "
Supply Record Interlink
"
menu += "Supply shuttle
" - menu += "Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
" - menu += "Current approved orders:
- "
- for(var/S in supply_shuttle.shoppinglist)
+ menu += "Location: "
+ switch(SSshuttle.supply.mode)
+ if(SHUTTLE_CALL)
+ menu += "Moving to "
+ if(SSshuttle.supply.z != ZLEVEL_STATION)
+ menu += "station"
+ else
+ menu += "centcomm"
+ menu += " ([SSshuttle.supply.timeLeft(600)] Mins)"
+ else
+ menu += "At "
+ if(SSshuttle.supply.z != ZLEVEL_STATION)
+ menu += "centcomm"
+ else
+ menu += "station"
+ menu += "
- #[SO.ordernum] - [SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""] " menu += "
- #[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] " menu += "
- Adds emoji to OOC chat. +
Current approved orders:
- "
+ for(var/S in SSshuttle.shoppinglist)
var/datum/supply_order/SO = S
menu += "
- "
- for(var/S in supply_shuttle.requestlist)
+ for(var/S in SSshuttle.requestlist)
var/datum/supply_order/SO = S
menu += "
" dat += "Round Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]
" dat += "Emergency shuttle
" - if (!emergency_shuttle.online) + if(SSshuttle.emergency.mode < SHUTTLE_CALL) dat += "Call Shuttle
" else - var/timeleft = emergency_shuttle.timeleft() - if(emergency_shuttle.location == 0) + var/timeleft = SSshuttle.emergency.timeLeft() + if(SSshuttle.emergency.mode < SHUTTLE_DOCKED) dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" dat += "Send Back
" else diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 09adbfc8853..68dfb7ce36d 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -74,7 +74,7 @@ else if(href_list["forceevent"]) - var/datum/round_event_control/E = locate(href_list["forceevent"]) in events.control + var/datum/round_event_control/E = locate(href_list["forceevent"]) in SSevent.control if(E) var/datum/round_event/event = E.runEvent() if(event.announceWhen>0) @@ -187,34 +187,36 @@ switch(href_list["call_shuttle"]) if("1") - if ((!( ticker ) || emergency_shuttle.location)) + if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) return - emergency_shuttle.incall() + SSshuttle.emergency.request() log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station") if("2") - if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0)) + if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) return - switch(emergency_shuttle.direction) - if(-1) - emergency_shuttle.incall() - log_admin("[key_name(usr)] called the Emergency Shuttle") - message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station") - if(1) - emergency_shuttle.recall() + switch(SSshuttle.emergency.mode) + if(SHUTTLE_CALL) + SSshuttle.emergency.cancel() log_admin("[key_name(usr)] sent the Emergency Shuttle back") message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back") + else + SSshuttle.emergency.cancel() + log_admin("[key_name(usr)] called the Emergency Shuttle") + message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station") + href_list["secretsadmin"] = "check_antagonist" else if(href_list["edit_shuttle_time"]) if(!check_rights(R_SERVER)) return - emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num ) - log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]") - minor_announce("The emergency shuttle will reach its destination in [round(emergency_shuttle.timeleft()/60)] minutes.") - message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]") + var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", SSshuttle.emergency.timeLeft() ) as num + SSshuttle.emergency.setTimer(timer*10) + log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds") + minor_announce("The emergency shuttle will reach its destination in [round(SSshuttle.emergency.timeLeft(600))] minutes.") + message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds") href_list["secretsadmin"] = "check_antagonist" else if(href_list["delay_round_end"]) @@ -389,9 +391,6 @@ if(!M.ckey) //sanity usr << "This mob has no ckey" return - if(!job_master) - usr << "Job Master has not been setup!" - return var/dat = "" var/header = "
" @@ -1963,27 +1962,28 @@ usr << browse(dat, "window=lawchanges;size=800x500") if("check_antagonist") check_antagonists() + if("moveminingshuttle") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShM") - var/datum/shuttle_manager/s = shuttles["mining"] - if(istype(s)) s.move_shuttle(0) - message_admins("[key_name_admin(usr)] moved mining shuttle") - log_admin("[key_name(usr)] moved the mining shuttle") + if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away")) + message_admins("[key_name_admin(usr)] moved mining shuttle") + log_admin("[key_name(usr)] moved the mining shuttle") + if("movelaborshuttle") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShL") - var/datum/shuttle_manager/s = shuttles["laborcamp"] - if(istype(s)) s.move_shuttle(0) - message_admins("[key_name_admin(usr)] moved labor shuttle") - log_admin("[key_name(usr)] moved the labor shuttle") + if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away")) + message_admins("[key_name_admin(usr)] moved labor shuttle") + log_admin("[key_name(usr)] moved the labor shuttle") + if("moveferry") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShF") - var/datum/shuttle_manager/s = shuttles["ferry"] - if(istype(s)) s.move_shuttle(0) - message_admins("[key_name_admin(usr)] moved the centcom ferry") - log_admin("[key_name(usr)] moved the centcom ferry") + if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away")) + message_admins("[key_name_admin(usr)] moved the centcom ferry") + log_admin("[key_name(usr)] moved the centcom ferry") + if("kick_all_from_lobby") if(ticker && ticker.current_state == GAME_STATE_PLAYING) var/afkonly = text2num(href_list["afkonly"]) @@ -2051,11 +2051,11 @@ usr << browse(dat, "window=admin_log") if("list_job_debug") var/dat = "Job Debug info.
" - if(job_master) - for(var/line in job_master.job_debug) + if(SSjob) + for(var/line in SSjob.job_debug) dat += "[line]
" dat+= "*******
" - for(var/datum/job/job in job_master.occupations) + for(var/datum/job/job in SSjob.occupations) if(!job) continue dat += "job: [job.title], current_positions: [job.current_positions], total_positions: [job.total_positions]
" usr << browse(dat, "window=jobdebug;size=600x500") @@ -2085,7 +2085,7 @@ M.req_one_access = list(access_brig,access_engine) message_admins("[key_name_admin(usr)] made all maint doors engineering and brig access-only.") if("infinite_sec") - var/datum/job/J = job_master.GetJob("Security Officer") + var/datum/job/J = SSjob.GetJob("Security Officer") if(!J) return J.total_positions = -1 J.spawn_positions = -1 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index f5e123facdf..377ca974516 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -419,7 +419,7 @@ var/global/list/g_fancy_list_of_types = null /client/proc/cmd_debug_make_powernets() set category = "Debug" set name = "Make Powernets" - makepowernets() + SSpower.makepowernets() log_admin("[key_name(src)] has remade the powernet. makepowernets() called.") message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0) feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -611,9 +611,10 @@ var/global/list/g_fancy_list_of_types = null var/datum/job/jobdatum if (dresscode == "as job...") var/jobname = input("Select job", "Robust quick dress shop") as null|anything in get_all_jobs() - jobdatum = job_master.GetJob(jobname) if(isnull(jobname)) return + jobdatum = SSjob.GetJob(jobname) + feedback_add_details("admin_verb","SEQ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! for (var/obj/item/I in M) @@ -1051,8 +1052,8 @@ var/global/list/g_fancy_list_of_types = null var/dat = "List of things that failed to GC this round
" - for(var/path in garbage.logging) - dat += "[path] - [garbage.logging[path]] times
" + for(var/path in SSgarbage.logging) + dat += "[path] - [SSgarbage.logging[path]] times
" usr << browse(dat, "window=dellog") diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm new file mode 100644 index 00000000000..b243d3d2259 --- /dev/null +++ b/code/modules/admin/verbs/fps.dm @@ -0,0 +1,27 @@ +//replaces the old Ticklag verb, fps is easier to understand +/client/proc/fps() + set category = "Debug" + set name = "Set fps" + set desc = "Sets game speed in frames-per-second. Can potentially break the game" + + if(!check_rights(R_DEBUG)) return + + var/fps = round(input("Sets game frames-per-second. Can potentially break the game","FPS", config.fps) as num|null) + + if(fps <= 0) + src << "Error: ticklag(): Invalid world.ticklag value. No changes made." + return + if(fps > config.fps) + if(alert(src, "You are setting fps to a high value:\n\t[fps] frames-per-second\n\tconfig.fps = [config.fps]","Warning!","Confirm","ABORT-ABORT-ABORT") != "Confirm") + return + + switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Enable","Disable")) + if("Enable") config.Tickcomp = 1 + else config.Tickcomp = 0 + + var/msg = "[key_name(src)] has modified world.fps to [fps] and config.Tickcomp to [config.Tickcomp]" + log_admin(msg, 0) + message_admins(msg, 0) + feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + world.fps = fps \ No newline at end of file diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 999da2b3e54..587b10d6160 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -132,15 +132,13 @@ var/intercom_range_display_status = 0 src.verbs += /client/proc/count_objects_all src.verbs += /client/proc/cmd_assume_direct_control //-errorage src.verbs += /client/proc/startSinglo - src.verbs += /client/proc/ticklag //allows you to set the ticklag. + src.verbs += /client/proc/fps //allows you to set the ticklag. src.verbs += /client/proc/cmd_admin_grantfullaccess src.verbs += /client/proc/cmd_admin_areatest src.verbs += /client/proc/cmd_admin_rejuvenate src.verbs += /datum/admins/proc/show_traitor_panel src.verbs += /client/proc/print_jobban_old src.verbs += /client/proc/print_jobban_old_filter - src.verbs += /client/proc/kill_pipe_processing - src.verbs += /client/proc/kill_air_processing src.verbs += /client/proc/disable_communication src.verbs += /client/proc/print_pointers src.verbs += /client/proc/count_movable_instances @@ -234,25 +232,6 @@ var/intercom_range_display_status = 0 world << "There are [count] objects of type [type_path] in the game world" feedback_add_details("admin_verb","mOBJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/kill_pipe_processing() - set category = "Mapping" - set name = "Kill pipe processing" - - pipe_processing_killed = !pipe_processing_killed - if(pipe_processing_killed) - message_admins("[src.ckey] used 'kill pipe processing', stopping all pipe processing.") - else - message_admins("[src.ckey] used 'kill pipe processing', restoring all pipe processing.") - -/client/proc/kill_air_processing() - set category = "Mapping" - set name = "Kill air processing" - - air_processing_killed = !air_processing_killed - if(air_processing_killed) - message_admins("[src.ckey] used 'kill air processing', stopping all air processing.") - else - message_admins("[src.ckey] used 'kill air processing', restoring all air processing.") //This proc is intended to detect lag problems relating to communication procs var/global/say_disabled = 0 diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index ebb678e1fbc..8127159f7a0 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -13,7 +13,7 @@ var/sound/admin_sound log_admin("[key_name(src)] played sound [S]") message_admins("[key_name_admin(src)] played sound [S]") - if(events.holiday == "April Fool's Day") + if(SSevent.holiday == "April Fool's Day") admin_sound.frequency = 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) src << "You feel the Honkmother messing with your song..." diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index fc5801db7e8..70177b99d16 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -315,7 +315,7 @@ Traitors and the like can also be revived with the previous role mostly intact. //Now for special roles and equipment. switch(new_character.mind.special_role) if("traitor") - job_master.EquipRank(new_character, new_character.mind.assigned_role, 1) + SSjob.EquipRank(new_character, new_character.mind.assigned_role, 1) ticker.mode.equip_traitor(new_character) if("Wizard") new_character.loc = pick(wizardstart) @@ -354,7 +354,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(new_character.mind.special_role=="traitor") ticker.mode.add_law_zero(new_character) else - job_master.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them. + SSjob.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them. //Announces the character on all the systems, based on the record. if(!issilicon(new_character))//If they are not a cyborg/AI. @@ -671,7 +671,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Admin" set name = "Call Shuttle" - if ((!( ticker ) || emergency_shuttle.location)) + if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) return if (!holder) @@ -684,11 +684,11 @@ Traitors and the like can also be revived with the previous role mostly intact. if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction") var/choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel") if(choice == "Confirm") - emergency_shuttle.fake_recall = rand(300,500) + SSshuttle.emergencyFakeRecall = rand(0.5,0.9) else return - emergency_shuttle.incall() + SSshuttle.emergency.request() feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.") @@ -700,10 +700,10 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(0)) return if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return - if(!ticker || emergency_shuttle.location || emergency_shuttle.direction == 0) + if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) return - emergency_shuttle.recall() + SSshuttle.emergency.cancel() feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.") diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm deleted file mode 100644 index 73a04bd5306..00000000000 --- a/code/modules/admin/verbs/ticklag.dm +++ /dev/null @@ -1,24 +0,0 @@ -//Merged Doohl's and the existing ticklag as they both had good elements about them ~Carn - -/client/proc/ticklag() - set category = "Debug" - set name = "Set Ticklag" - set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9" - - if(!check_rights(R_DEBUG)) return - - var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null - //I've used ticks of 2 before to help with serious singulo lags - if(newtick && newtick <= 2 && newtick > 0) - log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0) - message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0) - world.tick_lag = newtick - feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No")) - if("Yes") config.Tickcomp = 1 - else config.Tickcomp = 0 - else - src << "Error: ticklag(): Invalid world.ticklag value. No changes made." - - diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index ac1dced5366..c50c0354282 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -6,17 +6,15 @@ usr << "This option is currently only usable during pregame. This may change at a later date." return - if(job_master && ticker) - var/datum/job/job = job_master.GetJob("AI") - if(!job) - usr << "Unable to locate the AI job" - return - if(ticker.triai) - ticker.triai = 0 - usr << "Only one AI will be spawned at round start." - message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.") - else - ticker.triai = 1 - usr << "There will be an AI Triumvirate at round start." - message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.") - return + var/datum/job/job = SSjob.GetJob("AI") + if(!job) + usr << "Unable to locate the AI job" + return + if(ticker.triai) + ticker.triai = 0 + usr << "Only one AI will be spawned at round start." + message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.") + else + ticker.triai = 1 + usr << "There will be an AI Triumvirate at round start." + message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.") diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index f2c1e93930a..0fbda14756b 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -103,7 +103,7 @@ /obj/item/device/assembly/process() - processing_objects.Remove(src) + SSobj.processing.Remove(src) return diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 33d72a05538..6bff38a67b2 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -23,11 +23,11 @@ /obj/item/device/assembly/infra/toggle_secure() secured = !secured if(secured) - processing_objects.Add(src) + SSobj.processing.Add(src) else on = 0 if(first) qdel(first) - processing_objects.Remove(src) + SSobj.processing.Remove(src) update_icon() return secured diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 9e6a855a246..ca779ce83d6 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -30,11 +30,11 @@ /obj/item/device/assembly/prox_sensor/toggle_secure() secured = !secured if(secured) - processing_objects.Add(src) + SSobj.processing.Add(src) else scanning = 0 timing = 0 - processing_objects.Remove(src) + SSobj.processing.Remove(src) update_icon() return secured diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 4b8156a40fb..5008629e2c5 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -26,10 +26,10 @@ /obj/item/device/assembly/timer/toggle_secure() secured = !secured if(secured) - processing_objects.Add(src) + SSobj.processing.Add(src) else timing = 0 - processing_objects.Remove(src) + SSobj.processing.Remove(src) update_icon() return secured diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 324096d42af..07fab03cfdc 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -211,7 +211,7 @@ var/next_external_rsc = 0 var/sql_admin_rank = sanitizeSQL(admin_rank) - var/DBQuery/query_insert = dbcon.NewQuery("INSERT INTO [format_table_name("player")] (id, ckey, firstseen, lastseen, ip, computerid, lastadminrank) VALUES (null, '[sql_ckey]', Now(), Now(), '[sql_ip]', '[sql_computerid]', '[sql_admin_rank]') ON DUPLICATE KEY UPDATE lastseen = VALUES(lastseen), ip = VALUES(ip), computerid = VALUES(computerid)") + var/DBQuery/query_insert = dbcon.NewQuery("INSERT INTO [format_table_name("player")] (id, ckey, firstseen, lastseen, ip, computerid, lastadminrank) VALUES (null, '[sql_ckey]', Now(), Now(), '[sql_ip]', '[sql_computerid]', '[sql_admin_rank]') ON DUPLICATE KEY UPDATE lastseen = VALUES(lastseen), ip = VALUES(ip), computerid = VALUES(computerid), lastadminrank = VALUES(lastadminrank)") query_insert.Execute() //Logging player access diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index db2735c7d2d..f22870a8cf8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -49,6 +49,7 @@ datum/preferences var/blood_type = "A+" //blood type (not-chooseable) var/underwear = "Nude" //underwear type var/undershirt = "Nude" //undershirt type + var/socks = "Nude" //socks type var/backbag = 2 //backpack type var/hair_style = "Bald" //Hair type var/hair_color = "000" //Hair color @@ -178,6 +179,7 @@ datum/preferences dat += "Skin Tone:
[skin_tone]
" dat += "Underwear:
[underwear]
" dat += "Undershirt:
[undershirt]
" + dat += "Socks:
[socks]
" dat += "Backpack:
[backbaglist[backbag]]
" @@ -272,12 +274,12 @@ datum/preferences dat += "" //user << browse(dat, "window=preferences;size=560x560") - var/datum/browser/popup = new(user, "preferences", "
Character Setup
", 580, 620)
+ var/datum/browser/popup = new(user, "preferences", "Character Setup
", 640, 680)
popup.set_content(dat)
popup.open(0)
proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), widthPerColumn = 295, height = 620)
- if(!job_master) return
+ if(!SSjob) return
//limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice.
//splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice.
@@ -298,7 +300,7 @@ datum/preferences
//The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
var/datum/job/lastJob
- for(var/datum/job/job in job_master.occupations)
+ for(var/datum/job/job in SSjob.occupations)
index += 1
if((index >= limit) || (job.title in splitJobs))
@@ -451,9 +453,9 @@ datum/preferences
return 0
proc/UpdateJobPreference(mob/user, role, desiredLvl)
- if(!job_master)
+ if(!SSjob)
return
- var/datum/job/job = job_master.GetJob(role)
+ var/datum/job/job = SSjob.GetJob(role)
if(!job)
user << browse(null, "window=mob_occupation")
@@ -565,6 +567,8 @@ datum/preferences
underwear = random_underwear(gender)
if("undershirt")
undershirt = random_undershirt(gender)
+ if("socks")
+ socks = random_socks(gender)
if("eyes")
eye_color = random_eye_color()
if("s_tone")
@@ -669,6 +673,15 @@ datum/preferences
if(new_undershirt)
undershirt = new_undershirt
+ if("socks")
+ var/new_socks
+ if(gender == MALE)
+ new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_m
+ else
+ new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_f
+ if(new_socks)
+ socks = new_socks
+
if("eyes")
var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference") as color|null
if(new_eyes)
@@ -724,6 +737,7 @@ datum/preferences
gender = MALE
underwear = random_underwear(gender)
undershirt = random_undershirt(gender)
+ socks = random_socks(gender)
facial_hair_style = random_facial_hair_style(gender)
hair_style = random_hair_style(gender)
@@ -832,6 +846,7 @@ datum/preferences
character.facial_hair_style = facial_hair_style
character.underwear = underwear
character.undershirt = undershirt
+ character.socks = socks
if(backbag > 3 || backbag < 1)
backbag = 1 //Same as above
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 74562dc81e5..c1820717417 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -180,6 +180,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["facial_style_name"] >> facial_hair_style
S["underwear"] >> underwear
S["undershirt"] >> undershirt
+ S["socks"] >> socks
S["backbag"] >> backbag
S["mutant_color"] >> mutant_color
@@ -213,11 +214,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_male_list)
underwear = sanitize_inlist(underwear, underwear_m)
undershirt = sanitize_inlist(undershirt, undershirt_m)
+ socks = sanitize_inlist(socks, socks_m)
else
hair_style = sanitize_inlist(hair_style, hair_styles_female_list)
facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_female_list)
underwear = sanitize_inlist(underwear, underwear_f)
undershirt = sanitize_inlist(undershirt, undershirt_f)
+ socks = sanitize_inlist(socks, socks_f)
age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
hair_color = sanitize_hexcolor(hair_color, 3, 0)
@@ -263,6 +266,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["facial_style_name"] << facial_hair_style
S["underwear"] << underwear
S["undershirt"] << undershirt
+ S["socks"] << socks
S["backbag"] << backbag
S["species"] << pref_species.name
S["mutant_color"] << mutant_color
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 752e0bb3bd7..ed1bee7b1f9 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -55,7 +55,7 @@
/obj/item/clothing/head/cakehat/process()
if(!onfire)
- processing_objects.Remove(src)
+ SSobj.processing.Remove(src)
return
var/turf/location = src.loc
@@ -74,7 +74,7 @@
src.force = 3
src.damtype = "fire"
src.icon_state = "cake1"
- processing_objects.Add(src)
+ SSobj.processing.Add(src)
else
src.force = null
src.damtype = "brute"
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 56423b8cf80..e16c312e45c 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -97,4 +97,4 @@
name = "EMT cap"
desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top."
icon_state = "emtsoft"
- item_color = "emtsoft"
\ No newline at end of file
+ item_color = "emt"
\ No newline at end of file
diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm
index ca9c11ec386..59d8bb0b309 100644
--- a/code/modules/events/event.dm
+++ b/code/modules/events/event.dm
@@ -110,11 +110,11 @@
//which should be the only place it's referenced.
//Called when start(), announce() and end() has all been called.
/datum/round_event/proc/kill()
- events.running -= src
+ SSevent.running -= src
//Sets up the event then adds the event to the the list of running events
/datum/round_event/New()
setup()
- events.running += src
+ SSevent.running += src
return ..()
\ No newline at end of file
diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm
index a1280433c61..ef02fe80bfe 100644
--- a/code/modules/events/false_alarm.dm
+++ b/code/modules/events/false_alarm.dm
@@ -10,7 +10,7 @@
/datum/round_event/falsealarm/announce()
var/list/events_list = list()
- for(var/datum/round_event_control/E in events.control)
+ for(var/datum/round_event_control/E in SSevent.control)
if(!E.holidayID) //No holiday cheer allowed during non-holidays. Not even fake holiday cheer.
events_list += E //No holiday cheer allowed during non-holidays. Not even fake holiday cheer.
var/datum/round_event_control/event_control = pick(events_list)
diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm
index 1dc938b3b40..fc9ff5dd4af 100644
--- a/code/modules/events/shuttle_loan.dm
+++ b/code/modules/events/shuttle_loan.dm
@@ -21,7 +21,7 @@
dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY)
/datum/round_event/shuttle_loan/announce()
- supply_shuttle.shuttle_loan = src
+ SSshuttle.shuttle_loan = src
switch(dispatch_type)
if(HIJACK_SYNDIE)
priority_announce("The syndicate are trying to infiltrate your station. If you let them hijack your shuttle, you'll save us a headache.","Centcom Counter Intelligence")
@@ -38,49 +38,49 @@
priority_announce(thanks_msg, "Cargo shuttle commandeered by Centcom.")
dispatched = 1
- supply_shuttle.points += bonus_points
+ SSshuttle.points += bonus_points
endWhen = activeFor + 1
- supply_shuttle.eta_timeofday = (world.timeofday + 3000) % 2160000
- supply_shuttle.moving = 1
+
+ SSshuttle.supply.sell()
+ SSshuttle.supply.enterTransit()
+ SSshuttle.supply.mode = SHUTTLE_RECALL
+ SSshuttle.supply.setTimer(3000)
switch(dispatch_type)
if(HIJACK_SYNDIE)
- supply_shuttle.centcom_message += "Syndicate hijack team incoming."
+ SSshuttle.centcom_message += "Syndicate hijack team incoming."
if(RUSKY_PARTY)
- supply_shuttle.centcom_message += "Partying Russians incoming."
+ SSshuttle.centcom_message += "Partying Russians incoming."
if(SPIDER_GIFT)
- supply_shuttle.centcom_message += "Spider Clan gift incoming."
+ SSshuttle.centcom_message += "Spider Clan gift incoming."
if(DEPARTMENT_RESUPPLY)
- supply_shuttle.centcom_message += "Department resupply incoming."
+ SSshuttle.centcom_message += "Department resupply incoming."
/datum/round_event/shuttle_loan/tick()
if(dispatched)
- if(supply_shuttle.moving)
+ if(SSshuttle.supply.mode != SHUTTLE_IDLE)
endWhen = activeFor
else
endWhen = activeFor + 1
+//whomever coded this didn't even bother to follow the supply ordering code as an example.
+//So I had to waste time rewriting it. Thanks for that >:[
/datum/round_event/shuttle_loan/end()
- if(supply_shuttle.shuttle_loan && supply_shuttle.shuttle_loan.dispatched)
+ if(SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched)
//make sure the shuttle was dispatched in time
- supply_shuttle.shuttle_loan = null
+ SSshuttle.shuttle_loan = null
- //spawn some stuff as reward
- var/area/shuttle_at = locate(SUPPLY_DOCK_AREATYPE)
var/list/empty_shuttle_turfs = list()
- for(var/turf/simulated/shuttle/T in shuttle_at)
- if(T.density)
- continue
- empty_shuttle_turfs.Add(T)
+ for(var/turf/simulated/shuttle/T in SSshuttle.supply.areaInstance)
+ if(T.density || T.contents.len) continue
+ empty_shuttle_turfs += T
+ if(!empty_shuttle_turfs.len)
+ return
var/list/shuttle_spawns = list()
switch(dispatch_type)
if(HIJACK_SYNDIE)
- var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_shuttle.ordernum
- O.object = new /datum/supply_packs/emergency/specialops()
- O.orderedby = "Syndicate"
- supply_shuttle.shoppinglist += O
+ SSshuttle.generateSupplyOrder(/datum/supply_packs/emergency/specialops, "Syndicate")
shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
@@ -89,21 +89,8 @@
if(prob(50))
shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
- var/turf/T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/blood(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/blood(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/blood(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/oil(T)
-
if(RUSKY_PARTY)
- var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_shuttle.ordernum
- O.object = new /datum/supply_packs/organic/party()
- O.orderedby = "Russian Confederation"
- supply_shuttle.shoppinglist += O
+ SSshuttle.generateSupplyOrder(/datum/supply_packs/organic/party, "Russian Confederation")
shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian/ranged) //drops a mateba
@@ -113,25 +100,8 @@
if(prob(50))
shuttle_spawns.Add(/mob/living/simple_animal/hostile/bear)
- var/turf/T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/vomit(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/vomit(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/vomit(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/vomit(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/ash(T)
- T = pick(empty_shuttle_turfs)
- new /obj/effect/decal/cleanable/ash(T)
-
if(SPIDER_GIFT)
- var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_shuttle.ordernum
- O.object = new /datum/supply_packs/emergency/specialops()
- O.orderedby = "Spider Clan"
- supply_shuttle.shoppinglist += O
+ SSshuttle.generateSupplyOrder(/datum/supply_packs/emergency/specialops, "Spider Clan")
shuttle_spawns.Add(/mob/living/simple_animal/hostile/poison/giant_spider)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/poison/giant_spider)
@@ -158,27 +128,20 @@
new /obj/effect/spider/stickyweb(T)
if(DEPARTMENT_RESUPPLY)
- var/list/crate_types = list()
+ var/list/crate_types = list(
+ /datum/supply_packs/emergency/evac,
+ /datum/supply_packs/security/supplies,
+ /datum/supply_packs/organic/food,
+ /datum/supply_packs/emergency/weedcontrol,
+ /datum/supply_packs/engineering/tools,
+ /datum/supply_packs/engineering/engiequipment,
+ /datum/supply_packs/science/robotics,
+ /datum/supply_packs/science/plasma,
+ /datum/supply_packs/medical/supplies
+ )
- crate_types.Add(/datum/supply_packs/emergency/evac)
- crate_types.Add(/datum/supply_packs/security/supplies)
- crate_types.Add(/datum/supply_packs/organic/food)
- crate_types.Add(/datum/supply_packs/emergency/weedcontrol)
- crate_types.Add(/datum/supply_packs/engineering/tools)
- crate_types.Add(/datum/supply_packs/engineering/engiequipment)
- crate_types.Add(/datum/supply_packs/science/robotics)
- crate_types.Add(/datum/supply_packs/science/plasma)
- crate_types.Add(/datum/supply_packs/medical/supplies)
-
- while(crate_types.len > 0)
- var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_shuttle.ordernum
- O.orderedby = "Centcom"
- supply_shuttle.shoppinglist += O
-
- var/spawn_type = crate_types[crate_types.len]
- O.object = new spawn_type()
- crate_types.Cut(crate_types.len, crate_types.len + 1)
+ for(var/spawn_type in crate_types)
+ SSshuttle.generateSupplyOrder(spawn_type, "Centcom")
for(var/i=0,i<3,i++)
var/turf/T = pick(empty_shuttle_turfs)
@@ -186,20 +149,15 @@
new spawn_type(T)
var/false_positive = 0
- while(shuttle_spawns.len > 0 && empty_shuttle_turfs.len > 0)
- var/turf/T = pick(empty_shuttle_turfs)
+ while(shuttle_spawns.len && empty_shuttle_turfs.len)
+ var/turf/T = pick_n_take(empty_shuttle_turfs)
if(T.contents.len && false_positive < 5)
false_positive++
continue
- var/spawn_type = shuttle_spawns[1]
- shuttle_spawns.Cut(1, 2)
- empty_shuttle_turfs.Remove(T)
+ var/spawn_type = pick_n_take(shuttle_spawns)
new spawn_type(T)
- supply_shuttle.buy()
- //supply_shuttle.send()
- //supply_shuttle.moving = 0
#undef HIJACK_SYNDIE
#undef RUSKY_PARTY
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index b3d6d06fba4..b9f1260e77e 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -64,7 +64,7 @@
holder.luminosity = 4
/datum/spacevine_mutation/toxicity
- name = "toxicity"
+ name = "toxic"
hue = "#ff00ff"
/datum/spacevine_mutation/toxicity/on_cross(obj/effect/spacevine/holder, mob/living/crosser)
@@ -87,7 +87,7 @@
explosion(holder.loc, 0, 0, 2, 0, 0)
/datum/spacevine_mutation/fire_proof
- name = "fire resist"
+ name = "fire proof"
hue = "#ff8888"
/datum/spacevine_mutation/fire_proof/process_temperature(obj/effect/spacevine/holder, temp, volume)
@@ -116,7 +116,7 @@
buckled.ex_act(severity)
/datum/spacevine_mutation/transparency
- name = "transparency"
+ name = "transparent"
hue = ""
/datum/spacevine_mutation/transparency/on_grow(obj/effect/spacevine/holder)
@@ -124,7 +124,7 @@
holder.alpha = 125
/datum/spacevine_mutation/oxy_eater
- name = "oxygen consumption"
+ name = "oxygen consuming"
hue = "#ffff88"
/datum/spacevine_mutation/oxy_eater/process_mutation(obj/effect/spacevine/holder)
@@ -134,7 +134,7 @@
GM.oxygen = max(0, GM.oxygen - severity * holder.energy)
/datum/spacevine_mutation/nitro_eater
- name = "nitrogen consumption"
+ name = "nitrogen consuming"
hue = "#8888ff"
/datum/spacevine_mutation/nitro_eater/process_mutation(obj/effect/spacevine/holder)
@@ -144,7 +144,7 @@
GM.nitrogen = max(0, GM.nitrogen - severity * holder.energy)
/datum/spacevine_mutation/carbondioxide_eater
- name = "CO2 consumption"
+ name = "CO2 consuming"
hue = "#00ffff"
/datum/spacevine_mutation/carbondioxide_eater/process_mutation(obj/effect/spacevine/holder)
@@ -154,7 +154,7 @@
GM.carbon_dioxide = max(0, GM.carbon_dioxide - severity * holder.energy)
/datum/spacevine_mutation/plasma_eater
- name = "toxins consumption"
+ name = "toxins consuming"
hue = "#ffbbff"
/datum/spacevine_mutation/plasma_eater/process_mutation(obj/effect/spacevine/holder)
@@ -164,7 +164,7 @@
GM.toxins = max(0, GM.toxins - severity * holder.energy)
/datum/spacevine_mutation/thorns
- name = "thorns"
+ name = "thorny"
hue = "#666666"
/datum/spacevine_mutation/thorns/on_cross(obj/effect/spacevine/holder, crosser)
@@ -354,13 +354,13 @@
qdel(src)
spawn_spacevine_piece(src.loc, , muts)
- processing_objects.Add(src)
+ SSobj.processing.Add(src)
init_subtypes(/datum/spacevine_mutation/, mutations_list)
if(mttv != null)
mutativness = mttv
/obj/effect/spacevine_controller/Destroy()
- processing_objects.Remove(src)
+ SSobj.processing.Remove(src)
..()
/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(var/turf/location, obj/effect/spacevine/parent, list/muts)
@@ -373,10 +373,15 @@
if(parent)
SV.mutations |= parent.mutations
SV.color = parent.color
+ SV.desc = parent.desc
if(prob(mutativness))
SV.mutations |= pick(mutations_list)
var/datum/spacevine_mutation/randmut = pick(SV.mutations)
SV.color = randmut.hue
+ SV.desc = "An extremely expansionistic species of vine. These are "
+ for(var/datum/spacevine_mutation/M in SV.mutations)
+ SV.desc += "[M.name] "
+ SV.desc += "vines."
for(var/datum/spacevine_mutation/SM in SV.mutations)
SM.on_birth(SV)
diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm
index e28a1a7026f..7548d017a40 100644
--- a/code/modules/events/wizard/greentext.dm
+++ b/code/modules/events/wizard/greentext.dm
@@ -39,7 +39,7 @@
if(!(user in color_altered_mobs))
color_altered_mobs += user
user.color = "#00FF00"
- processing_objects.Add(src)
+ SSobj.processing.Add(src)
..()
/obj/item/weapon/greentext/dropped(mob/living/user as mob)
@@ -48,7 +48,7 @@
user.color = "#FF0000" //ya blew it
last_holder = null
new_holder = null
- processing_objects.Remove(src)
+ SSobj.processing.Remove(src)
..()
/obj/item/weapon/greentext/process()
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_bread.dm b/code/modules/food&drinks/recipes/microwave/recipes_bread.dm
index 07e15cecdb9..396ceeb7043 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes_bread.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes_bread.dm
@@ -3,7 +3,7 @@
////////////////////////////////////////////////BREAD////////////////////////////////////////////////
-/datum/recipe/bread
+/datum/recipe/bread/plain
reagents = list("flour" = 15)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bread
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pie.dm b/code/modules/food&drinks/recipes/microwave/recipes_pie.dm
index c53c67629e5..83afd98f833 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes_pie.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes_pie.dm
@@ -3,7 +3,7 @@
////////////////////////////////////////////////PIES////////////////////////////////////////////////
-/datum/recipe/pie
+/datum/recipe/pie/banana
reagents = list("flour" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_sandwichtoast.dm b/code/modules/food&drinks/recipes/microwave/recipes_sandwichtoast.dm
index 54b79edd0fa..70347693bb4 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes_sandwichtoast.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes_sandwichtoast.dm
@@ -3,7 +3,7 @@
////////////////////////////////////////////////SANDWICHES////////////////////////////////////////////////
-/datum/recipe/sandwich
+/datum/recipe/sandwich/plain
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_spaghetti.dm b/code/modules/food&drinks/recipes/microwave/recipes_spaghetti.dm
index 96ed89e3152..fa3ff8c5c4e 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes_spaghetti.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes_spaghetti.dm
@@ -3,7 +3,7 @@
////////////////////////////////////////////////SPAGHETTI////////////////////////////////////////////////
-/datum/recipe/spaghetti
+/datum/recipe/spaghetti/plain
reagents = list("flour" = 5)
result= /obj/item/weapon/reagent_containers/food/snacks/spaghetti
@@ -54,6 +54,6 @@
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
+ /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
)
result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 8ed4ebc18e1..54f4d2e3df1 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -163,7 +163,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/C
+ var/obj/item/stack/cable_coil/C = W
if (C.use(5))
user << "You add some cable to the potato and slide it inside the battery encasing."
var/obj/item/weapon/stock_parts/cell/potato/pocell = new /obj/item/weapon/stock_parts/cell/potato(user.loc)
@@ -539,7 +539,7 @@
..()
if( istype(src.loc, /mob) )
held_mob = src.loc
- processing_objects.Add(src)
+ SSobj.processing.Add(src)
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/process()
if(held_mob && src.loc == held_mob)
diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm
index b8030133c76..5588b29e662 100644
--- a/code/modules/mining/laborcamp/laborshuttle.dm
+++ b/code/modules/mining/laborcamp/laborshuttle.dm
@@ -4,20 +4,26 @@
icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
circuit = /obj/item/weapon/circuitboard/labor_shuttle
- id = "laborcamp"
+ shuttleId = "laborcamp"
+ possible_destinations = "laborcamp_home;laborcamp_away"
req_access = list(access_brig)
/obj/machinery/computer/shuttle/labor/one_way
name = "prisoner shuttle console"
desc = "A one-way shuttle console, used to summon the shuttle to the labor camp."
+ possible_destinations = "laborcamp_away"
circuit = /obj/item/weapon/circuitboard/labor_shuttle/one_way
req_access = list( )
/obj/machinery/computer/shuttle/labor/one_way/Topic(href, href_list)
if(href_list["move"])
- var/datum/shuttle_manager/s = shuttles["laborcamp"]
- if(s.location == /area/shuttle/laborcamp/outpost)
+ var/obj/docking_port/mobile/M = SSshuttle.getShuttle("laborcamp")
+ if(!M)
+ usr << "Cannot locate shuttle."
+ return 0
+ var/obj/docking_port/stationary/S = M.get_docked()
+ if(S && S.name == "laborcamp_away")
usr << "Shuttle is already at the outpost."
return 0
..()
\ No newline at end of file
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index 337886306c9..9bb95d6f639 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -92,29 +92,32 @@
else usr << "Invalid ID."
if(check_auth()) //Sanity check against hef spoofs
if(href_list["choice"] == "station")
- var/datum/shuttle_manager/s = shuttles["laborcamp"]
- if(s.location == /area/shuttle/laborcamp/outpost)
- if(alone_in_area(get_area(loc), usr))
- if (s.move_shuttle(0)) // No delay, to stop people from getting on while it is departing.
+ if(!alone_in_area(get_area(src), usr))
+ usr << "Prisoners are only allowed to be released while alone."
+ else
+ switch(SSshuttle.moveShuttle("laborcamp","laborcamp_home"))
+ if(1)
+ usr << "Shuttle not found"
+ if(2)
+ usr << "Shuttle already at station"
+ if(3)
+ usr << "No permission to dock could be granted."
+ else
Radio.set_frequency(SEC_FREQ)
Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", SEC_FREQ)
usr << "Shuttle recieved message and will be sent shortly."
- else
- usr << "Shuttle is already moving."
- else
- usr << "Prisoners are only allowed to be released while alone."
- else
- usr << "Shuttle is already on-station."
+
if(href_list["choice"] == "release")
- var/datum/shuttle_manager/s = shuttles["laborcamp"]
- if(s.location == /area/shuttle/laborcamp/outpost)
- usr << "Prisoners can only be released while docked with the station."
- return
if(alone_in_area(get_area(loc), usr))
- if(release_door.density)
- release_door.open()
+ var/obj/docking_port/stationary/S = SSshuttle.getDock("laborcamp_home")
+ if(S && S.get_docked())
+ if(release_door && release_door.density)
+ release_door.open()
+ else
+ usr << "Prisoners can only be released while docked with the station."
else
usr << "Prisoners are only allowed to be released while alone."
+
src.updateUsrDialog()
return
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 06f2257e50a..917f30a33b3 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -45,7 +45,8 @@
desc = "Used to call and send the mining shuttle."
req_access = list(access_mining)
circuit = /obj/item/weapon/circuitboard/mining_shuttle
- id = "mining"
+ shuttleId = "mining"
+ possible_destinations = "mining_home;mining_away"
/******************************Lantern*******************************/
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 018f6e491ed..581ab4f176d 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -475,6 +475,7 @@
icon_state = "asteroid"
icon_plating = "asteroid"
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
+ ignoredirt = 1
/turf/simulated/floor/plating/asteroid/airless
oxygen = 0.01
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 65259e9d036..38c72dbbcc2 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -126,11 +126,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
//world << "DEBUG: malf mode ticker test"
if(malf.malf_mode_declared && (malf.apcs > 0))
stat(null, "Time left: [max(malf.AI_win_timeleft/malf.apcs, 0)]")
- if(emergency_shuttle)
- if(emergency_shuttle.online && emergency_shuttle.location < 2)
- var/timeleft = emergency_shuttle.timeleft()
- if (timeleft)
- stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
+ var/ETA
+ switch(SSshuttle.emergency.mode)
+ if(SHUTTLE_CALL)
+ ETA = "ETA"
+ if(SHUTTLE_DOCKED)
+ ETA = "ETD"
+ if(ETA)
+ var/timeleft = SSshuttle.emergency.timeLeft()
+ stat(null, "[ETA]-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
/mob/dead/observer/verb/reenter_corpse()
set category = "Ghost"
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 44faa84a6a2..f9c32f174c7 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -160,12 +160,15 @@
if (client.statpanel == "Status")
stat(null, "Plasma Stored: [getPlasma()]/[max_plasma]")
- if(emergency_shuttle)
- if(emergency_shuttle.online && emergency_shuttle.location < 2)
- var/timeleft = emergency_shuttle.timeleft()
- if (timeleft)
- stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
-
+ var/ETA
+ switch(SSshuttle.emergency.mode)
+ if(SHUTTLE_CALL)
+ ETA = "ETA"
+ if(SHUTTLE_DOCKED)
+ ETA = "ETD"
+ if(ETA)
+ var/timeleft = SSshuttle.emergency.timeLeft()
+ stat(null, "[ETA]-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
/mob/living/carbon/alien/Stun(amount)
if(status_flags & CANSTUN)
stunned = max(max(stunned,amount),0) //can't go below 0, getting a low amount of stun doesn't lower your current stun
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index c4a11c6b967..ee4e6ebbe16 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -23,7 +23,7 @@
//First, resolve location and get a breath
- if(air_master.current_cycle%4==2)
+ if(SSmob.times_fired%4==2)
//Only try to take a breath every 4 seconds, unless suffocating
spawn(0) breathe()
@@ -238,3 +238,4 @@
reset_view(null)
return 1
+
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 9a4554f0a3b..e5f64597566 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -20,7 +20,7 @@
amount_grown++
//First, resolve location and get a breath
- if(air_master.current_cycle%4==2)
+ if(SSair.times_fired%4==2)
//Only try to take a breath every 4 seconds, unless suffocating
spawn(0) breathe()
else //Still give containing object the chance to interact
@@ -215,3 +215,4 @@
/mob/living/carbon/alien/larva/proc/handle_random_events()
return
+
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 9adcb4282b9..9730be083b9 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -124,7 +124,7 @@
stomach_contents.Remove(M)
qdel(M)
continue
- if(air_master.current_cycle%3==1)
+ if(SSmob.times_fired%3==1)
if(!(M.status_flags & GODMODE))
M.adjustBruteLoss(5)
nutrition += 10
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index 49e25cf646d..fef1924fc77 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -14,10 +14,11 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
if(istype(loc, /mob/living))
affected_mob = loc
affected_mob.status_flags |= XENO_HOST
+ SSobj.processing.Add(src)
if(istype(affected_mob,/mob/living/carbon))
var/mob/living/carbon/H = affected_mob
H.med_hud_set_status()
- processing_objects.Add(src)
+ SSobj.processing.Add(src)
spawn(0)
AddInfectionImages(affected_mob)
else
@@ -37,10 +38,11 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
if(!affected_mob) return
if(loc != affected_mob)
affected_mob.status_flags &= ~(XENO_HOST)
+ SSobj.processing.Remove(src)
if(istype(affected_mob,/mob/living/carbon))
var/mob/living/carbon/H = affected_mob
H.med_hud_set_status()
- processing_objects.Remove(src)
+ SSobj.processing.Remove(src)
spawn(0)
RemoveInfectionImages(affected_mob)
affected_mob = null
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 51c4d02323c..7862cf26e8f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -53,20 +53,25 @@
/mob/living/carbon/human/Stat()
..()
statpanel("Status")
-
- stat(null, "Intent: [a_intent]")
- stat(null, "Move Mode: [m_intent]")
- if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
- var/datum/game_mode/malfunction/malf = ticker.mode
- if(malf.malf_mode_declared && (malf.apcs > 0))
- stat(null, "Time left: [max(malf.AI_win_timeleft/malf.apcs, 0)]")
- if(emergency_shuttle)
- if(emergency_shuttle.online && emergency_shuttle.location < 2)
- var/timeleft = emergency_shuttle.timeleft()
- if (timeleft)
- stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
-
if (client.statpanel == "Status")
+ stat(null, "Intent: [a_intent]")
+ stat(null, "Move Mode: [m_intent]")
+ if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
+ var/datum/game_mode/malfunction/malf = ticker.mode
+ if(malf.malf_mode_declared && (malf.apcs > 0))
+ stat(null, "Time left: [max(malf.AI_win_timeleft/malf.apcs, 0)]")
+
+ var/ETA
+ switch(SSshuttle.emergency.mode)
+ if(SHUTTLE_CALL)
+ ETA = "ETA"
+ if(SHUTTLE_DOCKED)
+ ETA = "ETD"
+ if(ETA)
+ var/timeleft = SSshuttle.emergency.timeLeft()
+ stat(null, "[ETA]-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
+
+
if (internal)
if (!internal.air_contents)
qdel(internal)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index db7fb3a0e52..de9f0ea57c0 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -21,6 +21,7 @@
var/underwear = "Nude" //Which underwear the player wants
var/undershirt = "Nude" //Which undershirt the player wants
+ var/socks = "Nude" //Which socks the player wants
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
//Equipment slots
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 964076b248d..e8d5e681478 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -62,9 +62,8 @@
for(var/datum/mutation/human/HM in dna.mutations)
HM.on_life(src)
- if(air_master.current_cycle%4==2 || failed_last_breath) //First, resolve location and get a breath
+ if(SSmob.times_fired%4==2 || failed_last_breath) //First, resolve location and get a breath
breathe() //Only try to take a breath every 4 ticks, unless suffocating
-
else //Still give containing object the chance to interact
if(istype(loc, /obj/))
var/obj/location_as_object = loc
@@ -475,13 +474,17 @@
//Ears
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
- else if(istype(ears, /obj/item/clothing/ears/earmuffs)) //resting your ears with earmuffs heals ear damage faster, and slowly heals deafness
- ear_damage = max(ear_damage-0.15, 0)
- ear_deaf = max(ear_deaf-1, 1)
- else if(ear_deaf) //deafness, heals slowly over time
- ear_deaf = max(ear_deaf-1, 0)
- else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs
- ear_damage = max(ear_damage-0.05, 0)
+ else
+ /* might be better to create a variable here, and instead of doing this nested for. */
+ // deafness heals slowly over time, unless ear_damage is over 100
+ if (ear_damage < 100)
+ // Heal the first 1/3 here
+ ear_deaf = max(ear_deaf - 1, 0)
+ ear_damage = max(ear_damage-0.05, 0)
+ if(istype(ears, /obj/item/clothing/ears/earmuffs)) // earmuffs rest your ears, healing 3x faster, but keeping you deaf.
+ // Heal the 2/3 here
+ ear_deaf = max(ear_deaf, 1)
+ ear_damage = max(ear_damage-0.10, 0)
//Dizziness
if(dizziness)
@@ -675,7 +678,7 @@
stomach_contents.Remove(M)
qdel(M)
continue
- if(air_master.current_cycle%3==1)
+ if(SSmob.times_fired%3==1)
if(!(M.status_flags & GODMODE))
M.adjustBruteLoss(5)
nutrition += 10
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 1b7294fce19..e80378256ff 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -8,7 +8,7 @@
#define TINT_BLIND 3
#define HUMAN_MAX_OXYLOSS 3
-#define HUMAN_CRIT_MAX_OXYLOSS ( (last_tick_duration) /3)
+#define HUMAN_CRIT_MAX_OXYLOSS (SSmob.wait/3)
#define HEAT_DAMAGE_LEVEL_1 2
#define HEAT_DAMAGE_LEVEL_2 3
@@ -181,7 +181,7 @@
img_eyes_s.color = "#" + H.eye_color
standing += img_eyes_s
- //Underwear & Undershirts
+ //Underwear, Undershirts & Socks
if(H.underwear)
var/datum/sprite_accessory/underwear/U = underwear_list[H.underwear]
if(U)
@@ -195,6 +195,11 @@
else
standing += image("icon"=U2.icon, "icon_state"="[U2.icon_state]_s", "layer"=-BODY_LAYER)
+ if(H.socks)
+ var/datum/sprite_accessory/socks/U3 = socks_list[H.socks]
+ if(U3)
+ standing += image("icon"=U3.icon, "icon_state"="[U3.icon_state]_s", "layer"=-BODY_LAYER)
+
if(standing.len)
H.overlays_standing[BODY_LAYER] = standing
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 8f7f5fd64ef..5b96c53722c 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -38,7 +38,7 @@ There are several things that need to be remembered:
update_base_icon_state() //Handles updating var/base_icon_state (WIP) This is used to update the
mob's icon_state easily e.g. "[base_icon_state]_s" is the standing icon_state
update_body() //Handles updating your mob's icon_state (using update_base_icon_state())
- as well as sprite-accessories that didn't really fit elsewhere (underwear, undershirts, lips, eyes)
+ as well as sprite-accessories that didn't really fit elsewhere (underwear, undershirts, socks, lips, eyes)
//NOTE: update_mutantrace() is now merged into this!
update_hair() //Handles updating your hair overlay (used to be update_face, but mouth and
eyes were merged into update_body())
@@ -56,7 +56,7 @@ Please contact me on #coderbus IRC. ~Carnie x
//Human Overlays Indexes/////////
#define SPECIES_LAYER 23 // mutantrace colors... these are on a seperate layer in order to prvent
-#define BODY_LAYER 22 //underwear, undershirts, eyes, lips(makeup)
+#define BODY_LAYER 22 //underwear, undershirts, socks, eyes, lips(makeup)
#define MUTATIONS_LAYER 21 //Tk headglows etc.
#define AUGMENTS_LAYER 20
#define DAMAGE_LAYER 19 //damage indicators (cuts and burns)
@@ -311,7 +311,7 @@ Please contact me on #coderbus IRC. ~Carnie x
else
if(blood_DNA)
- overlays_standing[GLOVES_LAYER] = image("icon"='icons/effects/blood.dmi', "icon_state"="bloodyhands")
+ overlays_standing[GLOVES_LAYER] = image("icon"='icons/effects/blood.dmi', "icon_state"="bloodyhands", "layer"=-GLOVES_LAYER)
apply_overlay(GLOVES_LAYER)
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 02a91c71382..60d0172da01 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -21,7 +21,7 @@
if (stat != DEAD) //still breathing
//First, resolve location and get a breath
- if(air_master.current_cycle%4==2)
+ if(SSmob.times_fired%4==2)
//Only try to take a breath every 4 seconds, unless suffocating
breathe()
else //Still give containing object the chance to interact
@@ -392,10 +392,13 @@
//Ears
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
- else if(ear_deaf) //deafness, heals slowly over time
- ear_deaf = max(ear_deaf-1, 0)
- else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs
- ear_damage = max(ear_damage-0.05, 0)
+ else
+ /* might be better to create a variable here, and instead of doing this nested for. */
+ // deafness heals slowly over time, unless ear_damage is over 100
+ if (ear_damage < 100)
+ // Heal the first 1/3 here
+ ear_deaf = max(ear_deaf - 1, 0)
+ ear_damage = max(ear_damage-0.05, 0)
//Other
if(stunned)
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 99a9a98e283..6228646562a 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -664,30 +664,30 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle19"
- attack(mob/living/carbon/slime/M as mob, mob/user as mob)
- if(!istype(M, /mob/living/carbon/slime/))//If target is not a slime.
- user << " The potion only works on slimes!"
- return ..()
- if(M.stat)
- user << " The slime is dead!"
- return..()
- if(M.mind)
- user << " The slime resists!"
- return ..()
- var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc)
- pet.icon_state = "[M.colour] adult slime"
- pet.icon_living = "[M.colour] adult slime"
- pet.icon_dead = "[M.colour] baby slime dead"
- pet.colour = "[M.colour]"
- user <<"You feed the slime the potion, removing it's powers and calming it."
- qdel(M)
- var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
+/obj/item/weapon/slimepotion2/attack(mob/living/carbon/slime/M as mob, mob/user as mob)
+ if(!istype(M, /mob/living/carbon/slime/))//If target is not a slime.
+ user << " The potion only works on slimes!"
+ return ..()
+ if(M.stat)
+ user << " The slime is dead!"
+ return..()
+ if(M.mind)
+ user << " The slime resists!"
+ return ..()
+ var/mob/living/simple_animal/slime/adult/pet = new /mob/living/simple_animal/slime/adult(M.loc)
+ pet.icon_state = "[M.colour] adult slime"
+ pet.icon_living = "[M.colour] adult slime"
+ pet.icon_dead = "[M.colour] baby slime dead"
+ pet.colour = "[M.colour]"
+ user <<"You feed the slime the potion, removing it's powers and calming it."
+ qdel(M)
+ var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
- if (!newname)
- newname = "pet slime"
- pet.name = newname
- pet.real_name = newname
- qdel(src)
+ if (!newname)
+ newname = "pet slime"
+ pet.name = newname
+ pet.real_name = newname
+ qdel(src)
/obj/item/weapon/slimesteroid
@@ -805,7 +805,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
New()
..()
- processing_objects.Add(src)
+ SSobj.processing.Add(src)
/obj/effect/golemrune/process()
var/mob/dead/observer/ghost
@@ -917,11 +917,11 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Grow()
grown = 1
icon_state = "slime egg-grown"
- processing_objects.Add(src)
+ SSobj.processing.Add(src)
return
/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Hatch()
- processing_objects.Remove(src)
+ SSobj.processing.Remove(src)
var/turf/T = get_turf(src)
src.visible_message(" The [name] pulsates and quivers!")
spawn(rand(50,100))
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 796be43880f..4af16d18e77 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1,8 +1,12 @@
+/* I am informed this was added by Giacom to reduce mob-stacking in escape pods.
+It's sorta problematic atm due to the shuttle changes I am trying to do
+Sorry Giacom. Please don't be mad :(
/mob/living/Life()
..()
- var/area/cur_area = get_area(loc)
- if(cur_area)
- cur_area.mob_activate(src)
+ var/area/A = get_area(loc)
+ if(A && A.push_dir)
+ push_mob_back(src, A.push_dir)
+*/
/mob/living/Destroy()
// if(mind)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 4b12eb1cf13..af702c86567 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -135,7 +135,7 @@ var/list/ai_list = list()
/mob/living/silicon/ai/Destroy()
ai_list -= src
shuttle_caller_list -= src
- emergency_shuttle.autoshuttlecall()
+ SSshuttle.autoEvac()
..()
@@ -177,10 +177,15 @@ var/list/ai_list = list()
..()
statpanel("Status")
if (client.statpanel == "Status")
- if(emergency_shuttle.online && emergency_shuttle.location < 2)
- var/timeleft = emergency_shuttle.timeleft()
- if (timeleft)
- stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
+ var/ETA
+ switch(SSshuttle.emergency.mode)
+ if(SHUTTLE_CALL)
+ ETA = "ETA"
+ if(SHUTTLE_DOCKED)
+ ETA = "ETD"
+ if(ETA)
+ var/timeleft = SSshuttle.emergency.timeLeft()
+ stat(null, "[ETA]-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
if(ticker.mode.name == "AI malfunction")
var/datum/game_mode/malfunction/malf = ticker.mode
@@ -237,7 +242,7 @@ var/list/ai_list = list()
onclose(src, "airoster")
/mob/living/silicon/ai/proc/ai_call_shuttle()
- if(src.stat == 2)
+ if(src.stat == DEAD)
src << "You can't call the shuttle because you are dead!"
return
if(istype(usr,/mob/living/silicon/ai))
@@ -248,11 +253,11 @@ var/list/ai_list = list()
var/reason = input(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") as text
- if(length(trim(reason)) > 0)
- call_shuttle_proc(src, reason)
+ if(trim(reason))
+ SSshuttle.requestEvac(src, reason)
// hack to display shuttle timer
- if(emergency_shuttle.online)
+ if(SSshuttle.emergency.mode >= SHUTTLE_CALL)
var/obj/machinery/computer/communications/C = locate() in machines
if(C)
C.post_status("shuttle")
@@ -285,7 +290,7 @@ var/list/ai_list = list()
if(AI.control_disabled)
src << "Wireless control is disabled!"
return
- cancel_call_proc(src)
+ SSshuttle.cancelEvac(src)
return
/mob/living/silicon/ai/check_eye(var/mob/user as mob)
@@ -368,7 +373,7 @@ var/list/ai_list = list()
return
if (href_list["callbot"]) //Command a bot to move to a selected location.
- Bot = locate(href_list["callbot"]) in aibots
+ Bot = locate(href_list["callbot"]) in SSbot.processing
if(!Bot || Bot.remote_disabled || src.control_disabled)
return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off.
waypoint_mode = 1
@@ -376,7 +381,7 @@ var/list/ai_list = list()
return
if (href_list["interface"]) //Remotely connect to a bot!
- Bot = locate(href_list["interface"]) in aibots
+ Bot = locate(href_list["interface"]) in SSbot.processing
if(!Bot || Bot.remote_disabled || src.control_disabled)
return
Bot.attack_ai(src)
@@ -459,7 +464,7 @@ var/list/ai_list = list()
d += "Query network status" d += "
Name | Status | Location | Control |
| [Bot.hacked ? "(!) [Bot.name]" : Bot.name] | " diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index 4d86bf7bc4d..25b8bd2b310 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -17,7 +17,7 @@ see_invisible = SEE_INVISIBLE_LEVEL_TWO shuttle_caller_list -= src - emergency_shuttle.autoshuttlecall() + SSshuttle.autoEvac() if(explosive) spawn(10) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 193477e8dab..39efdb33178 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -80,10 +80,15 @@ ..() statpanel("Status") if (src.client.statpanel == "Status") - if(emergency_shuttle.online && emergency_shuttle.location < 2) - var/timeleft = emergency_shuttle.timeleft() - if (timeleft) - stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]") + var/ETA + switch(SSshuttle.emergency.mode) + if(SHUTTLE_CALL) + ETA = "ETA" + if(SHUTTLE_DOCKED) + ETA = "ETD" + if(ETA) + var/timeleft = SSshuttle.emergency.timeLeft() + stat(null, "[ETA]-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]") if(src.silence_time) var/timeleft = round((silence_time - world.timeofday)/10 ,1) stat(null, "Communications system reboot in -[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]") diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b3707f263cb..a77344a194c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -292,10 +292,16 @@ ..() statpanel("Status") if (client.statpanel == "Status") - if(emergency_shuttle.online && emergency_shuttle.location < 2) - var/timeleft = emergency_shuttle.timeleft() - if (timeleft) - stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]") + var/ETA + switch(SSshuttle.emergency.mode) + if(SHUTTLE_CALL) + ETA = "ETA" + if(SHUTTLE_DOCKED) + ETA = "ETD" + if(ETA) + var/timeleft = SSshuttle.emergency.timeLeft() + stat(null, "[ETA]-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]") + if(ticker.mode.name == "AI malfunction") var/datum/game_mode/malfunction/malf = ticker.mode @@ -846,6 +852,9 @@ var/turf/tile = loc if(isturf(tile)) tile.clean_blood() + if (istype(tile, /turf/simulated/floor)) + var/turf/simulated/floor/F = tile + F.dirt = 0 for(var/A in tile) if(istype(A, /obj/effect)) if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay)) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index ebb220c9a72..da3c5ceeafd 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -251,7 +251,7 @@ var/global/chicken_count = 0 E.pixel_x = rand(-6,6) E.pixel_y = rand(-6,6) if(chicken_count < MAX_CHICKENS && prob(25)) - processing_objects.Add(E) + SSobj.processing.Add(E) /obj/item/weapon/reagent_containers/food/snacks/egg/var/amount_grown = 0 /obj/item/weapon/reagent_containers/food/snacks/egg/process() @@ -260,7 +260,7 @@ var/global/chicken_count = 0 if(amount_grown >= 100) visible_message("[src] hatches with a quiet cracking sound.") new /mob/living/simple_animal/chick(get_turf(src)) - processing_objects.Remove(src) + SSobj.processing.Remove(src) qdel(src) else - processing_objects.Remove(src) + SSobj.processing.Remove(src) diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm index 13f6b7e40f2..85405278096 100644 --- a/code/modules/mob/living/simple_animal/friendly/slime.dm +++ b/code/modules/mob/living/simple_animal/friendly/slime.dm @@ -15,34 +15,21 @@ ventcrawler = 2 var/colour = "grey" -/mob/living/simple_animal/adultslime - name = "pet slime" - desc = "A lovable, domesticated slime." - icon = 'icons/mob/slimes.dmi' +/mob/living/simple_animal/slime/adult health = 200 maxHealth = 200 icon_state = "grey adult slime" icon_living = "grey adult slime" - icon_dead = "grey baby slime dead" - response_help = "pets" - response_disarm = "shoos" - response_harm = "stomps on" - emote_see = list("jiggles", "bounces in place") - var/colour = "grey" -/mob/living/simple_animal/adultslime/New() +/mob/living/simple_animal/slime/adult/New() ..() overlays += "aslime-:33" /mob/living/simple_animal/slime/adult/Die() - var/mob/living/simple_animal/slime/S1 = new /mob/living/simple_animal/slime (src.loc) - S1.icon_state = "[src.colour] baby slime" - S1.icon_living = "[src.colour] baby slime" - S1.icon_dead = "[src.colour] baby slime dead" - S1.colour = "[src.colour]" - var/mob/living/simple_animal/slime/S2 = new /mob/living/simple_animal/slime (src.loc) - S2.icon_state = "[src.colour] baby slime" - S2.icon_living = "[src.colour] baby slime" - S2.icon_dead = "[src.colour] baby slime dead" - S2.colour = "[src.colour]" + for(var/i = 0, i<=1, i++) + var/mob/living/simple_animal/slime/S1 = new /mob/living/simple_animal/slime (src.loc) + S1.icon_state = "[colour] baby slime" + S1.icon_living = "[colour] baby slime" + S1.icon_dead = "[colour] baby slime dead" + S1.colour = "[colour]" qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 06f43d0b8aa..a7683dd7847 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -1,5 +1,3 @@ -F - /mob/living/simple_animal/hostile/carp name = "space carp" desc = "A ferocious, fang-bearing creature that resembles a fish." @@ -47,9 +45,9 @@ F emote("me", 1, "nashes at [.]!") /mob/living/simple_animal/hostile/carp/AttackingTarget() - . =..() - var/mob/living/carbon/L = . - if(istype(L)) + ..() + if(isliving(target)) + var/mob/living/L = target if(prob(15)) L.Weaken(3) L.visible_message("\the [src] knocks down \the [L]!") diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index b818475bb03..51465393c2c 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -40,9 +40,9 @@ emote("me", 1, "wails at [.]!") /mob/living/simple_animal/hostile/faithless/AttackingTarget() - . =..() - var/mob/living/L = . - if(istype(L)) + ..() + if(isliving(target)) + var/mob/living/L = target if(prob(12)) L.Weaken(3) - L.visible_message("\the [src] knocks down \the [L]!") \ No newline at end of file + L.visible_message("\The [src] knocks down \the [L]!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 68f8c76ed69..3828dbdce6c 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -311,5 +311,6 @@ /mob/living/simple_animal/hostile/RangedAttack(var/atom/A, var/params) //Player firing if(ranged && ranged_cooldown <= 0) + target = A OpenFire(A) ..() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 116a2b82ec6..6bdbc2cc728 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -206,13 +206,13 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca ..() /mob/living/simple_animal/hostile/mimic/copy/AttackingTarget() - . =..() + ..() if(knockdown_people) - var/mob/living/L = . - if(istype(L)) + if(isliving(target)) + var/mob/living/L = target if(prob(15)) L.Weaken(1) - L.visible_message("\the [src] knocks down \the [L]!") + L.visible_message("\The [src] knocks down \the [L]!") // // Machine Mimics (Made by Malf AI) diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index d834d5482a8..5f9fcd35428 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -88,7 +88,11 @@ GiveTarget(watching) /mob/living/simple_animal/hostile/statue/AttackingTarget() - if(!can_be_seen()) + if(can_be_seen()) + if(client) + src << "You cannot attack, there are eyes on you!" + return + else ..() /mob/living/simple_animal/hostile/statue/DestroySurroundings() @@ -99,13 +103,6 @@ if(!can_be_seen()) ..() -/mob/living/simple_animal/hostile/statue/UnarmedAttack() - if(can_be_seen()) - if(client) - src << "You cannot attack, there are eyes on you!" - return - ..() - /mob/living/simple_animal/hostile/statue/proc/can_be_seen(var/turf/destination) if(!cannot_be_seen) return null diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 2feb135ecdc..43ee23cf49b 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -43,12 +43,12 @@ emote("me", 1, "growls at [.].") /mob/living/simple_animal/hostile/tree/AttackingTarget() - . =..() - var/mob/living/L = . - if(istype(L)) + ..() + if(isliving(target)) + var/mob/living/L = target if(prob(15)) L.Weaken(3) - L.visible_message("\the [src] knocks down \the [L]!") + L.visible_message("\The [src] knocks down \the [L]!") /mob/living/simple_animal/hostile/tree/Die() ..() diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm index 64e9d1b1c6a..1892a98a99a 100644 --- a/code/modules/mob/logout.dm +++ b/code/modules/mob/logout.dm @@ -1,5 +1,5 @@ /mob/Logout() - nanomanager.user_logout(src) // this is used to clean up (remove) this user's Nano UIs + SSnano.user_logout(src) // this is used to clean up (remove) this user's Nano UIs player_list -= src log_access("Logout: [key_name(src)]") if(admin_datums[src.ckey]) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index f53ca81309a..474a1bb7439 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -669,29 +669,18 @@ var/list/slot_equipment_priority = list( \ ..() if(client && client.holder) - - if(statpanel("Status")) //not looking at that panel - stat(null,"Location:\t([x], [y], [z])") - stat(null,"CPU:\t[world.cpu]") - stat(null,"Instances:\t[world.contents.len]") + if(statpanel("MC")) + stat("Location:","([x], [y], [z])") + stat("CPU:","[world.cpu]") + stat("Instances:","[world.contents.len]") if(master_controller) - stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])") - stat(null,"Air-[master_controller.air_cost]\t#[global_activeturfs]") - stat(null,"Turfs-[master_controller.air_turfs]\tGroups-[master_controller.air_groups]") - stat(null,"SC-[master_controller.air_superconductivity]\tHP-[master_controller.air_highpressure]\tH-[master_controller.air_hotspots]") - stat(null,"Sun-[master_controller.sun_cost]") - stat(null,"Mob-[master_controller.mobs_cost]\t#[mob_list.len]") - stat(null,"Dis-[master_controller.diseases_cost]\t#[active_diseases.len]") - stat(null,"Mch-[master_controller.machines_cost]\t#[machines.len]") - stat(null,"Bots-[master_controller.aibots_cost]\t#[aibots.len]") - stat(null,"Obj-[master_controller.objects_cost]\t#[processing_objects.len]") - stat(null,"Net-[master_controller.networks_cost]\tPnet-[master_controller.powernets_cost]") - stat(null,"NanoUI-[master_controller.nano_cost]\t#[nanomanager.processing_uis.len]") - stat(null,"GC-[master_controller.gc_cost]\t#[garbage.destroyed.len]-#dels[garbage.dels]") - stat(null,"Tick-[master_controller.ticker_cost]\tALL-[master_controller.total_cost]") + stat("MasterController:","[round(master_controller.cost,0.001)]ds (Interval:[master_controller.processing_interval] | Iteration:[master_controller.iteration])") + for(var/datum/subsystem/SS in master_controller.subsystems) + if(SS.can_fire) + SS.stat_entry() else - stat(null,"MasterController-ERROR") + stat("MasterController:","ERROR") if(listed_turf && client) if(!TurfAdjacent(listed_turf)) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 28907d096ec..95b21dde54e 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -3,8 +3,6 @@ /mob/new_player var/ready = 0 var/spawning = 0//Referenced when you want to delete the new_player later on in the code. - var/totalPlayers = 0 //Player counts for the Lobby tab - var/totalPlayersReady = 0 flags = NONE @@ -67,28 +65,16 @@ /mob/new_player/Stat() ..() - statpanel("Lobby") - if(client.statpanel == "Lobby" && ticker) - if(ticker.hide_mode) - stat("Game Mode:", "Secret") - else - stat("Game Mode:", "[master_mode]") - - if((ticker.current_state == GAME_STATE_PREGAME) && going) - stat("Time To Start:", ticker.pregame_timeleft) - if((ticker.current_state == GAME_STATE_PREGAME) && !going) - stat("Time To Start:", "DELAYED") + if(statpanel("Lobby")) + stat("Game Mode:", (ticker.hide_mode) ? "Secret" : "[master_mode]") if(ticker.current_state == GAME_STATE_PREGAME) - stat("Players:", "[totalPlayers]") - if(src.client in admins) - stat("Players Ready:", "[totalPlayersReady]") - totalPlayers = 0 - totalPlayersReady = 0 - for(var/mob/new_player/player in player_list) - stat("[player.key]", (player.ready && src.client in admins)?("(Playing)"):(null)) - totalPlayers++ - if(player.ready)totalPlayersReady++ + stat("Time To Start:", (ticker.can_fire) ? "[round(ticker.timeLeft / 10)]s" : "DELAYED") + + stat("Players:", "[ticker.totalPlayers]") + if(client.holder) + stat("Players Ready:", "[ticker.totalPlayersReady]") + /mob/new_player/Topic(href, href_list[]) if(src != usr) @@ -252,7 +238,7 @@ vote_on_poll(pollid, optionid, 1) /mob/new_player/proc/IsJobAvailable(rank) - var/datum/job/job = job_master.GetJob(rank) + var/datum/job/job = SSjob.GetJob(rank) if(!job) return 0 if((job.current_positions >= job.total_positions) && job.total_positions != -1) @@ -271,10 +257,10 @@ src << alert("[rank] is not available. Please try another.") return 0 - job_master.AssignRole(src, rank, 1) + SSjob.AssignRole(src, rank, 1) var/mob/living/carbon/human/character = create_character() //creates the human and transfers vars and mind - job_master.EquipRank(character, rank, 1) //equips the human + SSjob.EquipRank(character, rank, 1) //equips the human character.loc = pick(latejoin) character.lastarea = get_area(loc) @@ -287,8 +273,13 @@ joined_player_list += character.ckey - if(config.allow_latejoin_antagonists && emergency_shuttle.timeleft() > 300) //Don't make them antags if the station is evacuating - ticker.mode.make_antag_chance(character) + if(config.allow_latejoin_antagonists) + switch(SSshuttle.emergency.mode) + if(SHUTTLE_RECALL, SHUTTLE_IDLE) + ticker.mode.make_antag_chance(character) + if(SHUTTLE_CALL) + if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5) + ticker.mode.make_antag_chance(character) qdel(src) /mob/new_player/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank) @@ -310,21 +301,22 @@ var/dat = "