Fox McCloud
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
tigercat2000
e086908c44
Merge pull request #8897 from Fox-McCloud/adds-frame
...
Adds F.R.A.M.E. Cartridge
2018-04-25 18:57:29 -07:00
Fox McCloud
4243947e7a
tweak
2018-04-25 21:48:44 -04:00
tigercat2000
3bf0f18b52
Merge pull request #8916 from Tayyyyyyy/soap_qol
...
Soap QOL
2018-04-25 16:16:14 -07:00
tigercat2000
ad24d3a584
Merge pull request #8901 from Fox-McCloud/component-port
...
Ports TG Components and R&D Tweaks
2018-04-24 19:01:49 -07:00
tigercat2000
5b68c2189c
Merge pull request #8918 from Fox-McCloud/fluff-spawn-fix
...
Fixes Random Plushie Spawning
2018-04-24 18:09:11 -07:00
Fox McCloud
9860cf996e
Fixes Random Plushie Spawning
2018-04-24 21:02:07 -04: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
Fox McCloud
32e3a25070
got it
2018-04-21 20:25:14 -04:00
Fox McCloud
0382afcb33
Ports TG Components
2018-04-21 01:22:50 -04:00
Fox McCloud
25d331b0bb
tweak
2018-04-19 21:14:00 -04:00
Fox McCloud
0f28456db3
Adds F.R.A.M.E. Cartridge
2018-04-19 20:54:59 -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
tigercat2000
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
tigercat2000
66d4b79222
Merge pull request #8891 from MINIMAN10000/nobludgeon-remotes
...
Adds nobludgeon to door remotes so they always work on doors
2018-04-16 18:23:31 -07:00
tigercat2000
a9f4022fa8
Merge pull request #8874 from MINIMAN10000/cable-coil
...
Cable coils can transfer part of a stack
2018-04-16 18:12:14 -07:00
MINIMAN10000
2f873143ed
Adds nobludgeon to door remotes making the remote always operate on the door
2018-04-16 17:56:35 -07:00
Fox McCloud
b3fa91030b
oops
2018-04-15 22:41:42 -04: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
tigercat2000
8b576c4d42
Merge pull request #8877 from Fox-McCloud/gc-stuff
...
Adds more GC Debugging
2018-04-14 21:28:54 -07:00
Fox McCloud
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
Fox McCloud
129e1f66f7
GC radio stuffs
2018-04-14 13:44:26 -04:00
MINIMAN10000
d4a98ea09f
Moved var/to_transfer back to /obj/item/stack turns out it's fine there
2018-04-13 19:50:26 -07:00
MINIMAN10000
5d52f60d9d
Comment about where merging is handled, moved to_transfer variable to immediately above where it is used
2018-04-13 18:27:20 -07:00
MINIMAN10000
e875af3d56
Cable Coils can partial transfer, stripped depereciated code, changed cable coil message
2018-04-13 16:48:14 -07: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
tigercat2000
a7b6e00bd3
Merge pull request #8853 from Dyhr/master
...
Agent ID occupation options
2018-04-06 20:54:43 -07:00
tigercat2000
464e1a18da
Merge pull request #8722 from Citinited/don't-lose-your-head
...
Refactors the russian revolver, and you can no longer play RR without a head
2018-04-06 20:24:54 -07:00
tigercat2000
57a4be2138
Merge pull request #8794 from Birdtalon/fixes
...
Fixes and tweaks
2018-04-06 20:02:07 -07:00
tigercat2000
413832ee27
Merge pull request #8837 from Kyep/better_demotions
...
Better ID computer logging
2018-04-06 20:01:38 -07:00
Fox McCloud
af7abe2679
Makes Stacks Garbage Collect
2018-04-06 19:32:08 -04: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 Lemon
c535a6cd59
Merge pull request #8804 from MINIMAN10000/rcd-lattice
...
RCD floors work on lattice & space
2018-04-01 21:23:07 -07:00
tigercat2000
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
