shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,214 Commits 5 Branches 0 Tags
446e0df667dafb2f17ef78a2cd56d0ae350ecf44
Commit Graph

15682 Commits

Author SHA1 Message Date
Winter Flare
ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
Winter Flare
f32affdb1c Made Mugs Colorful 2020-02-13 03:26:35 -05:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000
a8a071851a s 2020-02-13 00:32:26 -07:00
kevinz000
f1e0c62141 Update gravity.dm 2020-02-12 23:59:03 -07:00
kevinz000
c790478a3d Merge pull request #11012 from keronshb/RatvarDrink 
Introduces the Ratvarian mixed drink, the CogChamp!
 2020-02-12 23:58:14 -07:00
kevinz000
5b01691834 Merge pull request #11005 from Arturlang/Hypospray_fix 
Moves the hypospray mode change to CTRL click
 2020-02-12 23:57:50 -07:00
kevinz000
4e419eed03 Merge pull request #10987 from Ghommie/Ghommie-cit567 
Something about missing privates sprites and bad code.
 2020-02-12 23:56:53 -07:00
Detective Google
c34617d42a Merge branch 'the-p-o-o-l' of https://github.com/Detective-Google/Citadel-Station-13 into the-p-o-o-l 2020-02-13 00:12:13 -06:00
Detective Google
b6cbb3f505 woo yeah yeah woo 2020-02-13 00:12:11 -06:00
necromanceranne
165f46b836 goodbye blood bullets 2020-02-13 17:05:36 +11:00
Detective-Google
a8aa9ac24b Update code/modules/pool/pool_drain.dm as per ghom suggestion 2 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-12 23:43:32 -06:00
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
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