shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

12930 Commits

Author SHA1 Message Date
Detective-Google
25c677942a Update code/modules/pool/pool_main.dm as per ghom suggestion 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-12 23:43:10 -06:00
keronshb
5d32775170 Changes the desc a little 
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim"  Thanks Justin!
 2020-02-12 21:31:48 -05:00
keronshb
7949c4fa01 Changes cult stunhand when halos are out 
Turns the stunhand into a burn + knockback hand.  So it remains more defensive than offensive.
 2020-02-12 21:24:12 -05:00
ShadeAware
195760e572 h 2020-02-12 16:37:00 -05:00
ShadeAware
0f603f2aff Fixes icon state for the refill 
Thank you for the catch, Ghommie.
 2020-02-12 16:34:16 -05:00
Trilbyspaceclone
34d8381b67 Update blood_drunk_miner.dm 2020-02-12 15:21:17 -05:00
Trilbyspaceclone
0bd1357e5f flour 2020-02-12 15:03:15 -05:00
Trilbyspaceclone
1ce9232958 Update cereals.dm 2020-02-12 15:00:08 -05:00
Trilbyspaceclone
ba8c7b191c Update stickman.dm 2020-02-12 14:52:24 -05:00
Trilbyspaceclone
7cd3a51c4e Update pistol.dm 2020-02-12 14:48:53 -05:00
Trilbyspaceclone
4b880276d8 Update emergency.dm 2020-02-12 14:41:38 -05:00
Trilbyspaceclone
b7c3582d86 Update outfit.dm 2020-02-12 14:29:19 -05:00
Trilbyspaceclone
551a2593d4 Update color.dm 2020-02-12 14:28:57 -05:00
Trilbyspaceclone
49a7657404 Correction 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-12 14:26:29 -05:00
Ghom
942f3f28be Merge pull request #10994 from DeltaFire15/narsierunefix 
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
 2020-02-12 16:51:38 +01:00
Ghom
2674fa6efc Merge pull request #11043 from Seris02/apcthingfix 
fixes apc icons
 2020-02-12 15:35:01 +01:00
Artur
21ce2242ac Conflict fix 2020-02-12 16:21:29 +02:00
Seris02
eb5835f668 fixes apcs 2020-02-12 21:35:51 +08:00
Artur
2bd8499b94 We shallnt want mass production. 2020-02-12 14:28:35 +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
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