shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,256 Commits 5 Branches 0 Tags
4680f045ffa61ba648e055457e93d0c1e28fb81c
Commit Graph

221 Commits

Author SHA1 Message Date
CitadelStationBot
b42e5c8721 Fixes clock cultists not getting their "objective" 2017-05-24 16:15:47 -05:00
LetterJay
57f9345ace Merge pull request #1135 from Citadel-Station-13/upstream-merge-27543 
[MIRROR] Fixes advanced cam not cleaning up properly
 2017-05-24 12:12:16 -05:00
LetterJay
b2c6bd0344 rej cleanup 2017-05-24 08:08:33 -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
6ee6430dfb Gives Void Torch its icon back 2017-05-23 19:56:25 -05:00
CitadelStationBot
3651637cd8 Fixes advanced cam not cleaning up properly 2017-05-23 13:44:19 -05:00
CitadelStationBot
c736d5f9dd [READY FOR ~REVIEW~]Makes morphs only able to change into /objs or /mobs 2017-05-23 09:54:28 -05:00
LetterJay
b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync 
Syncs all gang related PRs with upstream
 2017-05-23 06:17:29 -05:00
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
LetterJay
3f24f033e5 Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485 
[MIRROR] Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
 2017-05-22 17:26:09 -05:00
LetterJay
25c1aa40dd Merge pull request #1079 from Citadel-Station-13/upstream-merge-27450 
[MIRROR] Removes the mess added with recalling with a message
 2017-05-22 17:14:14 -05:00
LetterJay
cbae09b538 rej cleanup/commit 2017-05-22 16:59:39 -05:00
LetterJay
abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -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
LetterJay
9df8057e0e Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344 
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
 2017-05-22 12:40:18 -05:00
LetterJay
8791ad036f Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268 
[MIRROR] World.dm Refactor
 2017-05-22 12:39:52 -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
LetterJay
d200bff9f4 spaces. spaces caused the file to conflict. 2017-05-22 11:26:47 -05:00
CitadelStationBot
4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
CitadelStationBot
2dc68a5ebf Prevents wizard from gaining infinite skeletons with a 3-use Necrostone 2017-05-22 07:28:48 -05:00
CitadelStationBot
39635b2d0d Fixes talisman grammar 2017-05-21 22:28:57 -05:00
CitadelStationBot
5fd5e32628 [MIRROR] Fixes syndicate borg spawner (#1072) 
* Fixes syndicate borg spawner

* Delete antag_spawner.dm.rej

* Update antag_spawner.dm
 2017-05-21 18:30:28 -07: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
CitadelStationBot
e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
Poojawa
186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05: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
c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot
b943780a8c If ratvar is alive, turning clockwork floors into clockwork walls is fast 2017-05-19 06:25:19 -05:00
LetterJay
369edc07d2 Merge pull request #1044 from Citadel-Station-13/upstream-merge-27347 
[MIRROR] fixes ratvar shuttles
 2017-05-18 23:45:31 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
94b7e560ab World.dm Refactor 2017-05-18 16:37:46 -05:00
CitadelStationBot
ef164ada86 fixes ratvar shuttles 2017-05-18 16:37:42 -05:00
CitadelStationBot
bbcc6f9be9 Proselytizing alloy shards will now proselytize all the shards in the tile 2017-05-18 16:37:26 -05:00
CitadelStationBot
b0760b9b33 Fixes not being able to cancel Geis and being able to cancel Volt Void (#998) 2017-05-18 12:07:02 -05:00
CitadelStationBot
a23a3b5cce Fixes clockwork obelisks (#997) 2017-05-18 12:06:46 -05:00
CitadelStationBot
04c79d28f9 Wizards are now at least 30 years old. Apprentices are 17 to 29. (#978) 2017-05-18 12:05:55 -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
3f35592f4e Gang mode sync (#933) 
* Revert "Gang mode now calls a 4 minute shuttle once 60% of the crew is dead"

* gang fixes

* gang modernizations
 2017-05-18 11:33:37 -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
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
Poojawa
7a2560ee76 Delete gang_items.dm.rej 2017-05-18 08:07:48 -05:00
Poojawa
285bd5c9ff Delete dominator.dm.rej 2017-05-18 08:07:38 -05:00
LetterJay
0336b8c82f Merge pull request #922 from Citadel-Station-13/upstream-merge-27183 
[MIRROR] Dominators require an open space, except it works this time
 2017-05-18 09:02:54 -04: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