phil235
9f3ce51604
Merge pull request #11293 from Aranclanos/watchlist
...
Fixes the watchlist edit option not working at all
2015-08-24 14:06:18 +02:00
Aranclanos
5655379866
Fixes the watchlist edit option not working at all
2015-08-20 08:11:48 -03:00
Kyle Spier-Swenson
37bd15dd1b
adds some sane sorting to sql notes.
2015-08-19 08:36:22 -07:00
Swag McYolosteinen
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
Jordie
4463c59849
Merge pull request #11221 from Core0verload/spawnpanel
...
Spawn panel improvements
2015-08-19 19:01:15 +10:00
Jordie
5e430b3384
span4cheri
2015-08-19 17:18:13 +10:00
Jordie0608
c2d7dff564
Merge branch 'master' of https://github.com/tgstation/-tg-station into despitebestattemptsthedeweydecimalsystemhasnotyetbeenadaptedtoworkwithsql
...
Conflicts:
README.md
2015-08-19 15:27:26 +10:00
Jordie0608
5be606c18e
injection fixes
2015-08-19 15:09:59 +10:00
Jordie0608
e4b21e30d3
autoconvert notes to sql procs
2015-08-17 15:24:50 +10:00
Firecage
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02:00
Jordie0608
9e2c59ca24
debug fix
2015-08-15 22:34:18 +10:00
Jordie0608
e2d3488f7f
database notes
2015-08-15 22:24:24 +10:00
c0
c16daab823
Added /obj/item/device to spawn panel
2015-08-15 13:52:45 +03:00
c0
7e1bd34583
Spawn panel improvements
2015-08-15 13:34:15 +03:00
Swag McYolosteinen
5e18380888
Merge pull request #11103 from AnturK/latespawn
...
Adds admin verb to reset latejoin spawns
2015-08-13 16:38:11 +02:00
Remie Richards
9ca1f2f262
VV and VV Mass Modify now accept variables when editing a string variable, this allows you to embed variables in string variables, variableception.
2015-08-11 04:52:48 +01:00
AnturK
a797fa80d7
words
2015-08-08 21:20:18 +02:00
AnturK
8a1e4435b6
Adds admin verb to reset latejoin spawns
2015-08-08 18:52:57 +02:00
Kyle Spier-Swenson
f4c4a3399c
Admins can now use marked objs with atom proc call
2015-08-04 19:10:00 -07:00
c0
d3c363a2e4
Changelog
2015-08-04 00:14:24 +03:00
c0
667d5e75c3
Transferred body eggs to new organs system
2015-08-03 23:24:17 +03:00
Jordie
9d41569b0c
Merge pull request #10918 from Ikarrus/gangending
...
Adds Ending Cinematic for Gang Dominations
2015-07-30 20:49:39 +10:00
Jordie
73fa75873c
Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic
...
Memo update
2015-07-29 21:35:28 +10:00
Jordie0608
047b49f166
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-07-29 20:05:15 +10:00
Jordie
77025043c8
Merge pull request #10880 from Fayrik/GotTooManyBranches
...
Reverts #10619 , Adds Logging and Context to Admin's Who Command
2015-07-29 18:05:54 +10:00
Jordie
d841bb25b8
Merge pull request #10833 from Steelpoint/ERTDesc
...
[QOL] Expanded Admin Descriptions For ERT Deployment
2015-07-29 17:30:43 +10: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
Jordie0608
f9b6dfcefe
login memo fix
2015-07-28 23:24:25 +10:00
Jordie0608
f7489b18af
memo update
2015-07-28 21:42:25 +10:00
Fayrik
b67068b5c5
Who is cool again. Also, observers aren't ghosts. (And I hate pointless whitespace.)
2015-07-27 02:26:59 +01:00
Steelpoint
a3099df65a
WrongWord
2015-07-27 01:38:29 +08:00
Steelpoint
a5233a77d6
DescUpdate
2015-07-27 01:35:23 +08: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
Jordie0608
444614dcf7
sql fixes
2015-07-25 12:05:19 +10:00
bgobandit
0d9f7dcb4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-24 11:58:52 -04:00
Steelpoint
45ebc998de
Fix
2015-07-24 19:37:55 +08:00
Steelpoint
242ba82a50
ERTDescForAdmins
2015-07-24 19:19:36 +08:00
Cheridan
24d17e3c97
Merge pull request #10694 from Jordie0608/mimosmemomentionsminchinsmargerymargarine
...
Database Admin Memos
2015-07-24 00:46:26 -05:00
bgobandit
fcb081f0e1
(hopefully) fixes merge conflict, adds changelog entry
2015-07-23 11:22:49 -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
bgobandit
df836d0f73
Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug.
2015-07-23 10:49:06 -04: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
82534bb828
Merge pull request #10577 from Aranclanos/dellog
...
del log verb no longer inside of the show debug verbs
2015-07-23 21:17:56 +10:00
Jordie0608
75e54fb036
Merge branch 'master' of https://github.com/tgstation/-tg-station into mimosmemomentionsminchinsmargerymargarine
...
Conflicts:
code/modules/admin/topic.dm
2015-07-22 15:52:51 +10:00
Incoming5643
af04cfa0b7
I almost got through a PR without any follow up commits
...
but I'm using the web interface so I must be pretty cocky
2015-07-21 14:54:35 -04: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
Jordie0608
073b419bd3
fixes kick and ca links in pp
2015-07-21 04:21:38 +10: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
Cheridan
1c05fbcf6a
Merge pull request #10450 from phil235/MechRefactoring
...
Mech code refactor
2015-07-20 02:00:11 -05:00
