Commit Graph

13933 Commits

Author SHA1 Message Date
Artur
2bd8499b94 We shallnt want mass production. 2020-02-12 14:28:35 +02:00
Artur
788d8c5873 Just in case. 2020-02-12 14:13:26 +02:00
Artur
0fdcfc8660 Works now. 2020-02-12 14:02:09 +02:00
Artur
a0adf64c6c Lets see if it works now 2020-02-12 12:52:36 +02:00
Ghom
8c2801fda6 Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
2020-02-12 11:14:27 +01:00
Ghom
af477aa28b Merge pull request #10992 from Hatterhat/buckbuff
buckshot buff - 60 to 75 on all pellet pointblank
2020-02-12 10:34:25 +01:00
Ghom
0917617543 Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2
improves getImplant by using locate()
2020-02-12 10:33:08 +01:00
Artur
5c102d4da0 Ghommies suggestions 2020-02-12 11:30:55 +02:00
Artur
7d1cf6a5a0 Hopefully makes blood useless 2020-02-12 11:27:57 +02:00
Ghom
ce5208a1df Merge pull request #11007 from r4d6/random-fixes
Mining Shuttle Fix
2020-02-12 10:10:16 +01:00
Ghommie
62ff589840 Something about a couple runtimes. 2020-02-12 09:10:24 +01:00
Ghom
fc3f0d02fc Merge pull request #11032 from Citadel-Station-13/kevinz000-patch-7
Fixes cryotubes not transferring reagents for minutes at a time (because at tier 4 it takes 80 * 20 = 1600 deciseconds (!!!) to .. transfer regeants??)
2020-02-12 09:09:36 +01:00
Ghom
2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
kevinz000
77163c7909 Update capture_the_flag.dm 2020-02-12 00:44:52 -07:00
kevinz000
46d2dc24e9 Update capture_the_flag.dm 2020-02-12 00:43:04 -07:00
kevinz000
66a01c1fe9 Update capture_the_flag.dm 2020-02-12 00:32:40 -07:00
kevinz000
938091ff67 Update capture_the_flag.dm 2020-02-12 00:31:20 -07:00
kevinz000
41f02fa24d Update capture_the_flag.dm 2020-02-12 00:26:58 -07:00
kevinz000
70e752dbc9 this is totally not laggy 2020-02-11 23:45:22 -07:00
kevinz000
9cb4c3c062 replace can_start 2020-02-11 23:25:18 -07:00
kevinz000
ecbb7767c3 Update cryo.dm 2020-02-11 23:07:47 -07:00
ShadeAware
5afbe44be3 Attempt Numero Dos!
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-11 17:27:40 -05:00
Trilbyspaceclone
a4a128f9dd Ok?
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-11 15:55:54 -05:00
Trilbyspaceclone
1b06506209 Update color.dm 2020-02-11 15:54:37 -05:00
Trilbyspaceclone
a8778417e4 Update standard.dm 2020-02-11 15:52:41 -05:00
Trilbyspaceclone
be58994538 Update outfit.dm 2020-02-11 15:43:17 -05:00
Artur
a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
Ghom
ac64f6574c Merge pull request #11003 from kevinz000/meme_rifles
Fixes energy lens not being in gun contents
2020-02-11 16:11:11 +01:00
kevinz000
275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
Winter Flare
5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -05:00
kevinz000
f247c6d8c6 Update pai_defense.dm 2020-02-11 04:27:22 -07:00
Artur
ce2ab532d9 Maintainer suggestion 2020-02-11 11:23:56 +02:00
kevinz000
58db43621d Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
2020-02-11 00:42:15 -07:00
Winter Flare
082085f143 Poppy Muffin (Fug You Derk) 2020-02-10 23:09:36 -05:00
Hatterhat
1d071ff127 one off 2020-02-10 21:40:51 -06:00
r4d6
8b68e57de0 Add the pickaxes 2020-02-10 22:02:39 -05:00
keronshb
42fda3d88b CogChamp
Adds the CogChamp drink!  Bloodcult gets one so why not Clock?
2020-02-10 21:18:51 -05:00
Lin
f1f8123e5a Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5
CallMaterialName reagent fix
2020-02-10 20:27:38 +00:00
Lin
4f546c90e3 Merge pull request #10982 from Ghommie/Ghommie-cit566
something about suit_digi.dmi
2020-02-10 20:24:35 +00:00
r4d6
dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
Artur
8e50c278bb Rebuild and misc nuke tweak 2020-02-10 17:34:14 +01:00
Artur
af95921155 Goddamnit 2020-02-10 15:20:22 +01:00
kevinz000
520dd57bf9 Update mob_helpers.dm 2020-02-10 04:33:27 -07:00
kevinz000
276f4b5fae Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:32:01 -07:00
kevinz000
690c14a716 Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:29:22 -07:00
kevinz000
d406086258 Update gravity.dm 2020-02-10 04:26:26 -07:00
Ghom
c8a62e7acf Merge pull request #10985 from r4d6/Dwarf
Dwarven Update
2020-02-10 12:23:23 +01:00
Ghom
3ee4f25626 Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes
Pandemic Fixes
2020-02-10 12:22:40 +01:00
Ghom
a0666e7454 Merge pull request #11000 from Seris02/rcdfixyeet
makes RCDs not cost a single sheet of glass and metal
2020-02-10 12:20:40 +01:00