Commit Graph
1959 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa 5455e28d76 Aux Base Fixes (#1067) 2017-05-20 23:20:45 -05:00
CitadelStationBotandPoojawa 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 02492bfe2f Automatic changelog generation for PR #994 [ci skip] 2017-05-20 23:00:03 -05:00
CitadelStationBotandPoojawa 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
cebutrisandkevinz000 644a31ed98 Misc. guardian stuff (#1066)
* beep boop

* Fixes one last inconsistency. Oops.

* punctuation
2017-05-20 17:54:39 -07:00
CitadelStationBotandGitHub 2600dfaa19 Merge pull request #1064 from Citadel-Station-13/upstream-merge-27436
[MIRROR] Fixes buttons under doors.
2017-05-20 15:05:17 -05:00
CitadelStationBot 06c0856799 Fixes buttons under doors. 2017-05-20 11:34:52 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot e714641a73 Automatic changelog generation for PR #1060 [ci skip] 2017-05-19 22:46:44 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 4d48592008 Merge pull request #1051 from cebutris/holofixes
No More Free Parasites
2017-05-19 22:46:30 -05:00
CitadelStationBot da484b79a4 Automatic changelog generation for PR #1062 [ci skip] 2017-05-19 22:46:16 -05:00
LetterJayandGitHub 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
CitadelStationBot 88f1b8c428 Automatic changelog generation for PR #1054 [ci skip] 2017-05-19 08:05:39 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 44671daa84 Automatic changelog generation for PR #1056 [ci skip] 2017-05-19 08:04:42 -05:00
LetterJayandGitHub 1efa41487a Merge pull request #1056 from Citadel-Station-13/upstream-merge-27276
[MIRROR] Adds modified syringe guns
2017-05-19 09:04:41 -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
LetterJayandGitHub af815195bc Merge pull request #1034 from Citadel-Station-13/upstream-merge-27368
[MIRROR] Fixes bane runtimes
2017-05-19 05:32:31 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 369edc07d2 Merge pull request #1044 from Citadel-Station-13/upstream-merge-27347
[MIRROR] fixes ratvar shuttles
2017-05-18 23:45:31 -04:00
LetterJayandGitHub 62e3eb8718 Merge pull request #1043 from Citadel-Station-13/upstream-merge-27358
[MIRROR] [Delta] Adds freon tank to engineering secure storage
2017-05-18 23:45:20 -04:00
LetterJayandGitHub 51eafa84f4 Merge pull request #1042 from Citadel-Station-13/upstream-merge-27352
[MIRROR] [Cere] Atmospherics Revamp
2017-05-18 23:45:11 -04:00
LetterJayandGitHub 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
CitadelStationBot 514d29043e Automatic changelog generation for PR #1040 [ci skip] 2017-05-18 22:44:46 -05:00
LetterJayandGitHub 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
CitadelStationBot 5030026db7 Automatic changelog generation for PR #1038 [ci skip] 2017-05-18 22:40:44 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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