Commit Graph

14703 Commits

Author SHA1 Message Date
Trilbyspaceclone 8b99ca8094 Update packs.dm 2019-03-09 20:31:00 -05:00
Trilbyspaceclone 5aa5f1ed56 SMG 2019-03-09 20:29:19 -05:00
Trilbyspaceclone ce7c76e8a4 ? 2019-03-09 20:12:44 -05:00
Trilbyspaceclone 8f9542bc43 Update automatic.dm 2019-03-09 20:05:07 -05:00
Trilbyspaceclone beb812e291 Update packs.dm 2019-03-09 20:03:40 -05:00
Trilbyspaceclone 979f9125ef Update weapon_designs.dm 2019-03-09 19:54:48 -05:00
Coolgat3 45a4693618 Update helmet.dm 2019-03-09 16:42:27 +01:00
Coolgat3 eb786cbfde Update jobs.dm 2019-03-09 16:39:51 +01:00
deathride58 5e6395270b Merge pull request #7889 from Citadel-Station-13/kevinz000-patch-7
Reworks meth
2019-03-08 21:05:20 -05:00
Ghom e80b17e572 Update code/modules/food_and_drinks/food/snacks_meat.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-03-08 20:55:41 -05:00
deathride58 d9df0c1f76 Merge pull request #8093 from Trilbyspaceclone/patch-74
[Ready] Makes Fire extinguisher slip need a screwdriver - Frack & Spensara Request Middle ground by Bhijn
2019-03-08 20:54:21 -05:00
deathride58 c2acda5a96 Merge pull request #8073 from Citadel-Station-13/kevinz000-patch-27
bunker bypass now sanitizes ckeys automatically to avoid errors
2019-03-08 20:51:15 -05:00
deathride58 2ae75ccd21 Merge pull request #8078 from Citadel-Station-13/kevinz000-patch-29
Fixes SDQL2 list association recursing/printing
2019-03-08 20:50:50 -05:00
deathride58 e5f5520393 Merge pull request #8075 from BlackMajor/master
More borg sprites
2019-03-08 20:50:33 -05:00
deathride58 aac192752f Merge pull request #8088 from Trilbyspaceclone/patch-69
[MIRROR] - Candle cleanup and fixes #42968
2019-03-08 20:50:13 -05:00
deathride58 6ed81162b3 Merge pull request #8089 from Trilbyspaceclone/patch-70
[MIRROR] - P.A.C.M.A.N code cleaning #42891
2019-03-08 20:49:38 -05:00
deathride58 6aaee476c8 Merge pull request #8079 from Citadel-Station-13/kevinz000-patch-30
Adds wrapper list access index for SDQL2
2019-03-08 20:49:18 -05:00
deathride58 3b3fcb5d19 Merge pull request #8094 from Trilbyspaceclone/patch-75
[MIRROR] Watcher's Wing No Longer Perma-Disarms #41708
2019-03-08 20:48:40 -05:00
deathride58 5aa9dd7c14 Merge pull request #8092 from Trilbyspaceclone/patch-71
More miner point cards
2019-03-08 20:46:57 -05:00
deathride58 df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD
[MIRROR]  fixes some edge cases in rcd building #42960 TG code
2019-03-08 20:46:19 -05:00
deathride58 f7c9b1cd32 Merge pull request #8066 from Citadel-Station-13/kevinz000-patch-23
Fixes the panic bunker
2019-03-08 20:43:42 -05:00
deathride58 2cd9c69ed1 Merge pull request #8083 from Poojawa/patch-3
Fixes genital-less VR people
2019-03-08 20:43:25 -05:00
Amatsu Darkfyre 54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. 2019-03-08 17:22:40 -05:00
Coolgat3 af04b72476 Making secberets protect as much as helmets 2019-03-08 17:36:46 +01:00
Amatsu Darkfyre 575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. 2019-03-08 04:02:21 -05:00
Trilbyspaceclone bda18c0770 Update extinguisher.dm 2019-03-06 20:32:40 -05:00
Trilbyspaceclone 7c79484784 Update extinguisher.dm 2019-03-06 20:05:53 -05:00
Trilbyspaceclone fdad1c30be ? 2019-03-06 17:05:54 -05:00
Trilbyspaceclone 371a4a1a9e Maybe 2019-03-06 16:45:47 -05:00
Trilbyspaceclone 8a5b4414a3 Update extinguisher.dm 2019-03-05 16:37:22 -05:00
nik707 a89ab006c1 Adds new and immersive sound for combat
Dink!
2019-03-05 15:03:08 -06:00
Trilbyspaceclone 1228bb4b11 Update extinguisher.dm 2019-03-05 15:37:27 -05:00
Trilbyspaceclone a0b38d0ed7 Update extinguisher.dm 2019-03-05 03:34:38 -05:00
Trilbyspaceclone 33213b0099 Update kinetic_crusher.dm 2019-03-05 01:06:16 -05:00
Trilbyspaceclone 8f02bf0357 Oh I did a goof 2019-03-05 00:33:53 -05:00
Trilbyspaceclone eb80b6f6cd ? 2019-03-05 00:29:20 -05:00
Trilbyspaceclone cecf7e251f Update machine_vending.dm 2019-03-05 00:06:33 -05:00
Trilbyspaceclone 0b0bfbac10 Update machine_vending.dm 2019-03-04 23:48:12 -05:00
Trilbyspaceclone 5255a31e3d Update machine_vending.dm 2019-03-04 23:46:42 -05:00
Trilbyspaceclone c6011bb853 Update extinguisher.dm 2019-03-04 23:35:25 -05:00
Trilbyspaceclone 6a4ce07c0b Update machine_vending.dm 2019-03-04 23:27:38 -05:00
deathride58 64ab4a32a3 Fixes centcom zlevel hyperspace not instantly teleporting mobs out of the z-level (and also fixes the title screen while im at it) 2019-03-04 21:38:34 -05:00
deathride58 ec470c5cca excuse me vscode but what the FUCK 2019-03-04 21:24:03 -05:00
deathride58 d8f738184b Replaces disarm right click action with tgstation/tgstation#42958 's disarm action, also ports the removal of non-help intent pushing from that same pr 2019-03-04 21:05:50 -05:00
Trilbyspaceclone 1d28a3b035 Update port_gen.dm 2019-03-04 20:52:02 -05:00
Trilbyspaceclone 5f764b7d1b Update candle.dm 2019-03-04 20:33:53 -05:00
Trilbyspaceclone 518bce82c0 Update plating.dm 2019-03-04 16:34:37 -05:00
Trilbyspaceclone 06174f77a5 Update lattice.dm 2019-03-04 16:31:40 -05:00
Hatterhat 8d3eafb951 epic 2019-03-04 15:11:04 -06:00
Poojawa ff670632dd Removes specific names from clone pod reports 2019-03-03 00:20:27 -06:00