Commit Graph

1375 Commits

Author SHA1 Message Date
CitadelStationBot
c36eee94bd Adds modified syringe guns 2017-05-19 06:25:23 -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
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
CitadelStationBot
fa1b651799 Fixes custom slices not inheriting name 2017-05-18 16:37:54 -05: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
fe89b9ea8a Fixes bane runtimes 2017-05-18 16:37:02 -05:00
CitadelStationBot
90d96dba06 Fixes some holocall issues 2017-05-18 16:36:58 -05:00
CitadelStationBot
0c0c1e378b Fixes obtaining blob chems 2017-05-18 16:36:54 -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
d5b0150e99 Buffs hierophant club 2017-05-18 16:36:38 -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
293a895d92 [MIRROR] Fixes a bug where shuttles would not function (#1016)
* Fixes a bug where shuttles would not function

* Update master.dm

* Delete master.dm.rej
2017-05-18 13:58:52 -05:00
CitadelStationBot
7a66ea60fb Space vines can no longer spread on transit turfs (#1026) 2017-05-18 13:18:48 -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
4463646952 [MIRROR] MC Runlevels (#988)
* MC Runlevels

* Update ticker.dm

* Delete ticker.dm.rej
2017-05-18 12:42:43 -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
fe60185171 Initialize failures are now sent to their own logfile (#1015) 2017-05-18 12:38:28 -05:00
CitadelStationBot
f1a158e0a2 Qdel failures now have their own log file (#1014) 2017-05-18 12:38:03 -05:00
CitadelStationBot
1f4bd27f37 Eightballs are tiny items (#1013) 2017-05-18 12:37:43 -05:00
CitadelStationBot
e0a1c24367 Fixed TK butchering after item loses adjacency (#1011) 2017-05-18 12:33:27 -05:00
CitadelStationBot
fadbb378aa Adds Bonfire Grills (#1003) 2017-05-18 12:23:07 -05:00