shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,422 Commits 5 Branches 0 Tags
6b27e322b8993c5976d7b8e48ec88d5d16560bc1
Commit Graph
11422 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 6b27e322b8 Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125 
[MIRROR] Makes the chaplain's soulshard require death
 2018-01-08 04:19:45 +00:00
CitadelStationBot 5c82730dc6 Automatic changelog generation for PR #4709 [ci skip] 2018-01-07 22:18:08 -06:00
deathride58andGitHub 406df3ae92 Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076 
[MIRROR] Fixes diagonal movement in pipes
 2018-01-08 04:18:06 +00:00
deathride58andGitHub 432fdfc0d3 Merge pull request #4711 from Citadel-Station-13/upstream-merge-34097 
[MIRROR] Fixes can_cast short circuit
 2018-01-08 04:17:42 +00:00
deathride58andGitHub 984bf470d5 Merge pull request #4710 from Citadel-Station-13/upstream-merge-34093 
[MIRROR] fixes some grinder recipes
 2018-01-08 04:17:29 +00:00
CitadelStationBot e70b9f1f1b Automatic changelog generation for PR #4707 [ci skip] 2018-01-07 22:16:40 -06:00
deathride58andGitHub c0d2fe8817 Merge pull request #4707 from Citadel-Station-13/upstream-merge-33979 
[MIRROR] Implements the Ballmer Peak: Now the bartender can help R&D!
 2018-01-08 04:16:38 +00:00
CitadelStationBot cee025e055 Automatic changelog generation for PR #4706 [ci skip] 2018-01-07 22:16:04 -06:00
deathride58andGitHub 91531525ca Merge pull request #4706 from Citadel-Station-13/upstream-merge-33971 
[MIRROR] Newly crafted stacks are merged with held stacks of the same type
 2018-01-08 04:16:01 +00:00
CitadelStationBot 3fd5a6d5ad Automatic changelog generation for PR #4705 [ci skip] 2018-01-07 22:15:49 -06:00
deathride58andGitHub 57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
 2018-01-08 04:15:47 +00:00
deathride58andGitHub ba909ce9a2 Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128 
[MIRROR] Removes the safe dial multiplier
 2018-01-08 04:15:12 +00:00
CitadelStationBot 531a2229dd Automatic changelog generation for PR #4703 [ci skip] 2018-01-07 22:14:54 -06:00
deathride58andGitHub d11604e502 Merge pull request #4703 from Citadel-Station-13/upstream-merge-34129 
[MIRROR] Adds package wrapping to autolathes
 2018-01-08 04:14:52 +00:00
deathride58andGitHub e5f3a5adde Merge pull request #4702 from Citadel-Station-13/upstream-merge-34148 
[MIRROR] Make tgui reload.bat work
 2018-01-08 04:14:35 +00:00
deathride58andGitHub da3d982ed6 Merge pull request #4701 from Citadel-Station-13/upstream-merge-34118 
[MIRROR] Reduces the memory footprint of the gas_mixture datum
 2018-01-08 04:14:22 +00:00
deathride58andGitHub b18d720730 Merge pull request #4700 from Citadel-Station-13/upstream-merge-34119 
[MIRROR] Fixes uplink_purchase_log GC error
 2018-01-08 04:14:04 +00:00
CitadelStationBot 457f6de178 Automatic changelog generation for PR #4699 [ci skip] 2018-01-07 22:13:50 -06:00
deathride58andGitHub d1d2ed1139 Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157 
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
 2018-01-08 04:13:47 +00:00
CitadelStationBot ca16a7c76e Automatic changelog generation for PR #4698 [ci skip] 2018-01-07 22:13:31 -06:00
deathride58andGitHub 9f3879ce8b Merge pull request #4698 from Citadel-Station-13/upstream-merge-34121 
[MIRROR] Fixes decals being created on bad turfs
 2018-01-08 04:13:28 +00:00
CitadelStationBot efb304dde4 Automatic changelog generation for PR #4695 [ci skip] 2018-01-07 22:10:20 -06:00
deathride58andGitHub e43f651c89 Merge pull request #4695 from Citadel-Station-13/upstream-merge-34132 
[MIRROR] Updates the exp config default override hours and clarifies it a bit.
 2018-01-08 04:10:18 +00:00
