Commit Graph

530 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
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
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
CitadelStationBot
3ad9c0ffed fixes cults being able to delete people (#1077) 2017-05-21 12:47:10 -07: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
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
c6a9bdb4b2 Fixes clicking things under windows/doors. 2017-05-18 16:37:50 -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
CitadelStationBot
97286d25fc [MIRROR] Allows varediting loc and coords of atom/movables (#1020)
* Allows varediting loc and coords of atom/movables

* Update atoms_movable.dm

* Delete atoms_movable.dm.rej
2017-05-18 14:28:24 -05:00
CitadelStationBot
3e26a2d60f Adds a proc for copying languages from another thing (#1021) 2017-05-18 13:18:04 -05:00
CitadelStationBot
a5f858d8fb [MIRROR] Adds an underlay to turrets which gives them a base (#1002)
* Adds an underlay to turrets which gives them a base

* Update turrets.dmi
2017-05-18 13:12:17 -05:00
CitadelStationBot
42e8c5dbbd fixes triple latched toolboxes spawning too often than anticipated (#1019) 2017-05-18 12:42:09 -05:00
CitadelStationBot
e6a55a4131 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#1017) 2017-05-18 12:41:30 -05:00
CitadelStationBot
1f4bd27f37 Eightballs are tiny items (#1013) 2017-05-18 12:37:43 -05:00
CitadelStationBot
1b39381ee7 Ports radios to Initialize (#983) 2017-05-18 12:19:55 -05:00
CitadelStationBot
b0760b9b33 Fixes not being able to cancel Geis and being able to cancel Volt Void (#998) 2017-05-18 12:07:02 -05:00
CitadelStationBot
a23a3b5cce Fixes clockwork obelisks (#997) 2017-05-18 12:06:46 -05:00
CitadelStationBot
45d9ea57a7 Fixes fixing fire alarms (#996) 2017-05-18 12:06:22 -05:00
CitadelStationBot
04c79d28f9 Wizards are now at least 30 years old. Apprentices are 17 to 29. (#978) 2017-05-18 12:05:55 -05:00
CitadelStationBot
946013ac22 Fixes rcds working on transit space (#981) 2017-05-18 11:54:10 -05:00