Commit Graph

477 Commits

Author SHA1 Message Date
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax"
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
2016-07-28 15:48:27 -07:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
Krausus
6cff9b10d6 Further voting controller tweaks
- Adds admin logging to creating and canceling votes
- Adds exception handling
- Adds deletion handling (should, theoretically, never be necessary)
- Adds tick-checking, just in case there's a lot of clients watching a
vote
- Adds the vote controller to the "debug controller" list
- Fixes that one "if" Tiger whined about
2016-07-24 19:46:34 -04:00
Krausus
5b21a9a785 Improves voting system
- Makes votes show votes for winning option, or all options in a custom
vote
- Makes the voting panel automatically update
- Makes the voting panel use the browser datum
- Turns the voting notice into a clickable link
- Fixes admin status not properly being checked when the voting page is
refreshed
- Replaces vote process with a spawned loop in the vote controller
- Removes vote processing from the pre-game game ticker
2016-07-23 02:03:19 -04:00
Krausus
334894ea3a Makes vote controller pathing non-relative
This is a separate commit so other changes are actually visible in the
diffs
2016-07-22 22:00:58 -04:00
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
Fox-McCloud
01ffeb45fe more tweaks 2016-07-15 05:52:56 -04:00
Krausus
0535765ba4 Improves caught exception logging
Also refactors away "log_runtime" config var to use its name for a
helper proc
2016-07-14 15:44:28 -04:00
Fox-McCloud
84f9a06881 probably not necessary 2016-07-14 04:47:11 -04:00
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
monster860
94c1a4e08e Merge branch 'master' into vg-parallax 2016-07-08 14:51:30 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Crazylemon64
ac3db33709 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-04 14:54:49 -07:00
Crazylemon64
27ee3c7247 It's re-entrant now 2016-07-04 14:52:19 -07:00
Crazylemon64
a44808f195 Final map tweaks 2016-07-03 17:17:56 -07:00
Crazylemon64
2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
Crazylemon64
f2b48c7c67 You can now load the cyberiad with the map-loader 2016-07-02 22:50:45 -07:00
Krausus
3b164cd8aa Loadout fixes and loadout points config option
- Adds a configuration option for loadout points.
- Fixes the blue plaid skirt lacking its own unique type, causing
runtimes due to the mismatch between its display_name and
initial(display_name).
- Fixes the gear selection table using a fixed width.
- Fixes the restrictions column not consistently being added.
- Fixes the header and footer lacking the proper column span to account
for the restrictions column.
2016-07-03 00:24:40 -04:00
Crazylemon64
dd98f1c868 Merge remote-tracking branch 'Krausus/InvestigateFix' into space_ruins
@tigercat2000 is a butt
2016-06-24 16:42:47 -07:00
Crazylemon64
a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -04:00
Krausus
30517a9b10 Adds Error Handling and Realtime Runtime Reviewal (#4679)
* Adds Error Handler

Adds a /world/Error proc to handle runtime errors. This proc replaces
the normal runtime logging behavior, providing the following
improvements:

- Adds timestamps to runtimes
- Pads or omits certain lines
- Continues logging runtimes after the 99th (with less info, as provided
by BYOND)
- Adds ckey and accurate xyz to usr info
- Continues including usr info after 19th runtime
- Silences spammy runtimes (by default, a runtime that occurs 10 times
in 10 minutes gets ignored for the next 10 minutes)

* Adds runtime viewer

Also fixes a minor mistake in the error handler

* Sanitizes HTML in Error Viewer

Also removes the stray return from the end of the error handler

* Prettifies Error Viewer

Now uses browser datum and some extra bits of formatting, inspired by
the changes made by @PJB3005

* Error Handling Improvements

- Skipped error counts now show up in the error viewer
- Proper runtimes caught by a process are now sent to the main error
handler
- The error handler and viewer can now handle a provided src, such as
one from a processing runtime
- Moved some info generation into helper procs
2016-06-19 12:53:07 -04:00
Matt Milosevic
bc86a86ece Hopefully final 2016-06-08 18:30:26 +02:00
Matt Milosevic
84ec23b1d2 Back where we started... 2016-06-05 00:41:45 +02:00
Matt Milosevic
a162488f03 Totally refactors and updates the ruins code 2016-06-03 21:26:25 +02:00
Matt Milosevic
925d7a4d01 It works! Kind of. 2016-06-03 15:43:18 +02:00
Matt Milosevic
3dd8f1e34d Initial space ruins commit 2016-06-03 12:47:42 +02:00
TheDZD
015af5519e Merge pull request #4391 from Fox-McCloud/objectives
TG Traitor Objectives Assignment
2016-05-10 22:41:49 -04:00
Fox-McCloud
a40460a365 TG Traitor Objectives Assignment 2016-05-07 22:28:57 -04:00
Tastyfish
82a9612653 Some math, mob helper/ one-liner optimizations 2016-05-06 04:38:59 -04:00
Tastyfish
7c85fc71eb Fixes timer runtimes 2016-04-30 07:00:56 -04:00
Tastyfish
3b59d2cd15 Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster 2016-04-29 23:42:47 -04:00
TheDZD
dc289611bc Merge pull request #4230 from Tastyfish/minornp
Minor fix to npc controller
2016-04-17 18:52:20 -04:00
Tastyfish
dcbdc4aa56 Minor fix to npc controller 2016-04-17 17:05:59 -04:00
Tastyfish
0820c03a18 Removes unnecessary extra stuff I did, makes bot radios cleaner 2016-04-16 18:36:21 -04:00
Tastyfish
178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tigercat2000
dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/game/machinery/door_control.dm
2016-04-05 21:10:36 -07:00
FalseIncarnate
8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
FalseIncarnate
40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tastyfish
b2d9c2e6a9 Fixes mulebots killing passenger, bot tweaks 2016-04-03 15:39:54 -04:00
Tigercat2000
519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00