silicons
|
8b36cf6f64
|
Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
|
2020-10-01 03:01:18 -07:00 |
|
Artur
|
435565f1d8
|
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
|
2020-09-21 00:16:12 +03:00 |
|
Timothy Teakettle
|
f1cd94fc97
|
emp rework
|
2020-09-09 23:14:06 +01:00 |
|
silicons
|
9e204f167f
|
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
Miner Loot Shuffle MK III
|
2020-09-06 01:58:46 -07:00 |
|
BlackMajor
|
8b59b4a80d
|
Merge pull request #13332 from Citadel-Station-13/silicons-patch-31
makes magweapons emp-immune
|
2020-09-06 18:05:34 +12:00 |
|
BlackMajor
|
75e38edb43
|
Merge pull request #13287 from Citadel-Station-13/revert-13122-haha
Reverts load delays because it's still a problem and by god am I just done at this point
|
2020-09-06 18:01:09 +12:00 |
|
silicons
|
cbcacaa0af
|
Update magweapon.dm
|
2020-09-02 15:51:28 -07:00 |
|
Artur
|
d47a670f84
|
Cant put these on objects..
|
2020-09-02 19:10:35 +03:00 |
|
Artur
|
3bef4ba35e
|
TGUI updates + statpanel
|
2020-09-02 17:52:47 +03:00 |
|
Trilbyspaceclone
|
9c8f3305bb
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-30 00:41:42 -04:00 |
|
silicons
|
05b5d39732
|
Update ballistic.dm
|
2020-08-29 21:38:45 -07:00 |
|
Trilbyspaceclone
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04:00 |
|
Ghommie
|
2811f744e3
|
Fixing some mistakes with the priority overlays removal PR.
|
2020-08-26 14:00:35 +02:00 |
|
silicons
|
7737e76b32
|
Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-22 15:19:07 -07:00 |
|
Ghom
|
cd10655985
|
fix 2
|
2020-08-20 23:02:13 +02:00 |
|
Ghommie
|
921a963e59
|
fix 1
|
2020-08-20 20:26:29 +02:00 |
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
lolman360
|
5306da7938
|
Update code/modules/projectiles/guns/ballistic.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-08-19 12:02:53 +10:00 |
|
lolman360
|
6f21b23a87
|
Fixes Shit.
|
2020-08-18 14:28:57 +10:00 |
|
Trilbyspaceclone
|
1b61a5feb2
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-12 15:10:37 -04:00 |
|
silicons
|
6876edbd85
|
Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
|
2020-08-06 19:40:09 -07:00 |
|
TrilbySpaceClone
|
3ae10ac826
|
update?
|
2020-08-06 13:09:41 -04:00 |
|
Hatterhat
|
25ab96cf53
|
funny revolver reskins
|
2020-08-03 20:39:06 -05:00 |
|
Trilbyspaceclone
|
e1e6198140
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-03 10:53:08 -04:00 |
|
Timothy Teakettle
|
03d01d917f
|
Merge branch 'master' into wounds-part-2
|
2020-08-02 18:10:31 +01:00 |
|
silicons
|
f02bc4a572
|
Update toy.dm
|
2020-07-29 19:49:11 -07:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Lin
|
bbffd41d55
|
Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
beam rifles are now practical in emitters
|
2020-07-28 22:05:39 -05:00 |
|
Lin
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
Lin
|
2514f4111d
|
Merge pull request #12900 from Citadel-Station-13/silicons-patch-53
drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)
|
2020-07-27 11:43:31 -05:00 |
|
silicons
|
23465355d0
|
Update stun.dm
|
2020-07-24 22:16:06 -07:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
1c4249c99d
|
Update medbeam.dm
|
2020-07-24 00:57:30 -07:00 |
|
silicons
|
0b4185e26f
|
Update beam_rifle.dm
|
2020-07-23 18:52:18 -07:00 |
|
silicons
|
ce18584fb1
|
Update beam_rifle.dm
|
2020-07-23 18:47:22 -07:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
4d48abf3a6
|
fixes
|
2020-07-21 11:46:17 -07:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
Letter N
|
2afab07b4a
|
https://github.com/tgstation/tgstation/pull/52255
|
2020-07-16 20:05:37 +08:00 |
|
timothyteakettle
|
03bd806c73
|
pickle
|
2020-07-16 02:51:07 +01:00 |
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Trilbyspaceclone
|
f479a8622e
|
Update spell_book.dm
|
2020-07-07 14:11:46 -04:00 |
|
Trilbyspaceclone
|
dae3110100
|
Update wand.dm
|
2020-07-07 13:52:41 -04:00 |
|
Trilbyspaceclone
|
8aceeb0c43
|
Update spell_book.dm
|
2020-07-07 13:50:42 -04:00 |
|
Trilbyspaceclone
|
49b0d38112
|
Apply suggestions from code review
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-07-07 13:47:56 -04:00 |
|