shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,098 Commits 5 Branches 0 Tags
a9170aae93f228551d83147677da8ee918db9b97
Commit Graph

9242 Commits

Author SHA1 Message Date
CitadelStationBot 25df88509a Reorganizes martial arts and stores them in the MIND. 2017-05-22 07:13:10 -05:00
CitadelStationBot db4b764aea [All stations] Cleaned up var-editted areas 2017-05-21 22:29:41 -05:00
CitadelStationBot 8bc4cf3f41 Warden Compact Combat Shotgun 2017-05-21 22:29:01 -05:00
CitadelStationBot 39635b2d0d Fixes talisman grammar 2017-05-21 22:28:57 -05:00
CitadelStationBot 9f75c7b317 Fixes jetpacks working indoors/in areas with gravity 2017-05-21 22:28:51 -05:00
CitadelStationBot 1dcad5fa0e Fixes pkborg fields not updating location or draining power 2017-05-21 22:28:20 -05:00
CitadelStationBot 4e5617ad54 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base 2017-05-21 22:28:10 -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 f4e7e152df Merge branch 'upstream-merge-27344' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 2017-05-21 00:37:53 -05:00
Poojawa 587bc1795c missing files 2017-05-21 00:37:47 -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
LetterJay 425191a0b6 Merge pull request #1054 from Citadel-Station-13/upstream-merge-27384 
[MIRROR] Fix choice for golems transferring between shells
 2017-05-19 09:05:38 -04:00
LetterJay 20848789f0 Merge pull request #1055 from Citadel-Station-13/upstream-merge-27376 
[MIRROR] If ratvar is alive, turning clockwork floors into clockwork walls is fast
 2017-05-19 09:05:03 -04:00
CitadelStationBot c36eee94bd Adds modified syringe guns 2017-05-19 06:25:23 -05:00
CitadelStationBot b943780a8c If ratvar is alive, turning clockwork floors into clockwork walls is fast 2017-05-19 06:25:19 -05:00
CitadelStationBot a56d1fcb9b Fix choice for golems transferring between shells 2017-05-19 06:21:10 -05:00
LetterJay cb5e0eba3a Merge pull request #1039 from Citadel-Station-13/upstream-merge-27367 
[MIRROR] Quick fix for AI language issues.
 2017-05-19 01:00:41 -04:00
LetterJay 96710c56e1 Merge pull request #1046 from Citadel-Station-13/upstream-merge-27292 
[MIRROR] Fixes clicking things under windows/doors.
 2017-05-18 23:46:08 -04: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
LetterJay 6abf2a53be Merge pull request #1041 from Citadel-Station-13/upstream-merge-27359 
[MIRROR] Plastic explosives can no longer be detonated by EMPs
 2017-05-18 23:44:53 -04:00
LetterJay ad219357af Merge pull request #1040 from Citadel-Station-13/upstream-merge-27337 
[MIRROR] Proselytizing alloy shards will now proselytize all the shards in the tile
 2017-05-18 23:44:45 -04:00
LetterJay 11b4a00322 self merge 2017-05-18 22:43:55 -05:00
LetterJay 50df0e608b Merge pull request #1038 from Citadel-Station-13/upstream-merge-27361 
[MIRROR] Vending machines are more dangerous when throwing items
 2017-05-18 23:40:42 -04:00
LetterJay 10fa3fe530 Merge pull request #1036 from Citadel-Station-13/upstream-merge-27252 
[MIRROR] Fixes bypassing cargo export values on minerals
 2017-05-18 23:40:21 -04:00
LetterJay 038e804348 Merge pull request #1035 from Citadel-Station-13/upstream-merge-27241 
[MIRROR] Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC
 2017-05-18 23:40:11 -04:00
LetterJay ee6c2435ac Merge pull request #1033 from Citadel-Station-13/upstream-merge-27369 
[MIRROR] Fixes some holocall issues
 2017-05-18 23:39:45 -04:00
LetterJay cda7d68cd6 Merge pull request #1031 from Citadel-Station-13/upstream-merge-27234 
[MIRROR] [READY]Peacekeeper cyborg projectile dampening fields, attempt three
 2017-05-18 23:39:25 -04:00
LetterJay 1b95027789 Merge pull request #1030 from Citadel-Station-13/upstream-merge-27372 
[MIRROR] Plasmaman Plasma Tanks are just as large as normal emergency tanks
 2017-05-18 23:38:47 -04:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot c6a9bdb4b2 Fixes clicking things under windows/doors. 2017-05-18 16:37:50 -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 3a90a50af9 Plastic explosives can no longer be detonated by EMPs 2017-05-18 16:37:30 -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 79655b17e5 Quick fix for AI language issues. 2017-05-18 16:37:22 -05:00
CitadelStationBot 670a6f2126 Vending machines are more dangerous when throwing items 2017-05-18 16:37:18 -05:00
CitadelStationBot 9896c98935 Fixes bypassing cargo export values on minerals 2017-05-18 16:37:11 -05:00
CitadelStationBot 552433143e Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC 2017-05-18 16:37:07 -05:00
CitadelStationBot 90d96dba06 Fixes some holocall issues 2017-05-18 16:36:58 -05:00
CitadelStationBot 36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00
CitadelStationBot 4cab226611 Plasmaman Plasma Tanks are just as large as normal emergency tanks 2017-05-18 16:36:46 -05:00
CitadelStationBot 5956761df8 Adds a new toy to arcade prizes. A rumbling toy toolbox meant to mimic hisgrace 2017-05-18 16:36:43 -05:00