shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,067 Commits 5 Branches 0 Tags
773a94dea69b51777991afeb5d7cfd79cf6daa41
Commit Graph

12455 Commits

Author SHA1 Message Date
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
f132720d7e Since you can properly scrub Freon now, it doesn't destroy itself. 2017-05-21 22:28:47 -05:00
CitadelStationBot
8abbf12132 Resonator fields now visually show how long they have until they burst 2017-05-21 22:28:36 -05:00
CitadelStationBot
7df5632d6e Minor Grammar Fixes 2017-05-21 22:28:29 -05:00
CitadelStationBot
31ecd3cdd8 Nerfs monkeys 2017-05-21 22:28:25 -05:00
CitadelStationBot
1dcad5fa0e Fixes pkborg fields not updating location or draining power 2017-05-21 22:28:20 -05:00
CitadelStationBot
d7f0b9494b Ports pandemic to tgui 2017-05-21 22:28:16 -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
4acbd4af2c Fixes Master/Recover not restoring previous runlevel 2017-05-21 22:27:58 -05:00
CitadelStationBot
1989e3d5ea properly fixes quickgrab exploit 2017-05-21 22:27:54 -05:00
CitadelStationBot
f43a861d6e Plasma cutters will mine further but will go less distance in open air 2017-05-21 22:27:50 -05:00
CitadelStationBot
a33966b231 Fixes paper runtimes 2017-05-21 22:27:46 -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
CitadelStationBot
312ae2218e [MIRROR] fixes chameleon laser guns blowing up welding tanks for real this time (#1069) 
* fixes chameleon laser guns blowing up welding tanks for real this time

* Delete energy.dm.rej

* Update energy.dm
 2017-05-21 18:30:12 -07:00
kevinz000
de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items 
# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm
 2017-05-21 18:17:42 -07:00
kevinz000
7e2cebe1db Merge branch 'master' into upstream-merge-27344 2017-05-21 17:50:29 -07:00
CitadelStationBot
0924db6d41 Re-removes "the station" from drone law 3 (#1075) 2017-05-21 17:45:06 -07:00
CitadelStationBot
cd82124ef5 Survival pod doors will properly turn if on shuttles (#1070) 2017-05-21 17:43:53 -07:00
CitadelStationBot
a3807448db Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#1076) 2017-05-21 17:42:06 -07:00
CitadelStationBot
3ad9c0ffed fixes cults being able to delete people (#1077) 2017-05-21 12:47:10 -07:00
CitadelStationBot
26448d7016 Removes the mess added with recalling with a message 2017-05-21 07:57:17 -05:00
CitadelStationBot
e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
CitadelStationBot
c0da458c92 Ports folders to Initialize (#1058) 2017-05-21 01:22:53 -05:00
Poojawa
2be5022536 Merge branch 'master' into upstream-merge-27268 2017-05-21 01:22:16 -05:00
Poojawa
909be8c8c7 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 2017-05-21 01:10:53 -05:00
CitadelStationBot
c8e9e34d2b [MIRROR] Fixes stat gathering (#1025) 
* Fixes stat gathering

* Delete blackbox.dm.rej

* Update blackbox.dm
 2017-05-21 01:07:14 -05:00
Poojawa
7a3fb9e62e update ticker.dm 2017-05-21 01:05:10 -05:00
Poojawa
110de7902e Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 01:01:11 -05:00
Poojawa
a8fa82b7c6 update world.dm 2017-05-21 01:01:10 -05:00
CitadelStationBot
883c5e034d Fixes bootstrapping the feedback database (#1012) 2017-05-21 00:46:44 -05:00
CitadelStationBot
63c64a00f1 [MIRROR] >mysql (#987) 
* >mysql

* Update dbcore.dm

* Delete dbcore.dm.rej
 2017-05-21 00:46:24 -05:00
Poojawa
d8299bdcfd delete .rej 2017-05-21 00:45:55 -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
f624071766 [MIRROR] Ninja Refactor (#1037) 
* Ninja Refactor

* Update antagonists.dm

* Delete antagonists.dm.rej

* Update antagonists.dm

* Update mind.dm

* Update mind.dm

* whatever, I fixed that cunt
 2017-05-21 00:39:26 -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
c8e9248ebb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 2017-05-21 00:13:39 -05:00
CitadelStationBot
e0af0df435 [MIRROR] Adds Mass Insert proc to sql (#986) 
* Adds Mass Insert proc to sql

* Update blackbox.dm

* Update dbcore.dm

* Delete dbcore.dm.rej
 2017-05-20 23:43:16 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot
5455e28d76 Aux Base Fixes (#1067) 2017-05-20 23:20:45 -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
cebutris
644a31ed98 Misc. guardian stuff (#1066) 
* beep boop

* Fixes one last inconsistency. Oops.

* punctuation
 2017-05-20 17:54:39 -07:00
CitadelStationBot
c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot
448dc20c2b Proto-kinetic crushers are significantly better 2017-05-20 12:42:11 -05:00
CitadelStationBot
06c0856799 Fixes buttons under doors. 2017-05-20 11:34:52 -05:00
LetterJay
186a63ad34 Merge pull request #1057 from Citadel-Station-13/upstream-merge-27395 
[MIRROR] Fixes having more movespeed when xenos hug themselves
 2017-05-19 22:54:52 -05:00
LetterJay
a6ee50b11b Merge pull request #1059 from Citadel-Station-13/upstream-merge-27389 
[MIRROR] Fixes gravity generator admin spam
 2017-05-19 22:47:03 -05:00