224b18af1c
Merge remote-tracking branch 'upstream/master' into attack-animation-improvements
2018-05-17 23:34:01 -04:00
1cfc3f27c8
Merge pull request #8974 from Fox-McCloud/holo-projector
...
Ports Holoprojectors
2018-05-17 20:19:13 -07:00
c0d5655f4d
Further Improves Attack Animations
2018-05-17 19:48:03 -04:00
3e4dbaf9c1
Merge pull request #9014 from Fox-McCloud/remove-dem-oldies
...
Removes A Bunch of Old, Unused Files
2018-05-14 17:55:12 -07:00
63ec546a0a
Merge pull request #9008 from Fox-McCloud/remove-mode
...
Removes All Modes
2018-05-14 17:49:58 -07:00
b3524505b5
tweak
2018-05-14 17:51:13 -04:00
ab780b3acf
Removes A Bunch of Old, Unused Files
2018-05-14 06:40:48 -04:00
f521f2765c
Removes All Modes
2018-05-11 17:55:45 -04:00
254cdd6055
Merge pull request #8972 from Fox-McCloud/power-cell
...
Power Cell Code Cleanup
2018-05-09 11:26:03 -07:00
8845262d65
Merge remote-tracking branch 'upstream/master' into holo-projector
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# paradise.dme
2018-05-04 16:37:24 -04:00
8071b42308
Merge remote-tracking branch 'upstream/master' into more_ss_ports
...
# Conflicts:
# code/modules/food_and_drinks/food/snacks.dm
2018-05-03 19:30:41 -07:00
8bd042240f
Power Cell Code Cleanup
2018-05-02 19:35:18 -04:00
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
7fb8f8d76c
Merge remote-tracking branch 'upstream/master' into more_ss_ports
...
# Conflicts:
# paradise.dme
2018-04-30 09:27:11 -07:00
e649a72923
Emptying Stop-gap
2018-04-30 03:53:49 -04:00
ee6a156ca2
Removes Programmable Unloaders and a Few Unused Files
2018-04-30 00:41:26 -04:00
b394cf3624
Ports Holoprojectors
2018-04-30 00:24:46 -04:00
3c1fbf9cc5
Merge pull request #8938 from Fox-McCloud/guillotine
...
Ports Guillotine
2018-04-29 20:28:50 -07:00
bc6f664b51
tweak
2018-04-29 22:58:18 -04:00
44deafe987
Merge pull request #8907 from Bram961/Window-placement
...
Window placement revert
2018-04-29 19:40:32 -07:00
63e2a175fd
Merge remote-tracking branch 'upstream/master' into timer-subsystem
2018-04-29 21:14:11 -04:00
4474757e14
edge case
2018-04-29 19:16:04 -04:00
7d8c9a731a
SS Conversion: Atoms, Machines, n' Mobs
...
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
cfe182a1f7
Ports over Timer Subsystem
2018-04-28 20:26:04 -04:00
8f5f57dd0b
adds clapping
2018-04-27 19:27:47 -04:00
b238dfc581
Ports Guillotine
2018-04-27 18:58:23 -04:00
9266789511
stop this now
2018-04-26 19:51:22 -04:00
cb423dfb1b
Ports Looping Sounds
2018-04-26 19:18:24 -04:00
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
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
4243947e7a
tweak
2018-04-25 21:48:44 -04:00
3bf0f18b52
Merge pull request #8916 from Tayyyyyyy/soap_qol
...
Soap QOL
2018-04-25 16:16:14 -07:00
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
5b68c2189c
Merge pull request #8918 from Fox-McCloud/fluff-spawn-fix
...
Fixes Random Plushie Spawning
2018-04-24 18:09:11 -07:00
9860cf996e
Fixes Random Plushie Spawning
2018-04-24 21:02:07 -04:00
8ecd9dd480
Fix coding style
2018-04-24 16:40:59 -05:00
ef20a187c0
Reduce soap clicks
2018-04-24 16:28:22 -05:00
69e0eedead
Managed to get a space in there somehow
2018-04-24 10:21:17 +02:00
eafd57487c
Merge remote-tracking branch 'upstream/master' into component-port
...
# Conflicts:
# paradise.dme
2018-04-23 13:54:50 -04:00
b36ccc592f
Makes the code cleaner
...
dirty code is dirty, I hope this makes it better but obviously I am a newb so any input is welcome.
2018-04-23 12:12:01 +02:00
fe758c21e7
Window placement revert
...
This commit reverts the window placement system, right now placing a one-dir window takes 2 prompts, this makes it so you just have to click a grille for it to place a one-dir window on the side you're facing.
Reverts a part of https://github.com/ParadiseSS13/Paradise/pull/8155
🆑 Kluys
Revert: Changes the window placement system back to the old system
/🆑
2018-04-22 22:50:34 +02:00
32e3a25070
got it
2018-04-21 20:25:14 -04:00
0382afcb33
Ports TG Components
2018-04-21 01:22:50 -04:00
25d331b0bb
tweak
2018-04-19 21:14:00 -04:00
0f28456db3
Adds F.R.A.M.E. Cartridge
2018-04-19 20:54:59 -04:00
2364b0332b
Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps
2018-04-19 15:08:59 -08:00
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
2b25584372
Merge remote-tracking branch 'upstream/master' into remove-weapons
2018-04-19 17:01:38 -04:00
ad53317db1
Merge Conflict Resolved
2018-04-17 11:24:50 -07:00
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