Commit Graph

156 Commits

Author SHA1 Message Date
MrStonedOne 2f255406ac Gives the large portable scrubber 3x3 scurbbing power
Also fixes portable scrubbers a bit

Conflicts:
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
2015-07-16 20:13:02 -07:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
MrStonedOne 2f9b4cd3f2 Removes gas mixture graphic overlay code, Moves all of that to turfs.
(also fixes conflicts)

Conflicts:
	code/LINDA/LINDA_turf_tile.dm
2015-07-15 00:44:01 -07:00
phil235 1265d49b7c Merge pull request #10470 from Jordie0608/spessmensfourthwallistheceiling
Fixes ooc autotoggle and adds loc to sprayer log
2015-07-14 14:45:47 +02:00
phil235 a6e9dc3362 Merge pull request #10374 from Jordie0608/spacetimeisrelativetofps
Explosion cinematics no longer delay round end
2015-07-14 14:17:33 +02:00
MrStonedOne 08b9f6c8c6 More Dynamic wait tweaks.
I forgot a step in the algo and made it so it was decreasing in its slowdown effect with more lag, not increasing.

I've also made the -1.5 magic number in the algo configurable. its was a simple buffer of cost the subsystem is allowed to use that isn't counted against it in dwait.
2015-07-10 23:25:34 -07:00
Jordie0608 70ae3d2134 fixes ooc autotoggle and adds loc to sprayer log 2015-07-09 00:52:19 +10:00
Cheridan 3f47a28096 Merge pull request #10422 from KorPhaeron/tickerfix
Fixes round end runtime related to cyborgs
2015-07-07 07:03:34 -05:00
KorPhaeron 592e307e92 Fix round end runtime 2015-07-06 02:47:30 -05:00
Ikarrus 171be443b3 If the gang's domination timer is already counting down, they get 0 attempts left 2015-07-05 00:36:33 -06:00
Ikarrus 46d99ee9c4 Gang Update: Last Refactor Bug Edition 2015-07-04 23:03:54 -06:00
Jordie0608 a693f92478 indents under spawn 2015-07-05 15:03:04 +10:00
Jordie0608 387f36f261 explosion cinematics no longer delay round end 2015-07-04 18:44:50 +10:00
Cheridan 7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
Razharas b1bf4d04fe Merge pull request #10209 from Ricotez/human_mutantparts
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
Ikarrus 2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
Jordie be391f52ff Merge pull request #9840 from xxalpha/niggastolemynuke
New traitor objective: Nuke Heist
2015-07-01 18:58:00 +10:00
Ricotez 44b795138c -Adds new proc-based job check for species. If enforce_human_authority is set, the various pieces of code that deal with roundstart job stuff will call this proc on your preferred species with 2 arguments: the name of the job and the list of mutantparts you have currently set.
-The proc is defined as proc/qualifies_for_rank(var/rank, var/list/features), and by default defined to always return 1. You must override it locally in your species definition to set special job properties.
-Lizards will fail the check for jobs in command_positions and pass it for any other job. Just like before.
-Humans will always pass the check if they don't have ears or tails. If they do have ears or tails, they will fail the check if the job is in command_positions, engineering_positions, science_positions, medical_positions, security_positions or equal to "Quartermaster", effectively limiting their job selection to civlian, lower supply and silicon jobs.
2015-06-29 22:13:25 +02:00
nullquery 6453882e37 Merge pull request #10 from nullstation/master
Merge with upstream
2015-06-28 23:03:23 +02:00
NullQuery c694febb77 Minimap support for the crew monitoring computer. 2015-06-28 23:00:39 +02:00
Razharas 601e7a6e09 Merge pull request #10095 from MrPerson/you_dare_bring_light_into_my_lair_you_must_die
Lighting SS speedup
2015-06-28 17:01:45 +03:00
nullquery a6ce6abfe3 Merge pull request #8 from nullstation/master
Merge with upstream
2015-06-28 07:09:40 +02:00
Ricotez 84231643c5 -Humans with tails and/or ears are considered not entirely human, and locked out of important positions. 2015-06-27 22:51:07 +02:00
Ikarrus 59ca40f03d Burning objects are processed every tick now instead of using a spawn() check 2015-06-27 09:22:14 -06:00
NullQuery c7e0417b44 Absolute paths with variable declarations. 2015-06-27 11:30:03 +02:00
NullQuery b4248b01e4 - Crew monitoring computer using the html_interface module
- Patch: Don't update html_interface clients that have been inactive for more than 10 minutes.
- Patch: Attempt to speed up _renderContent some more (in case of multiple clients) by using spawn.
- Patch: Second argument for hiIsValidClient hook: reference to the current html_interface object (used by crew monitoring computer).
- Feature: procqueue singleton. You can use this to put proc executions on a queue. Used by the crew monitoring computer to queue the update "for the next tick" when humans move.
2015-06-27 10:26:46 +02:00
NullQuery 15cdf9bfca Merge from upstream. 2015-06-25 20:30:19 +02:00
Cheridan c7e0b96314 Merge pull request #10083 from MrStonedOne/ISTHISVALID
Admins can now reject shitty adminhelps
2015-06-23 14:26:11 -05:00
phil235 3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02:00
MrPerson e507613fbe Lighting SS speedup
Best of both worlds: No colons AND no pointless typechecking!
2015-06-22 04:09:33 -07:00
MrStonedOne 40c2ca5966 Tweaks adminhelp rejections and adds changelog 2015-06-21 13:23:42 -07:00
Fayrik 58301912e2 This was way too much work, so this had better work now. 2015-06-21 20:04:16 +01:00
MrStonedOne 9583b1213b Adds new timer subsystem
Adminhelps now use it so that they can cancel the timer to return the admin help verb.
Adminhelps now allow admins to reject the adminhelp, giving the user back the verb and a message telling them how to construct a better admin help.
2015-06-21 11:55:38 -07:00
Razharas 6d0c3840ab Merge pull request #9882 from MrStonedOne/mctweaks
Tweaks MC's dynamic rate system a bit. Lowers lag from singulo getting released.
2015-06-13 04:37:00 +03:00
Razharas f15baf895c Merge pull request #9896 from Aranclanos/subsystemAfterInitialize
Fixes the 3k active turfs at roundstart
2015-06-13 04:36:00 +03:00
Razharas b100ed1cb7 Merge pull request #9887 from Aranclanos/activeturfs
Added a warning for having active turfs at roundstart
2015-06-13 04:17:11 +03:00
xxalpha 64c4a61819 Added animation for no nuke explosion. 2015-06-11 21:24:35 +01:00
Miauw a881478743 Removes strip_html_properly(), replaces it with html_encode().
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
Aranclanos 109aa5a715 Adds AfterInitialize() to the subsystem datums, it will be called once all Initialize() calls finish. Currently only atmos uses it to set up the turfs.
Before I had the luxury to initialize atmos last, by just ordering the calls, but now that they are on a list it's not viable
2015-06-11 03:48:32 -03:00
Aranclanos d448e0af66 Added a warning for having active turfs at roundstart 2015-06-10 15:44:14 -03:00
MrStonedOne 14b258c655 Tweaks MC's dynamic rate system a bit
The MC will now track the total cost of all subsytems (normalized out to a per second cost number so that subsystems that only run every 10 minutes but are costly (looking at you server tasks) aren't accounting for 90% of the number when they shouldn't.)

