Commit Graph

1404 Commits

Author SHA1 Message Date
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
CitadelStationBot
45bc120501 fixes aimed spells not recharging 2017-05-19 06:21:06 -05:00
LetterJay
af815195bc Merge pull request #1034 from Citadel-Station-13/upstream-merge-27368
[MIRROR] Fixes bane runtimes
2017-05-19 05:32:31 -04: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
653a3100c6 Merge pull request #1049 from Citadel-Station-13/upstream-merge-27340
[MIRROR] Fixes uplink pens not showing in traitor menu
2017-05-18 23:46:41 -04:00
LetterJay
2ad02addbd Merge pull request #1048 from Citadel-Station-13/upstream-merge-27335
[MIRROR] Gives lavaland syndicates the syndicate faction.
2017-05-18 23:46:30 -04:00
LetterJay
1b4d2b330f Merge pull request #1047 from Citadel-Station-13/upstream-merge-27343
[MIRROR] Fixes custom slices not inheriting name
2017-05-18 23:46:20 -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
740e5cab30 Merge pull request #1032 from Citadel-Station-13/upstream-merge-27370
[MIRROR] Fixes obtaining blob chems
2017-05-18 23:39:34 -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
LetterJay
4601d9135c Merge pull request #1029 from Citadel-Station-13/upstream-merge-27371
[MIRROR] Adds a new toy to arcade prizes.  A rumbling toy toolbox meant to mimic hisgrace
2017-05-18 23:37:56 -04:00
cebutris
893eb92833 no more free parasites 2017-05-18 18:04:42 -04:00
CitadelStationBot
62c22a5243 Fixes uplink pens not showing in traitor menu 2017-05-18 16:38:05 -05:00
CitadelStationBot
76c6a54d7e Gives lavaland syndicates the syndicate faction. 2017-05-18 16:37:57 -05:00