Commit Graph

254 Commits

Author SHA1 Message Date
Cheridan 531b19b5e9 Merge pull request #11263 from Aranclanos/processremove
Replaces the Cut() usage in the processing lists from the different c…
2015-08-19 22:49:30 -05:00
Robustin 61b7c347a1 Fixes Announcements Garbling
Maybe... Doubtfully... But I wanted to give it a try since I'm tired of my glorious pronouncements garbled in &39

If I actually fixed it then I should get a medal for best coding by someone who can't code. My logic was that WHISPER works just fine with apostrophes and ampersands but shuttle call reasons, announcements, etc. would get that garbled text when using apostrophes and ampersands.

With whispers trim is on the "inside", with stripped_input that is used for these announcements trim is on the "outside". It makes intuitive sense to me that whoever wrote that stripped_input comment might have gotten things flipped since if trim is on the inside, and it allows single symbols to pass through, then there's nothing to filter html_encode from spewing that garbage out.

If this isn't the correct fix then at least I should be close enough that someone can point me in the right direction.
2015-08-19 15:43:01 -04:00
Swag McYolosteinen 825b5794c7 Merge pull request #11239 from Firecage/del2qdel
del() to qdel()
2015-08-19 11:50:24 +02:00
Jordie fb1e5ea601 Merge pull request #11155 from Niknakflak/Restart_votes_Restriction
Makes restart votes not restart the server if admins are online
2015-08-19 19:07:38 +10:00
Remie Richards 3891e67d8d Merge pull request #11162 from Core0verload/rnd-implants
RnD update
2015-08-18 20:20:12 +01:00
Aranclanos 6b8ab6641a Replaces the Cut() usage in the processing lists from the different controllers for a Remove() 2015-08-18 06:52:57 -03:00
Firecage 005f032108 Changes a qdel back to del 2015-08-17 11:37:21 +02:00
Firecage bf13763e3b Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel 2015-08-16 23:34:03 +02:00
Firecage dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
phil235 bc6ffdcf31 Merge pull request #11194 from Aranclanos/wabbajack
The staff of change projectile will qdel the mob instead of manually …
2015-08-15 22:28:27 +02:00
Aranclanos ca98ac5151 The staff of change projectile will qdel the mob instead of manually deleting it.
Added a warning for when the mob controller removes a null from the mob list.
2015-08-13 21:40:00 -03:00
c0 df4d5cfe0d RnD update 2015-08-12 15:18:13 +03:00
Kyle Spier-Swenson f176789a0b improvements to vote restart when admins are on
It will only count admins who can actually restart the server.

It will stop searching for admins once it finds one.

It will let the users and admins know that the restart vote will not automatically restart the server because of the active admins.
2015-08-11 22:03:21 -07:00
Orange Borg 65b6eae001 Improve the check for active admins 2015-08-12 16:33:05 +12:00
NikNakFlak 3216b07759 Makes restarts not restart the server if admins are online 2015-08-11 21:05:30 -07:00
KorPhaeron 4538106eeb Fixed 2015-08-06 23:08:11 -05:00
KorPhaeron 48b18740d3 Wrong define 2015-08-05 16:57:20 -05:00
KorPhaeron be9e0e499f Early Pod Launch 2015-08-05 16:45:13 -05:00
Ikarrus 5b1e7ce777 Minor Tweak - Ads delay to gang victory printout 2015-07-31 21:38:57 -06:00
Jordie 9d41569b0c Merge pull request #10918 from Ikarrus/gangending
Adds Ending Cinematic for Gang Dominations
2015-07-30 20:49:39 +10:00
Aranclanos 706ff7500e Merge pull request #10864 from MrStonedOne/firelockatmosfix
Atmos fixes and tweaks.
2015-07-29 13:55:57 -03:00
Ikarrus 4aedc97e82 Adds Ending Cinematic for Gang Dominations
It basically flashes the SYSTEM OVERRIDE COMPLETE animation.
2015-07-28 20:21:52 -06:00
MrStonedOne be886418b4 Minor fixes to air
It was initializing turfs after atmos machinery but some of those machines expect turfs to be initialized before they initialize.

