shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,225 Commits 5 Branches 0 Tags
27d466bda4e9bec2bb8a2b3baecedcf653afe32f
Commit Graph

86 Commits

Author SHA1 Message Date
CitadelStationBot 1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones 2017-08-13 01:28:24 -05:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot 23ed5ba2a2 Fixes noncultists being able to out literally everyone from bloodcult with a single item (#2212) 2017-08-03 06:18:23 -07:00
CitadelStationBot 1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214) 
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
 2017-08-03 06:09:39 -07:00
CitadelStationBot dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05: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
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 55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
LetterJay f1937eb1fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-06-26 06:14:55 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJay 68c45f5569 Merge pull request #1661 from Citadel-Station-13/upstream-merge-28539 
[MIRROR] Runes now innately support doing damage to their invokers
 2017-06-26 06:07:53 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot e750435b94 Runes now innately support doing damage to their invokers 2017-06-18 15:23:52 -05:00
CitadelStationBot 2e9e7f5488 Cultists must be human to run for Cult Master status 2017-06-16 12:53:49 -05:00
CitadelStationBot 5c2acd599e [MIRROR] HOTFIX: Cult now gets a functioning summon objective (#1509) 
* HOTFIX: Cult now gets a functioning summon objective

* Update datum_cult.dm

* Delete datum_cult.dm.rej
 2017-06-13 20:40:49 -07:00
CitadelStationBot 97005222ff Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479) 2017-06-13 13:48:49 -07:00
CitadelStationBot 5db49fb44b Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430) 2017-06-13 13:48:36 -07:00
CitadelStationBot a634735753 Fixes #27738 (Spirit Sight examine text showing you and not the user) 2017-06-11 08:29:21 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 9a05029df6 Cult floors now reduce rune scribing for small runes by 50% 2017-06-02 16:12:43 -05:00
CitadelStationBot 83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
CitadelStationBot 6ee6430dfb Gives Void Torch its icon back 2017-05-23 19:56:25 -05:00
LetterJay d1db0044d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 2017-05-22 11:52:18 -05:00
CitadelStationBot 39635b2d0d Fixes talisman grammar 2017-05-21 22:28:57 -05:00
kevinz000 7e2cebe1db Merge branch 'master' into upstream-merge-27344 2017-05-21 17:50:29 -07:00
CitadelStationBot 3ad9c0ffed fixes cults being able to delete people (#1077) 2017-05-21 12:47:10 -07:00
Poojawa e28130f70c Update rune_spawn_action.dm 2017-05-21 00:23:00 -05:00
Poojawa 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -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 88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994) 
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
 2017-05-20 23:00:02 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
Poojawa 54fcea8ca3 Nerfs Manifest Spirit #970 2017-05-18 11:37:42 -05:00
Poojawa 1c99f15389 Nerfs Manifest Spirit 2017-05-18 11:36:23 -05:00
CitadelStationBot e1729434d1 [MIRROR] Adds some antag alerts (#926) 
* Adds some antag alerts

* Add files via upload

* Delete ClockCult.ogg
 2017-05-18 11:27:52 -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 6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -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
Poojawa 4370b5285a Delete runes.dm.rej 2017-05-18 01:05:03 -05:00
LetterJay 00b14017c0 ook ook language 2017-05-17 10:15:30 -05:00
LetterJay 5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952 2017-05-17 10:12:36 -05:00
LetterJay da2fc1da0d Merge pull request #990 from Citadel-Station-13/upstream-merge-27271 
[MIRROR] Refactors supply talismans to be less shitcode
 2017-05-17 10:51:02 -04: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 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