Commit Graph

836 Commits

Author SHA1 Message Date
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746 Merge pull request #2040 from Markolie/guns
Guns update
2015-09-14 22:11:33 -04:00
Markolie
0c991f7092 Nuke code admin check fix 2015-09-14 22:13:18 +02:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Regen
5a87bfd41e Move verb to debug 2015-09-09 16:52:35 +02:00
Regen
009909650c Adds cinematic verb
This will add the cinematic verb to the Event panel, will work like a
normal nuke / AI override, meaning it will kill everyone (ending the
round)
2015-09-07 12:11:45 +02:00
Fox-McCloud
d829e7003a Merge pull request #1913 from Markolie/lawmanager
Port Bay's silicon law manager
2015-09-01 16:41:55 -04:00
Fox-McCloud
0e5b6fb1fa Merge pull request #1918 from Markolie/fixes2
Fixes
2015-08-31 17:37:27 -04:00
Fox-McCloud
57a9fdcc59 Merge pull request #1910 from Markolie/syndistamp
Syndistamp
2015-08-31 17:15:01 -04:00
Markolie
4c798a014e Update ERT leader name 2015-08-31 20:10:49 +02:00
Markolie
b999ca32b8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-31 02:23:24 +02:00
Markolie
5dc034719d Port Bay's silicon law manager 2015-08-31 02:18:49 +02:00
Markolie
1cc4f7f483 Add syndicate stamp 2015-08-30 22:52:31 +02:00
TheDZD
0904f16ed8 Merge pull request #1871 from Markolie/watchlist
Watchlist/admin updates
2015-08-30 14:43:43 -04:00
Markolie
2787c2fd46 sortAtom improvements 2015-08-28 23:52:27 +02:00
Markolie
529205ccb2 Watchlist/admin updates 2015-08-27 16:22:40 +02:00
Fox-McCloud
ea119a98df Merge pull request #1811 from Markolie/DENIED
Add option to reject adminhelps
2015-08-22 16:06:58 -04:00
Markolie
e6c331153a Add option to reject adminhelps 2015-08-20 23:33:09 +02:00
Markolie
93e320c648 Add mob sprites to ERT backpacks 2015-08-20 19:33:35 +02:00
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus
Admin teleport update, further admin message fixes
2015-08-18 20:19:55 -04:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Fox-McCloud
6d9e64b42b Merge pull request #1775 from Markolie/cult
Cult loyalty implant fix, other fixes
2015-08-17 17:12:46 -04:00
Markolie
c91e698e24 Fix shuttle call sanitization 2015-08-17 21:20:00 +02:00
Mark van Alphen
33631beaf8 Merge pull request #1740 from tigercat2000/underwear_refactor
-tg- underware overhaul
2015-08-17 17:37:50 +02:00
Markolie
5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Mark van Alphen
6abb1f8730 Merge pull request #1754 from tigercat2000/log_to_dd
New proc to replace world.log <<, log_to_dd()
2015-08-16 17:49:00 +02:00
Tigercat2000
ca921216fe New proc to replace world.log <<, log_to_dd()
This commit changes every 'world.log <<' message with a loggable proc-
log_to_dd().

This is adjustable in the config; If LOG_WORLD_OUTPUT is present, all
things sent to world.log will show up in the standard /data/logs/ logs.

These logs will contain the following (in order):
 Timestamp
 "DD_OUTPUT:"
 The message.

The config option for this, by default, is turned off.
2015-08-14 18:18:57 -07:00
Markolie
0b3f58b5d9 Add shuttle call reason 2015-08-14 21:18:51 +02:00
Markolie
8330a5cea9 Add option to request nuke code to consoles (from /tg/) 2015-08-14 20:43:20 +02:00
Markolie
7c757e1870 Communications console topic update 2015-08-14 17:47:45 +02:00
Tigercat2000
748da30bb6 -tg- underware overhaul
This commit overhauls the underwear/undershirt system to -tg-'s text-based
version. No more magic numbers, just text states.

Note, this modifies the SQL Schema, and existing databases must be
modified by the following SQL:

ALTER TABLE server_db.characters
	CHANGE underwear underwear MEDIUMTEXT NOT NULL,
	CHANGE undershirt undershirt MEDIUMTEXT NOT NULL;
2015-08-13 17:45:52 -07:00
Markolie
362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Markolie
034cf8ef69 ID card/agent ID rework 2015-08-09 23:42:55 +02:00
DZD
251fd16f6e Allows use of marked objects/datums in proc call 2015-08-07 19:08:07 -04:00
Fox-McCloud
fb381e5d84 Merge pull request #1626 from TheDZD/wiznerd
Adminboooooooooooooos
2015-08-03 21:19:21 -04:00
Fox-McCloud
82f62da60f Merge pull request #1604 from TheDZD/helper
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
DZD
1a15dbd432 Adminboooooooooooooos 2015-08-03 11:25:37 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Markolie
c67bb095fb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-07-28 18:40:44 +02:00
Markolie
b9c2f52471 Update NanoUI map, add verb to Mapping menu in debug mode 2015-07-28 00:02:59 +02:00
SamCroswell
d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
DZD
d8adcca1cf Makes log viewing use ftp() instead of run()
Carbon copy of tgstation/-tg-station#10467.
This should fix not being able to retrieve logs, because BYOND 508 broke
run() again. The main difference is that instead of directly opening a
log, a prompt will come up asking to save the file to a location.
2015-07-12 12:27:45 -04:00
Fox-McCloud
f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
2a34b600a9 Merge pull request #1397 from Krausus/GarbageCollectorWasGarbage
Garbage Collector Fixes/Tweaks/Cleanup/Documenting
2015-06-28 06:36:04 -04:00
Krausus
b386cec388 Initial GC fixes/tweaks/cleanup/documenting 2015-06-27 01:56:57 -04:00