CitadelStationBot fe28674e4d Makes the chaplain's soulshard require death 2018-01-07 20:56:24 -06:00
Dax DupontandCitadelStationBot d057f55ed4 Makes the chaplain's soulshard require death (#34125) 2018-01-07 20:56:24 -06:00
CitadelStationBot 82d8c9720b Fixes can_cast short circuit 2018-01-07 20:49:50 -06:00
Jordan BrownandCitadelStationBot af27a1aa03 Fixes can_cast short circuit (#34097) 2018-01-07 20:49:50 -06:00
CitadelStationBot ff71a431ff fixes some grinder recipes 2018-01-07 20:36:29 -06:00
TlaltecuhtliandCitadelStationBot 7aa8bf9b69 fixes some grinder recipes (#34093) 
* commit

help what is this

* ddd

* sdsadsda

* fegdhfd

* ddddddddddddddd
 2018-01-07 20:36:29 -06:00
CitadelStationBot a09c91b850 Fixes diagonal movement in pipes 2018-01-07 20:34:18 -06:00
Emmett GainesandCitadelStationBot 65afc4d2b2 fixes diagonal movement in pipes (#34076) 2018-01-07 20:34:18 -06:00
CitadelStationBot 821d243361 Implements the Ballmer Peak: Now the bartender can help R&D! 2018-01-07 20:30:57 -06:00
IamgoofballandCitadelStationBot 99b299a1eb Implements the Ballmer Peak: Now the bartender can help R&D! (#33979) 
* Implements the Ballmer Peak: Now the bartender can help R&D!

* fugg

* lmao forgot to multiply that

* unzips math

* asdaafffff

* buffs windows ME

* Adds notifications about the peak.
 2018-01-07 20:30:57 -06:00
CitadelStationBot 8a9d7cfa4c Newly crafted stacks are merged with held stacks of the same type 2018-01-07 20:28:46 -06:00
John GinnaneandCitadelStationBot 6720fc3713 Newly crafted stacks are merged with held stacks of the same type (#33971) 
* Merge newly crafted stacks with held stacks

* Update code
 2018-01-07 20:28:46 -06:00
CitadelStationBot 5be92f68b8 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog 2018-01-07 20:18:28 -06:00
Ashe HiggsandCitadelStationBot c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) 
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
 2018-01-07 20:18:28 -06:00
CitadelStationBot 611cb76c90 Removes the safe dial multiplier 2018-01-07 20:08:11 -06:00
Jordan BrownandCitadelStationBot bc636ddb2c Merge pull request #34128 from ShizCalev/safe-dial 
Removes the safe dial multiplier
 2018-01-07 20:08:11 -06:00
CitadelStationBot e25fb1c1d2 Adds package wrapping to autolathes 2018-01-07 20:07:00 -06:00
Jordan BrownandCitadelStationBot f9f6bae65d Merge pull request #34129 from MrDoomBringer/eminem 
Adds package wrapping to autolathes
 2018-01-07 20:07:00 -06:00
CitadelStationBot 742784d2f1 Make tgui reload.bat work 2018-01-07 19:59:45 -06:00
Jordan BrownandCitadelStationBot 0c606646e3 Merge pull request #34148 from MoreRobustThanYou/patch-44 
Make tgui reload.bat work
 2018-01-07 19:59:45 -06:00
CitadelStationBot c78de6907f Reduces the memory footprint of the gas_mixture datum 2018-01-07 19:58:35 -06:00
Jordan BrownandCitadelStationBot 1e4a6dd26b Merge pull request #34118 from MrStonedOne/patch-459 
Reduces the memory footprint of the gas_mixture datum
 2018-01-07 19:58:35 -06:00
CitadelStationBot 3c1d44e591 Fixes uplink_purchase_log GC error 2018-01-07 18:52:26 -06:00
Jordan BrownandCitadelStationBot 1e2e8b7ecb Fixes uplink_purchase_log GC error (#34119) 
* Fixes uplink_purchase_log GC error

* Add missing GLOB.
 2018-01-07 18:52:26 -06:00
CitadelStationBot d7640c1341 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason 2018-01-07 18:51:16 -06:00
kevinz000andCitadelStationBot ff80771081 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason (#34157) 
* Fixes dchat broadcast

* Update communications.dm
 2018-01-07 18:51:16 -06:00
CitadelStationBot b547151f12 Fixes decals being created on bad turfs 2018-01-07 18:51:09 -06:00