Commit Graph
4623 Commits
Author SHA1 Message Date
tigercat2000andGitHub 0c6cbbc5c3 Merge pull request #8959 from Fox-McCloud/remove-things
Removes Programmable Unloaders and a Few Unused Files
2018-05-01 14:07:12 -07:00
Fox McCloud e649a72923 Emptying Stop-gap 2018-04-30 03:53:49 -04:00
Fox McCloud ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
Fox McCloud b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Kyep c3f271449e fixes merge conflicts with weapon removals 2018-04-26 00:09:18 -07:00
Kyep 08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000andGitHub 3bf0f18b52 Merge pull request #8916 from Tayyyyyyy/soap_qol
Soap QOL
2018-04-25 16:16:14 -07:00
Tayyyyyyy 8ecd9dd480 Fix coding style 2018-04-24 16:40:59 -05:00
Tayyyyyyy ef20a187c0 Reduce soap clicks 2018-04-24 16:28:22 -05:00
Fox McCloud eafd57487c Merge remote-tracking branch 'upstream/master' into component-port
# Conflicts:
#	paradise.dme
2018-04-23 13:54:50 -04:00
Aurorablade 34809e208a Fox twerks 2018-04-22 02:09:54 -04:00
Aurorablade 72a3c66cf5 IPC bleeding v2 2018-04-22 00:21:48 -04:00
Fox McCloud 0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
tigercat2000 2364b0332b Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps 2018-04-19 15:08:59 -08:00
tigercat2000 c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud 2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
MINIMAN10000 ad53317db1 Merge Conflict Resolved 2018-04-17 11:24:50 -07:00
tigercat2000andGitHub 17fd8e8a6a Merge pull request #8819 from Kyep/syndi_outfit_boots
Improves admin outfits, fixes magboots, adds special antags
2018-04-16 18:28:03 -07:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
MINIMAN10000 f023edefa7 Crayons color cables, cableColor now cable_color 2018-04-14 23:54:37 -07:00
Fox McCloudandGitHub 6a02689398 Merge pull request #8726 from shazbot194/Major_Tom
Major tom
2018-04-14 23:58:19 -04:00
shazbot194 1747f9e31e Small code improvements and description reverts 2018-04-14 17:25:56 -08:00
CoreyLee Hassell 5cef36efdf Changed defib timer from 3 minutes to 5 minutes 2018-04-12 18:39:54 -04:00
Kyep 2cb4e1f75c Fox requests 2018-04-08 08:03:34 -07:00
Fox McCloud 196d0b90f9 Makes Records GC (most of the time) 2018-04-07 23:38:10 -04:00
Kyep ca8bb33a58 Tiger requests 2018-04-07 14:01:48 -07:00
tigercat2000andGitHub a7b6e00bd3 Merge pull request #8853 from Dyhr/master
Agent ID occupation options
2018-04-06 20:54:43 -07:00
tigercat2000andGitHub 57a4be2138 Merge pull request #8794 from Birdtalon/fixes
Fixes and tweaks
2018-04-06 20:02:07 -07:00
tigercat2000andGitHub 413832ee27 Merge pull request #8837 from Kyep/better_demotions
Better ID computer logging
2018-04-06 20:01:38 -07:00
Rasmus Dyhr Larsen 5065221dd6 Added agent id occupation options 2018-04-05 23:59:50 +02:00
Fox McCloud f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
shazbot194 234c8a78bc Merge conflict fix 2018-04-04 12:18:07 -08:00
Fox McCloud 39c5aa0bf7 one Destroy loop fix 2018-04-04 06:03:45 -04:00
Fox McCloud 1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port
# Conflicts:
#	paradise.dme
2018-04-03 18:21:04 -04:00
Kyep b0fb593210 Better ID computer logging 2018-04-02 19:09:50 -07:00
tigercat2000 8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift
# Conflicts:
#	code/world.dm
2018-04-02 17:24:36 -07:00
Crazy LemonandGitHub c535a6cd59 Merge pull request #8804 from MINIMAN10000/rcd-lattice
RCD floors work on lattice & space
2018-04-01 21:23:07 -07:00
Kyep 1b6b1deecc fixes merge conflict in custom_grenades.dm 2018-04-01 18:59:25 -07:00
tigercat2000andGitHub e67ba4ecd8 Merge pull request #8503 from Kyep/frikin_laser_beams
Fixes #6229 - tripwire mines not working / brings back frikin' laser beams
2018-04-01 18:47:31 -07:00
tigercat2000 e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift
# Conflicts:
#	paradise.dme
2018-03-30 10:20:21 -07:00
Birdtalon b334bc4a88 defibrillator no longer yields infinite paddles 2018-03-30 13:12:44 +01:00
Fox McCloud 22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Fox McCloud 5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
Kyep e014f02324 Improves admin outfits, fixes magboots being missing 2018-03-26 15:44:17 -07:00
tigercat2000 bc4fb3d79b Nightshifts & Randomized Station Time
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
2018-03-25 23:01:04 -07:00
MINIMAN10000 a9317230c3 Allows player to place floors by clicking on lattice instead of clicking between the lattice 2018-03-23 19:14:01 -07:00
tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
#	code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
tigercat2000andGitHub b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00