Commit Graph

914 Commits

Author SHA1 Message Date
Bjorn Neergaard 063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
tkdrg 8b10c648e5 Merge pull request #15144 from lzimann/debugverbs
Makes debug verbs toggleable
2016-02-03 22:12:56 -03:00
Lzimann 9b316eace2 Makes "Show debug verbs" toggleable 2016-02-02 01:34:53 -02:00
tkdrg 0f47866cad Merge pull request #15122 from JJRcop/bugfixmoji
Fixes emoji issues to do with adminPM and OOC formatting
2016-02-01 19:44:16 -03:00
Remie Richards 8f3245282e Merge pull request #14944 from tkdrg/agoodideaforonce
adminmoreinfo links to antags in ahelp are now red
2016-01-31 19:58:24 +00:00
JJRcop ab99043d31 Fixes emoji issues to do with adminPM and OOC formatting 2016-01-31 12:57:43 -05:00
tkdrg 7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
AnturK 8999db80b4 Fixes shuttles loading improperly in templates
Adds template datum and preloader
2016-01-29 20:51:12 +01:00
Razharas 0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs
Absolute paths and changes one liner if's/else's/else if's.
2016-01-29 03:15:12 +03:00
tkdrg 9ac73a85f8 Merge pull request #14702 from tgstation/RemieRichards-callproc-improvement
callproc now outputs the contents of returned lists instead of /list
2016-01-28 18:57:13 -03:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Jordie0608 30c5ab037b removes unnecessary file() 2016-01-27 22:18:38 +11:00
Jordie0608 579ff0428e fixes date change failing log ftp 2016-01-27 21:48:41 +11:00
Bjorn Neergaard 194ab5b264 Remove unused mapping verb 2016-01-26 15:11:41 -06:00
Bjorn Neergaard d0f57701d9 Remove old define 2016-01-26 14:07:17 -06:00
Tkdrg 7ca975ba57 adminmoreinfo links to antags in ahelp are now red
Credits to irishwristwatch0 for the idea. Also, this will conflict with
datum antags, so feel free to put it on hold until incoming is done.
2016-01-26 14:37:45 -03:00
Bjorn Neergaard f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
MrPerson e1b3815539 Fixes some awful defines to not be hacks 2016-01-22 19:07:37 -08:00
Firecage d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
xxalpha 577488e0d8 safepick
more safepick
2016-01-18 05:46:44 +00:00
Remie Richards cb647aa730 swaps position of newline character, Never produce PRs on a lack of sleep. 2016-01-18 01:30:34 +00:00
Remie Richards 83ef5bc47e newline formatting 2016-01-18 01:08:18 +00:00
Remie Richards def68f134c Missed an argument. 2016-01-17 20:20:35 +00:00
Remie Richards 65a60d438c Adds the ability for get_callproc_returnval() to spot assoc lists 2016-01-17 20:18:09 +00:00
Remie Richards 603bf4624c callproc now outputs the contents of returned lists instead of /list
While it's useful to know when a /list has been returned, it's infinitely more useful to see that list's contents
2016-01-17 20:12:51 +00:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage 332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
Cheridan 6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor
Refactor the visible_message() proc to be faster in some cases.
2016-01-09 22:16:57 -06:00
Tkdrg 5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
2016-01-07 23:15:35 -03:00
phil235 e225fbc850 - Refactor the visible_message() proc to be much faster.
- Replacing some "for(var/mob/o in viewers()) show_message()" by "visible_message()".
- Replacing some "show_message()" by " << "..." " instead.
- Fixes being able to see the results of the health and slime analyzers while blind.
-
2016-01-04 22:49:27 +01:00
MrStonedOne 5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
Kyle Spier-Swenson 675b0bc500 Removes comment that is no longer needed 2016-01-02 20:04:54 -08:00
MrStonedOne b50e8d2a63 removes a bunch of unneeded spawns
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
duncathan b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
Kyle Spier-Swenson b052e8367f Update debug.dm 2016-01-02 04:07:16 -08:00
Kyle Spier-Swenson 85c037ffe7 Fixes byond trying to create a new /world/ object on admin proc calls
This SHOULD work
2016-01-02 03:25:31 -08:00
Cheridan 9eef40c33f Merge pull request #14190 from tkdrg/lmao
Fixes create revolutionares bugs
2016-01-01 00:46:02 -06:00
Tkdrg 3b1553cb8c Fixes create revolutionares bugs
Fixes create revolutionares feedback message
Fixes creating revs on z levels other than 1

Fixes #14189
Fixes #14161
2015-12-31 04:19:32 -03:00
duncathan 8392974ad0 fixes associative list; adds gas_overlay to "datum gases" 2015-12-29 22:50:09 -06:00
duncathan 17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
AndrewJacksonThe2nd dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
2015-12-28 12:40:51 -08:00
duncathan b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
duncathan salt ede1cdb511 Merge pull request #13960 from AnturK/nuclearoption
Random fixes
2015-12-24 14:12:24 +01:00
tkdrg 02aff598b2 Merge pull request #13852 from RemieRichards/AdminQuickMapDrop
Map Template Load Verb + Maploader Improvements
2015-12-23 17:51:20 -03:00
Remie Richards 965b6642ad smarter extension detection 2015-12-23 20:34:31 +00:00
AnturK 503a8a3557 Fixes SQDL2 paren escaping 2015-12-23 12:27:24 +01:00
Remie Richards 67c71b5961 Allows admins to upload a map template to be used by themselves or other admins, does NOT persist between rounds. 2015-12-23 02:24:08 +00:00
tkdrg 96855b3094 Merge pull request #13800 from KorPhaeron/voices
Prayer response voice is generalized again
2015-12-21 03:16:31 -03:00
Remie Richards 5f257aa8fe Admins with +DEBUG can now Load map files in the _map/templates folder where they (or their ghost) is standing. 2015-12-20 21:21:33 +00:00