shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,992 Commits 5 Branches 0 Tags
8a1a4dd6715bd030daf6101fa413ae341bb8e28a
Commit Graph

94 Commits

Author SHA1 Message Date
CitadelStationBot 7589ff9285 LAZYSET() Macro 2017-06-10 17:02:12 -05:00
LetterJay 905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJay 60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
CitadelStationBot e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
LetterJay f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 
[MIRROR]  Refactors explosions
 2017-05-30 15:15:51 -05:00
CitadelStationBot a1ebd8c791 Refactors how diagonal smoothing underlays work (#1187) 2017-05-27 13:40:09 -07:00
CitadelStationBot e5f2a09622 Pixel projectile ricochets and reflections! (#1220) 2017-05-27 13:27:52 -07:00
CitadelStationBot 11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay 6307b15eed Merge pull request #1115 from Citadel-Station-13/upstream-merge-27527 
[MIRROR] sortMerge fix
 2017-05-23 10:13:51 -05:00
CitadelStationBot 4afae3d03b Makes global master vars static 2017-05-22 22:12:58 -05:00
CitadelStationBot 6c60631f1f sortMerge fix 2017-05-22 22:09:43 -05:00
LetterJay cbae09b538 rej cleanup/commit 2017-05-22 16:59:39 -05:00
LetterJay aad357bd74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450 2017-05-22 16:56:18 -05:00
CitadelStationBot 26448d7016 Removes the mess added with recalling with a message 2017-05-21 07:57:17 -05:00
Poojawa 186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
CitadelStationBot 12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010) 
* Adds framework for cult constructs having the ability to make runes

* Delete mobs.dm.rej

* Update runes.dm

* clean .rej
 2017-05-20 23:12:51 -05:00
CitadelStationBot 33941c29c8 [MIRROR] People can be cloned from heads or brains (#919) 
* People can be cloned from heads or brains

* .rej fixes

* Update cloning.dm
 2017-05-18 09:49:26 -05:00
CitadelStationBot a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot 626959d96e [MIRROR] Fixes a bunch more cult bugs (#853) 
* Fixes a bunch more cult bugs

* Resolves .rejs and icons
 2017-05-18 03:21:07 -05:00
LetterJay 61f8819286 oops 2017-05-18 02:37:12 -05:00
LetterJay a8a862411d commit 2017-05-18 02:31:07 -05:00
LetterJay 6fe8d4fc9c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27219 2017-05-18 02:27:50 -05:00
CitadelStationBot 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay 45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay be1702ff0d Revert "CultFix" 
This reverts commit f3e8cd3e2d.
 2017-05-16 22:49:23 -05:00
LetterJay f3e8cd3e2d CultFix 2017-05-16 21:36:07 -05:00
LetterJay 4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
CitadelStationBot 3b0b19f6b6 Fixes role polls 2017-05-14 19:42:51 -05:00
LetterJay 00b17f1649 maybe 2017-05-14 00:28:07 -05:00
LetterJay 6a1cac4e1e Merge branch 'master' into upstream-merge-26425 2017-05-12 00:08:32 -04:00
LetterJay a66e0c949e Merge pull request #832 from Citadel-Station-13/upstream-merge-23201 
[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
 2017-05-10 23:05:37 -04:00
LetterJay 3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645 
[MIRROR] Persistent investigate and game logs separated by round ID
 2017-05-10 21:12:08 -04:00
LetterJay 57372ebdb0 merge 2017-05-10 19:41:55 -05:00
CitadelStationBot 181eee013e [READY]DATUM VERBS AND TOP MENUS! 2017-05-07 17:07:59 -05:00
CitadelStationBot f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult 2017-05-06 11:56:16 -05:00
CitadelStationBot 310f23db5c Fixes HTTPSGet being unprotected 2017-05-06 10:46:00 -05:00
CitadelStationBot 3b84fcb9c2 Playar byound accunt age storid in db 2017-05-04 18:14:23 -05:00
CitadelStationBot 49990d0c05 Persistent investigate and game logs separated by round ID 2017-05-02 18:47:58 -05:00
LetterJay fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
CitadelStationBot a0c1f979dc Fixes templates/ruins not updating area list 2017-04-27 17:02:33 -05:00
CitadelStationBot a3cd0d980a Fixes a bad proc definition 2017-04-26 19:29:03 -05:00
CitadelStationBot 08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -05:00
CitadelStationBot 84321916a5 Refactors ears into organs (#513) 
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
 2017-04-26 09:52:35 -05:00
CitadelStationBot a905c15dad Replaces /image with /mutable_appearance (#556) 
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
 2017-04-26 08:18:35 -05:00
LetterJay 76ed57f90c rej cleanup 2017-04-25 02:11:11 -05:00
LetterJay 9df952873b Update type2type.dm 2017-04-25 01:55:12 -05:00
LetterJay 31e8bee39e Update type2type.dm 2017-04-25 01:54:53 -05:00
LetterJay 3d51a07243 world fix 2017-04-25 01:52:49 -05:00
CitadelStationBot 607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -05:00