Also fixes it clearing all active turfs and not just the one in the specified zlevel in turf initialization.
2015-07-27 16:10:11 -07:00
MrStonedOne dde57d8267 Fixes objs that block air breaking atmos when spawned in a non-blocking state
This included any door that started open (firedoors being the main example)
Fixes #10828
2015-07-25 23:16:23 -07:00
MrStonedOne 4e971a7e57 Moves build_network to air's initialize, Removes initialize() from atmos machinery 2015-07-25 23:08:02 -07:00
MrStonedOne d38cfcb4ec Removes MC's after init proc
It was only used for air, we can just move air to init last with priority = -1 (this is what this is for)
2015-07-25 23:04:49 -07:00
Chiefwaffles 1c59a84660 Dumb byond stuff fixed and merge conflict fixed for the gazillionth time. 2015-07-25 16:19:21 -07:00
Jordie 9fbabcc305 Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe
Change many ERROR() calls into thrown exceptions
2015-07-25 19:22:46 +10:00
Owen Jacobson 3e133b610b Make rooms exposed to space more space-y by setting up atmos consistently.
Space-exposed turfs are now at a steady state at roundstart, and fully in vacuum. Bring internals and a hardsuit.
2015-07-23 23:36:50 -04:00
MrPerson 471d69fcf7 Change many ERROR() calls into thrown exceptions
This requires a 508 beta version to use. If Travis fails this he's a bitch

Exceptions will generate a stack trace, which is way easier to see and more helpful in actually solving this kind of crap. Also logs all the arguments, src, line, and file automatically.
Removed any dubiously helpful information in the exception names so the runtime condenser won't see each one as a different runtime. If the information is critical to solve these bugs (camera one maybe?), then I'll just make these warnings.
Thrown exceptions crash the currently running proc. Yes that means there's useless returns in a bunch of these, sue me. spawn()'s are to let the proc continue.

Almost all of these are difficult to trigger, but I did test playsound. And frankly even if they do cause bugs by crashing procs, big whoop
2015-07-23 08:19:08 -07:00
bear1ake 97ed1728fd sync merge 2015-07-23 21:47:13 +09:00
Jordie 99814bc1b9 Merge pull request #10737 from Incoming5643/end_my_suffering
Adds a server admin version of end round now
2015-07-23 22:33:47 +10:00
Jordie da7f758ef3 Merge pull request #10566 from Ikarrus/hardcapqueue
Adds a Join Queue if the server exceeds its hard population cap [Ready]
2015-07-23 22:18:12 +10:00
Jordie 204d1e2457 Merge pull request #10574 from nullstation/hi-extended
Changes to the crew monitoring computer
2015-07-23 22:17:50 +10:00
Incoming 59217b2b06 Adds a server admin version of end round now; a semi obscure admin tool that came about in the mulligan push but never really got advertised. It will print out a round end report and attempt to database round stats before restarting. Suggested use is when the round has SLOWED down to an unplayble crawl for some reason but the game is still technically responcive. Pressing end round doesn't preclude the use of reset if it doesn't seem to be working, but end round should usually be tried first.
Removes the 20 second confirmation between prompts for the normal admin version of end round now.

If admins force end a round escape objectives will be good faith greentexted if the antagonists were still in a position to escape alive.

The survival rate will always be printed at round end now, even if the shuttle makes it to centcom (evac rate will be printed too in that case).
2015-07-20 23:06:42 -04:00
bear1ake c37813e301 Merge https://github.com/tgstation/-tg-station into at_list
Conflicts:
	config/admins.txt
2015-07-20 23:24:56 +09:00
Carl Ivanov 104f300952 remove file, take 2
remove file path from warning message
2015-07-19 22:36:30 +09:00
Carl Ivanov ec3c91c54b remove file
Aranclanos' request
2015-07-19 22:29:01 +09:00
Carl Ivanov 67d8f3c6a6 Don't spam file with coordinates
and save them to global list
2015-07-18 20:17:48 +09:00
Chiefwaffles 37625502bb Fixes ANOTHER conflict. 2015-07-17 18:37:52 -07:00
Carl Ivanov 152562a33e AT list to textfile 2015-07-18 00:12:26 +09:00
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
Chiefwaffles 2c3db425fa Resolve merge conflict, step 1. 2015-07-16 12:35:58 -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
Chiefwaffles 4ac15e0ec2 Merge remote-tracking branch 'remotes/upstream/master' into Obsolete_AI_2016 2015-07-12 19:16:44 -07:00
Ikarrus 1c43425304 Tested and Tweaked 2015-07-12 09:50:57 -06:00
nullquery af8be99372 Merge pull request #20 from nullstation/master
Merge with upstream
2015-07-12 13:38:57 +02:00