This is now used in the dynamic wait subsystems to ensure they slow down when other things are being lagging

This mainly means that air won't lag things if the singulo gets free.

I also tweaked the scaling curve used by the dynamic wait system so that it scales less during slight lag, but much more during higher lag times.

I added qdel to the dynamic wait subsystem with a really high scale. This didn't make sense before, because it limits its run time, but now it can scale back how often it runs when the other subsystems are being laggy. I also lowered qdel's max runtime from 2ds to 1ds, because deletes take 0.9 ds on avg, so it would end up running for 2.9ds often.

This should prevent air+singulo+qdel causing excessive amounts of lag.
2015-06-10 05:04:56 -07:00
Cheridan adfb237de3 Merge pull request #9696 from Incoming5643/why_cant_we_be_friends
Escape alone joint greentext + escaping on the nuke op shuttle
2015-06-05 17:16:11 -05:00
Cheridan 6ca4cb1e64 Merge pull request #9735 from Jordie0608/whyevenhavetwoverbs
World.Reboot() Improvement
2015-06-05 16:43:13 -05:00
Cheridan ed8dffca94 Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
Bugfix: Witticism depleted editon
2015-06-03 09:49:51 -05:00
Cheridan 905f350597 Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2
Conflicts:
	code/game/smoothwall.dm
2015-06-02 13:45:56 -05:00
Aranclanos e7c0d7e95c Removes unsimulated turfs.
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Jordie0608 bd7019e033 standardizes Reboot(), allows round to be delayed after it finishes and removes immediate reboot verb 2015-06-01 22:07:22 +10:00
Jordie0608 33a4a73fe1 adds fallbacks for jobs if spawnpoints dont exist 2015-06-01 17:36:28 +10:00
Cheridan 2aa0247b00 Merge pull request #9701 from Cuboos/SoundsEp2_WizardBoogaloo
Wizard Sounds has the update. Been a bit since i've done a commit, so…
2015-05-31 15:51:59 -05:00
Cuboos deaf5e88e6 Update ticker.dm 2015-05-31 12:36:57 -07:00