Commit Graph

456 Commits

Author SHA1 Message Date
phil235 3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02:00
Fayrik 58301912e2 This was way too much work, so this had better work now. 2015-06-21 20:04:16 +01:00
Ikarrus 2605ed586b Reverts dominator sound change
Dominator sets Delta Alert now
Delta Alert text changed to accommodate this change (+3 squashed commit)

Squashed commit:

[3129c95] Icon state update

[21bddf3] Dominators play the malf sound when activated (until I can find a better alternative).

[2289074] Unfucks changelog (+1 squashed commits)

Squashed commits:

[2289074] Unfucks changelog
2015-06-18 23:00:04 -06:00
MrStonedOne 7cfff6f1ca Secrets clean up/configurable bomb cap
Moves Secrets to it own file so its not stinking up admins.dm and topic.dm

Makes the bombcap configurable rather then being a per-round only thing.
2015-06-14 09:08:27 -07:00
Razharas 29730ce479 Merge pull request #9412 from RemieRichards/ReactionaryExplosions
Ports VG's DeityLink's new explosion method
2015-06-13 04:45:23 +03: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
Remie Richards d72cb4bdf1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions
Conflicts:
	code/game/machinery/doors/poddoor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/unsimulated/walls.dm
	code/modules/admin/admin_verbs.dm
2015-06-11 16:23:45 +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 2d998452db Merge pull request #9715 from Firecage/datumspaths
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04: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
Firecage 84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage 3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
Cuboos fcc18020a9 Wizard Sounds has the update. Been a bit since i've done a commit, so forgive me if i did this wrong. Also added the third title song, there a lot of agreement on what to do so i'll just add it as is, if a change needs to be made i'll do it later. 2015-05-29 20:29:37 -07:00
Incoming 69e8fc2eb1 Antags with escape alone can win jointly with other antagonists, it only matters that normies are kept off.
Non-antagonists can be brought on a shuttle without endangering an escape alone victory provided they're kept locked in the brig.

Escaping to syndicate space abord the nuke op shuttle is now a valid way to escape in terms of objectives.
2015-05-29 19:02:52 -04:00
Incoming 69f8f6575b Antagonists Will No Longer Show Up as MODE in round end reports.
Instances where the game would give special treatment to MODE players will instead check to see if a player's assigned_role (job) matches their special_role (antag status). All antags that start off station (as well as ninjas for some weird reason) were affected.

Fixes #8743
2015-05-25 15:58:32 -04:00
Aranclanos 2eb6a202d7 Fixes the tip of the round not being 30 seconds before the round starts. It was at 3. 2015-05-13 21:41:27 -03:00
Cheridan 13c38fc456 Merge pull request #9421 from Incoming5643/EvenMoreValidPrivilage
Rolling for antag at roundstart grants popcap immunity
2015-05-11 08:21:36 -05:00
Remie Richards 7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes
Merges power subsystem into machine subsystem.
2015-05-10 08:23:20 +01:00
MrStonedOne c6c7237265 Merges power subsystem into machine subsystem.
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
2015-05-09 23:48:18 -07:00
Incoming 7d90ec14ef Fixes a very edgy case where if a server was running up against a hard or extreme population cap it could theoretically reject someone already selected to be an antagonist, which could lead to all sorts of oddities.
Not a pressing issue on tgstation servers, as the hard and extreme pop caps exist at higher levels than either server pull on even the highest of traffic days (or they're just off)

Note that this check isn't relevent for late join antagonists, they roll for antag after spawning on the station, you couldn't just mash the join button until you managed to roll for antag.
2015-05-09 02:50:19 -04:00
Remie Richards fdeb84021d Merge pull request #9320 from GunHog/Botcall_V2
Bot performance and PDA features update
2015-05-09 06:26:19 +01:00
Remie Richards 3b98e4448d Ports /vg/ DeityLink's new explosion effect, Blast doors are more resistant to explosions, Explosions can now take walls and doors into account (Cheaper than recursive explosions), Engine floors are more resistant to explosions. 2015-05-09 01:02:06 +01:00
Cheridan 98e63e0943 Merge pull request #9364 from Incoming5643/PleasePlaySecurity
Players who enjoy loyalty implanted jobs now get fair antagonist rolls in all modes
2015-05-08 12:39:14 -05:00
Jordie c9b804f6f6 Merge pull request #9256 from astralenigma/cradesbypaprka
Crates are mailed with manifests taped to the outside by paprka Merge Conflict resolution
2015-05-08 22:10:35 +10:00
GunHog cdc3e5c174 Removes bots from NPC Pool
It was causing unexpected and buggy behavior with certain bots, and has
been tossed in the bin along with radio code.
2015-05-07 08:42:31 -05:00
Cheridan f49fbf1efc Merge pull request #9303 from RemieRichards/ExperimentalPerfomancetest
Explosion Performance Upgrades
2015-05-06 09:00:42 -05:00
Incoming 23cc8c7db0 All modes now choose their antagonists before they choose jobs. A new mind attached list, restricted_roles, will keep incompatible jobs out of rotation.
Players who would otherwise qualify to play as an implanted job will spawn as the most wanted not implanted job they qualify for if they are an onstation antagonist. If they don't qualify for any job in this way depending on preferences they will either spawn as an assistant or a random job (which also makes sure they don't end up in an incompatible job).

Note this doesn't impact late join antagonists or mulligan antagonists. Roundstart only.
2015-05-05 23:29:03 -04:00
Jordie0608 b6f797890b Caps station integrity to 100% 2015-05-05 19:22:39 +10:00
Remie Richards 2234a9b25e powernet datums now manually clear references, subsystem/proc/postpone() now takes an optional "cycles" argument, for postponing more than 1 cycle, Explosions are less laggy! 2015-05-03 04:39:48 +01:00
Cheridan bbb1df2654 Merge pull request #9263 from Incoming5643/fightvale_pride
Fixes another instance of FIGHTVALE
2015-05-02 17:46:24 -05:00
MrStonedOne eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
Incoming 9b3f98571c mulligan will no longer mulligan a round into the same mode. Because of how scaling works this would at best only create one or two additional antags. At worst it wouldn't create any antagonists, and mulligan would get frustrated and reroll after its failure. 2015-05-02 00:00:41 -04:00
Cheridan 84d2a5a006 Merge pull request #9228 from Ikarrus/pregamedelay
Admins can now adjust pre-game delay time
2015-05-01 15:03:26 -05:00
Cheridan 509d940746 Merge pull request #9225 from Incoming5643/Unless_its_wizbiz_bugs_will_usually_follow
Fixes Round End Sound
2015-05-01 14:13:07 -05:00
MrStonedOne 94a132dbde pr-9231 changelog and minor subsystem tweaks 2015-05-01 05:24:33 -07:00
MrStonedOne fe1d3c22d5 Minor rework of lobby admin verbs
Both me and #9228 fixed the same bug, so I reverted mine

Starting the round with the start now verb will now show a tip of the round.
2015-04-30 18:27:58 -07:00
astralenigma d84bfc0f2b Putting all on github now.
Only crates is missing the overlay of the manifesto.
2015-05-01 00:33:21 +01:00