Commit Graph
32854 Commits
Author SHA1 Message Date
davipatury 6473d0c79f Crazylemons's ntnet downloader suggestion. 2017-03-04 21:29:24 -03:00
davipatury 8496523a6c Battery ETA 2017-03-04 18:40:16 -03:00
davipatury 5fb5e1eedd Damn. 2017-03-04 15:57:51 -03:00
davipatury af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
davipatury 8c7993b9d5 Crazylemon's suggestion. 2017-03-04 15:43:28 -03:00
ParadiseSS13-Bot eb19e68f84 Automatic changelog compile, [ci skip] 2017-03-04 13:22:12 -05:00
ParadiseSS13-Bot 72b82f9f33 Automatic changelog generation for PR #6597 [ci skip] 2017-03-04 13:21:20 -05:00
Crazy LemonandGitHub 0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui
Wires Nano-UI-ification
2017-03-04 10:21:19 -08:00
davipatury 3a10ee852a Crazylemon's suggestion. 2017-03-04 14:17:57 -03:00
ParadiseSS13-Bot a1ad310cf3 Automatic changelog compile, [ci skip] 2017-03-04 03:21:46 -05:00
ParadiseSS13-Bot 48f34e9b81 Automatic changelog generation for PR #6553 [ci skip] 2017-03-04 02:40:39 -05:00
Crazy LemonandGitHub 343df5ec25 Merge pull request #6553 from Markolie/adminin
Additional ghost/admin interaction additions
2017-03-03 23:40:37 -08:00
Crazy Lemon 5e1bd050f8 Merge branch 'master' into adminin 2017-03-03 23:23:40 -08:00
ParadiseSS13-Bot feaa527042 Automatic changelog compile, [ci skip] 2017-03-04 00:21:44 -05:00
ParadiseSS13-Bot f57bf1f831 Automatic changelog generation for PR #6630 [ci skip] 2017-03-04 00:20:54 -05:00
Crazy LemonandGitHub af0c0d844b Merge pull request #6630 from davipatury/newscaster-ui
Newscaster Nano-UI-ification
2017-03-03 21:20:53 -08:00
ParadiseSS13-Bot 89964c1e82 Automatic changelog generation for PR #6632 [ci skip] 2017-03-04 00:11:16 -05:00
Crazy LemonandGitHub 57ad4776c5 Merge pull request #6632 from davipatury/tank_dispenser-ui
Atmos Nano-UI-ification
2017-03-03 21:11:13 -08:00
ParadiseSS13-Bot 0685f14e20 Automatic changelog compile, [ci skip] 2017-03-03 19:38:59 -05:00
Fox McCloudandGitHub 64f7eeeb75 Merge pull request #6658 from TravellingMerchant/master
Adds a new Cyborg sprite for all the basic departments.
2017-03-03 18:28:01 -05:00
Fox McCloudandGitHub 345909d746 Merge pull request #6652 from LordJike/master
Makes french fries a deep fryer recipe instead of a processor recipe
2017-03-03 18:26:17 -05:00
ParadiseSS13-Bot f3d7e25cb6 Automatic changelog generation for PR #6659 [ci skip] 2017-03-03 18:17:26 -05:00
Fox McCloudandGitHub c2e8ed611b Merge pull request #6659 from uraniummeltdown/orm
Change ORM input/output dirs with multitool
2017-03-03 18:17:24 -05:00
ParadiseSS13-Bot e1a22929bf Automatic changelog generation for PR #6662 [ci skip] 2017-03-03 18:17:02 -05:00
Fox McCloudandGitHub 9535037b2e Merge pull request #6662 from uraniummeltdown/bluespacerped
New Bluespace RPED beam sprite
2017-03-03 18:17:00 -05:00
ParadiseSS13-Bot 544d83eba5 Automatic changelog generation for PR #6661 [ci skip] 2017-03-03 18:16:37 -05:00
Fox McCloudandGitHub cb7a3e6db8 Merge pull request #6661 from FlattestGuitar/karmameme
Adds confirmation prompts to karma purchases ✔️
2017-03-03 18:16:36 -05:00
Crazy LemonandGitHub 8ec9942750 Merge pull request #6637 from Krausus/TableCkeyification
Makes Karma and Notes Tables Always Use CKeys
2017-03-02 20:16:08 -08:00
Crazy LemonandGitHub 1c3011a544 Merge pull request #6663 from FlattestGuitar/maskthing
Fixes Spartan's gas mask fluff thing 😷
2017-03-02 11:39:34 -08:00
FlattestGuitar 14bc738ca3 Adds confirmation thingies to karma purchases 2017-03-02 20:36:49 +01:00
FlattestGuitar 0a93603bc4 Fixes Spartan's gas mask fluff thing 2017-03-02 19:47:58 +01:00
uraniummeltdown 75e212b4fd new bluespace rped beam sprite from tgstation 2017-03-02 22:16:12 +04:00
uraniummeltdown f5de924915 use multitool on open panel orm to change dir of input and output 2017-03-02 18:04:10 +04:00
TravellingMerchantandGitHub bc06adc562 Adds the new Cyborg sprites to the sprite select list. 2017-03-02 13:25:46 +00:00
TravellingMerchantandGitHub 32c0383715 Adds a new cyborg sprite to each basic department. 2017-03-02 13:23:39 +00:00
Fox McCloudandGitHub 72f904e0cc Merge pull request #6640 from FlattestGuitar/clickety-click
[s]Actually suppresses .click macros
2017-03-02 00:50:29 -05:00
Crazy LemonandGitHub 53a2092852 Merge pull request #6644 from Luthix/deeoo
Change deeoo VOX to alert sound.
2017-03-01 19:24:51 -08:00
ParadiseSS13-Bot b74da9d753 Automatic changelog compile, [ci skip] 2017-03-01 20:46:36 -05:00
ParadiseSS13-Bot d98a552d5a Automatic changelog generation for PR #6629 [ci skip] 2017-03-01 20:06:44 -05:00
Fox McCloudandGitHub a721055d96 Merge pull request #6629 from Aurorablade/Validhuntingmeta
Validhunting meta
2017-03-01 20:06:41 -05:00
Aurorablade c7f92c15c6 There it is! The Bridge of Death!
STOP!
Who would cross the Bridge of Death
Must answer me
These questions three
Ere the other side he see.
2017-03-01 19:47:05 -05:00
ParadiseSS13-Bot 87f70058ff Automatic changelog compile, [ci skip] 2017-03-01 18:46:28 -05:00
ParadiseSS13-Bot 055f76f85e Automatic changelog generation for PR #6622 [ci skip] 2017-03-01 18:29:54 -05:00
Fox McCloudandGitHub e41b09d876 Merge pull request #6622 from Kyep/terrorspiders-PR4
Terror Spiders 4 - Fixes & Tweaks
2017-03-01 18:29:53 -05:00
LordJikeandGitHub c60b477b7d Update processor.dm 2017-03-01 19:26:33 -04:00
LordJikeandGitHub 12ac7e2a00 Update deep_fryer.dm 2017-03-01 19:26:28 -04:00
Fox McCloudandGitHub 33b7213065 Merge pull request #6613 from Crazylemon64/autopsy_data
Adds stuff to autopsy
2017-03-01 18:23:11 -05:00
ParadiseSS13-Bot fb1a17f5b2 Automatic changelog generation for PR #6639 [ci skip] 2017-03-01 18:22:10 -05:00
Fox McCloudandGitHub 3ec0afeecf Merge pull request #6639 from KasparoVy/multivox-plasmaverse
Properly Equips Plasmaman & Vox Multiverse Copies
2017-03-01 18:22:09 -05:00
ParadiseSS13-Bot 60159b65e1 Automatic changelog generation for PR #6364 [ci skip] 2017-03-01 18:21:23 -05:00