shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,969 Commits 5 Branches 0 Tags
55f1de10a68eafb5adf7116ca6a221f4a1a28aee
Commit Graph

105 Commits

Author SHA1 Message Date
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000 bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJay 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
LetterJay 40216683e0 Update gibspawner.dm 2017-07-30 23:26:16 -05:00
CitadelStationBot d16f68b4da Sigils of Transmission can now drain power, but Interdiction Lenses have been removed (#2173) 2017-07-28 23:52:02 -07:00
CitadelStationBot adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBot 0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -07:00
CitadelStationBot 147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot 54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
kevinz000 44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot 2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
LetterJay 9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215 
[MIRROR] Replaces ex_act and emp_act numbers with defines
 2017-07-13 23:57:35 -05:00
CitadelStationBot 55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot 1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot 1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot a101497539 Warp cubes are slightly less instant but way cooler 2017-07-06 20:12:38 -05:00
CitadelStationBot 4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
LetterJay 1054100178 Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108 
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
 2017-07-03 17:46:37 -05:00
LetterJay 196db74cbe Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588 
[MIRROR] Changes to the Atmos Watertank Backpack
 2017-06-27 22:59:32 -05:00
CitadelStationBot 04dd1ffdbd Fixes resin attack message 2017-06-26 06:03:44 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot bac0b96000 Changes to the Atmos Watertank Backpack 2017-06-20 20:49:11 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot a090e33a15 Adds Prolonging Prism as an application scripture (#1472) 2017-06-17 13:31:04 -07:00
LetterJay 813bcc2b8d commit 2017-06-14 11:16:54 -05:00
CitadelStationBot 5db49fb44b Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430) 2017-06-13 13:48:36 -07:00
CitadelStationBot fb40986f89 Fixes basic spiderlings becoming ice spiders 2017-06-10 12:22:48 -05:00
LetterJay 7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
LetterJay 923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881 
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
 2017-06-08 03:35:23 -05:00
CitadelStationBot 92e3754bfb Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power 2017-06-07 03:06:26 -05:00
CitadelStationBot 9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
LetterJay 35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay 54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
CitadelStationBot e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBot e59e7f8d06 Fixes bsa not showing up (#1396) 2017-06-04 09:03:30 -07:00
CitadelStationBot d36bc75074 Fixes posters 2017-05-31 19:29:20 -05:00
CitadelStationBot 4f9c8a0869 Luxury Bluespace Shelter Capsules, Take 2. 2017-05-30 17:05:54 -05:00
CitadelStationBot afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
CitadelStationBot c07034f45a The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it 2017-05-27 20:55:08 -05:00
CitadelStationBot 11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay 34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
CitadelStationBot e9cdeec4f6 Removes HasProx testing message 2017-05-22 22:48:13 -05:00
LetterJay ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283 
[MIRROR] Decentralized and Vastly Improved Gang Influence System
 2017-05-22 16:28:57 -05:00