Commit Graph

1426 Commits

Author SHA1 Message Date
LetterJay
b2a0fe64af Merge pull request #1094 from Citadel-Station-13/upstream-merge-27488
[MIRROR] Fixes jetpacks working indoors/in areas with gravity
2017-05-22 08:25:30 -05:00
LetterJay
8572dc2da8 Merge pull request #1093 from Citadel-Station-13/upstream-merge-27396
[MIRROR] Since you can properly scrub Freon now, it doesn't destroy itself.
2017-05-22 08:25:13 -05:00
LetterJay
ef69582c52 Merge pull request #1090 from Citadel-Station-13/upstream-merge-27472
[MIRROR] Minor Grammar Fixes
2017-05-22 08:24:41 -05:00
LetterJay
a345c41bcd Merge pull request #1089 from Citadel-Station-13/upstream-merge-27473
[MIRROR] Nerfs monkeys
2017-05-22 08:24:26 -05:00
LetterJay
85e03b3e11 Merge pull request #1088 from Citadel-Station-13/upstream-merge-27430
[MIRROR] Fixes pkborg fields not updating location or draining power
2017-05-22 08:24:08 -05:00
LetterJay
a0e5170e40 Merge pull request #1086 from Citadel-Station-13/upstream-merge-27476
[MIRROR] Megafauna and lavaland mobs will no longer spawn directly on top of the mining base
2017-05-22 08:23:23 -05:00
LetterJay
d016d5b669 Merge pull request #1085 from Citadel-Station-13/upstream-merge-27519
[MIRROR] Fixes Master/Recover not restoring previous runlevel
2017-05-22 08:23:05 -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
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
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
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
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
c0da458c92 Ports folders to Initialize (#1058) 2017-05-21 01:22: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
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
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
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
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
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
LetterJay
2cb54a5d45 Merge pull request #1061 from Citadel-Station-13/upstream-merge-27398
[MIRROR] IsAdminAdvancedProcCall returns FALSE in TESTING
2017-05-19 22:46:52 -05:00
LetterJay
59f367cd23 Merge pull request #1060 from Citadel-Station-13/upstream-merge-27386
[MIRROR] Pulse Weapons Sprite Update
2017-05-19 22:46:43 -05:00
LetterJay
4d48592008 Merge pull request #1051 from cebutris/holofixes
No More Free Parasites
2017-05-19 22:46:30 -05:00
LetterJay
3f24fa15bf Merge pull request #1062 from Citadel-Station-13/Cryofix
mob_occupant to occupant
2017-05-19 22:46:14 -05:00
LetterJay
6733349b3f this didn't mirror for some reason 2017-05-19 22:43:52 -05:00
LetterJay
6d3e9f9c50 mob_occupant to occupant 2017-05-19 22:33:26 -05:00
CitadelStationBot
915fa6cac1 IsAdminAdvancedProcCall returns FALSE in TESTING 2017-05-19 16:00:23 -05:00
CitadelStationBot
461804e635 Pulse Weapons Sprite Update 2017-05-19 13:51:47 -05:00
CitadelStationBot
778d809ff3 Fixes gravity generator admin spam 2017-05-19 13:48:39 -05:00
CitadelStationBot
4430e7d0c3 Fixes having more movespeed when xenos hug themselves 2017-05-19 12:31:59 -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
7f9f226285 Merge pull request #1053 from Citadel-Station-13/upstream-merge-27385
[MIRROR] fixes aimed spells not recharging
2017-05-19 09:05:25 -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