Fox McCloud
6ab3ec48ed
change these timers
2018-04-29 21:15:42 -04:00
Fox McCloud
63e2a175fd
Merge remote-tracking branch 'upstream/master' into timer-subsystem
2018-04-29 21:14:11 -04:00
tigercat2000
c70f238511
Merge pull request #8933 from Fox-McCloud/ports-looping-sounds
...
Ports Looping Sounds
2018-04-29 18:05:47 -07:00
Kyep
e5ab0981f1
Small syndi officer fix
2018-04-29 00:04:12 -07:00
Fox McCloud
510c5b4268
fixes
2018-04-29 00:53:13 -04:00
Fox McCloud
cfe182a1f7
Ports over Timer Subsystem
2018-04-28 20:26:04 -04:00
Fox McCloud
c93559c6ee
nitpick
2018-04-26 21:23:44 -04:00
Fox McCloud
cb423dfb1b
Ports Looping Sounds
2018-04-26 19:18:24 -04:00
Aurorablade
f2815bff7c
Fixed plasmamen wizard
2018-04-26 03:58:50 -04:00
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
7c8299d443
mint machine
2018-04-23 15:44:29 -04: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
e82bc17904
makes it actually work
2018-04-21 06:34:46 -04:00
Fox McCloud
0382afcb33
Ports TG Components
2018-04-21 01:22:50 -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
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
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
Kyep
c1bf2382b8
squash
2018-04-08 08:05:31 -07:00
Kyep
2cb4e1f75c
Fox requests
2018-04-08 08:03:34 -07:00
Fox McCloud
f9421e3b22
explicit return
2018-04-07 23:41:29 -04: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
Fox McCloud
1d80bf01c0
Merge remote-tracking branch 'upstream/master' into gc-ss-port
...
# Conflicts:
# paradise.dme
2018-04-03 18:21:04 -04:00
Fox McCloud
fe2365590f
move the datum vars
2018-04-03 00:29:28 -04:00
Kyep
99c3c38b19
deletes ancient vampire, due to an icon bug, may re-add in another pr later
2018-04-01 22:14:01 -07:00
tigercat2000
27dceb6131
Merge pull request #8613 from shazbot194/E-pistols
...
Adds in energy pistols
2018-04-01 20:42:42 -07:00
shazbot194
adcf2dcada
Merge fix
2018-04-01 19:17:48 -08:00
tigercat2000
f6dad122ba
Merge pull request #8357 from Aurorablade/VirusNostolgia
...
Wherein Fethas proves to be evil incarnate
2018-04-01 19:22:31 -07:00
Kyep
2e33456c20
fixes wiz boots, adds ancient vamp, archwiz, nt undercover ops
2018-03-31 19:01:21 -07:00
Fox McCloud
7f842e3223
no more runtimes
2018-03-29 00:44:53 -04:00
Fox McCloud
22dc6860b3
Ports TG's Garbage Subsystem
2018-03-28 20:02:39 -04:00
Kyep
275c2ffc3c
syndi officers get red beret, lighter, cigar
2018-03-27 17:08:42 -07: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
7ac8dc037f
Merge pull request #8791 from alexkar598/icon_override
...
Allows item_action to not use the item icon by adding a var to let it not do so
2018-03-26 14:16:47 -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
alexkar598
ad97972038
Adds a var to not use item icons and insteed use the icon supplied in the subtype,defaults to using the item icon.Also removes empty file
2018-03-22 16:19:38 -04:00
tigercat2000
b1278de3d2
Merge pull request #8674 from uraniummeltdown/attacks
...
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
tigercat2000
5a756ad3c9
Merge pull request #8708 from Birdtalon/nanocalcium
...
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
tigercat2000
6e9ee2e822
Revert ".357 nukie price fix"
2018-03-19 13:15:01 -07:00
tigercat2000
3a6cc2557e
Merge pull request #8737 from shazbot194/357_price_fix
...
.357 nukie price fix
2018-03-19 13:14:32 -07:00
shazbot194
674176f0c3
Adds in a nukie only 357
2018-03-06 19:52:17 -09:00
uraniummeltdown
a2038d40b3
makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps
...
added a few defines and helpers
do_after family supports callbacks
added airlock security levels to airlocks
obj_integrity for doors, door assemblies, firelock frames
vault door assembly is 8 plasteel up from 6
explosion_block works better
heavy firelocks block explosions, firelock (de)construction uses crowbar instead of welder
xenos can open airlocks
minor change to attacking obj message
2018-03-04 13:52:55 +05:00
tigercat2000
087457fa9b
Merge pull request #8675 from Serkket/001
...
Bug-B-Gone
2018-03-03 09:28:12 -08:00
tigercat2000
47cd4cb127
StonedMC
...
This commit ports the StonedMC from /tg/station, intended to replace the
Process Scheduler from goon. Currently, they exist simultaneously, as
it's very difficult to port our 22 processes to the SMC all at once.
Instead, we can make them work together until everything is converted
over at a later point, and then take the old PS out back and put a
couple of rounds into it's deformed skull.
Primary benefits of this new process controller include: Other people
that can actually maintain it, unlike the PS, pre-world-init
initialization for subsystems, ease of ports from /tg/station13, and
potential performance improvement (to be seen).
2018-03-02 21:12:49 -08:00
