kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
kevinz000
|
9589c3116b
|
Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
|
2020-02-19 19:03:01 -07:00 |
|
Ghom
|
5e10f822e6
|
Update energy.dm
|
2020-02-17 13:40:37 +01:00 |
|
Ghommie
|
aba636a44c
|
ok
|
2020-02-17 00:13:16 +01:00 |
|
Ghommie
|
1a0fba8a2a
|
Something about consistency and magnetic rifles.
|
2020-02-16 18:37:51 +01:00 |
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|
TrilbySpaceClone
|
bbe1ddc0cf
|
silk, bows, and graytide!
|
2020-02-14 23:04:02 -05:00 |
|
Ghom
|
0b8dd2a03d
|
Merge pull request #11045 from Trilbyspaceclone/patch-280
Flat guns can no longer be suppressed
|
2020-02-14 08:26:00 +01:00 |
|
Ghom
|
64882b8a90
|
Merge pull request #10993 from Linzolle/bows
adds the bow
|
2020-02-14 08:01:12 +01:00 |
|
Trilbyspaceclone
|
7cd3a51c4e
|
Update pistol.dm
|
2020-02-12 14:48:53 -05:00 |
|
kevinz000
|
45bec21520
|
fix sync
|
2020-02-10 04:01:21 -07:00 |
|
Linzolle
|
63be3300d2
|
actually
|
2020-02-09 19:52:44 -06:00 |
|
Linzolle
|
4622f66162
|
for real this time
|
2020-02-09 19:45:22 -06:00 |
|
Arturlang
|
29207b22fb
|
Merge branch 'master' into debug_outfit_updates
|
2020-02-09 22:05:26 +02:00 |
|
kevinz000
|
826ed7d4f2
|
o k.
|
2020-02-07 23:39:09 -07:00 |
|
kevinz000
|
7c16830e91
|
ok
|
2020-02-07 23:31:38 -07:00 |
|
Ghom
|
71f44a7085
|
Merge pull request #10892 from kevinz000/small_guncode_refactor
Small guncode refactor but it works
|
2020-02-07 23:13:21 +01:00 |
|
Lin
|
5717700146
|
Merge pull request #10925 from Ghommie/Ghommie-cit558
runtime is forever, errors are eternal.
|
2020-02-07 17:29:49 +00:00 |
|
kevinz000
|
ae199cee28
|
Update beam_rifle.dm
|
2020-02-06 23:49:36 -07:00 |
|
kevinz000
|
353c13631a
|
Update beam_rifle.dm
|
2020-02-06 23:34:33 -07:00 |
|
Ghommie
|
83a08ee9f5
|
Extras and tg#45018
|
2020-02-07 05:21:08 +01:00 |
|
Artur
|
c9dc35fd9a
|
Updates the debug outfit
|
2020-02-06 18:42:23 +01:00 |
|
Ghommie
|
233ed5873f
|
race conditions and turfs beings special.
|
2020-02-06 01:13:28 +01:00 |
|
kevinz000
|
8db3fbdf88
|
modularize out taser rework
|
2020-02-04 03:49:09 -07:00 |
|
kevinz000
|
8556a6188f
|
Merge remote-tracking branch 'citadel/master' into small_guncode_refactor
|
2020-02-04 03:47:01 -07:00 |
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
Ghommie
|
a365f3b499
|
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
|
2020-02-03 05:16:32 +01:00 |
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
Ghom
|
6ae5ffddb1
|
Merge pull request #10731 from necromanceranne/howdoiswitchhands
Energy crossbow changed from RNG to static effects
|
2020-02-01 18:58:03 +01:00 |
|
Ghom
|
74ad10355c
|
Merge pull request #10805 from Citadel-Station-13/i-hate-dueling
guns/ammo/projectiles now properly clean up while being deleted
|
2020-02-01 18:52:47 +01:00 |
|
Putnam3145
|
17e08280b1
|
Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9
fixes a very likely race condition in dueling pistols
|
2020-02-01 04:15:32 -08:00 |
|
Ghom
|
ed3ebd16a8
|
Merge pull request #10830 from Seris02/nomoreglitches
[s] fixes a glitch with the PKA
|
2020-02-01 10:06:58 +01:00 |
|
Seris02
|
3c8dcbbcd2
|
merp
|
2020-02-01 16:02:30 +08:00 |
|
Seris02
|
fc70b88b06
|
actually we only need it here
|
2020-02-01 11:51:15 +08:00 |
|
Seris02
|
20308b54dd
|
exploit fix
|
2020-02-01 11:48:55 +08:00 |
|
kevinz000
|
9e08f8bed7
|
Update energy.dm
|
2020-01-31 01:23:38 -07:00 |
|
kevinz000
|
97caad18c5
|
Update dueling.dm
|
2020-01-31 01:18:43 -07:00 |
|
kevinz000
|
0612649eb7
|
Update stun.dm
|
2020-01-29 20:50:06 -07:00 |
|
kevinz000
|
831fafb72b
|
Update dueling.dm
|
2020-01-29 19:06:11 -07:00 |
|
kevinz000
|
562659b5b8
|
Update dueling.dm
|
2020-01-29 19:00:11 -07:00 |
|
kevinz000
|
9df12f94d4
|
Merge branch 'master' into one_last_taser_attempt
|
2020-01-29 16:27:58 -07:00 |
|
necromanceranne
|
f9d6a9b9c4
|
Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc
|
2020-01-29 14:23:50 +11:00 |
|
kevinz000
|
9dfcef68ed
|
Merge branch 'master' into duke_moxley
|
2020-01-28 17:53:08 -07:00 |
|
kevinz000
|
d89b8d95cf
|
BRAINLETMOMENT
|
2020-01-27 22:44:51 -07:00 |
|
kevinz000
|
3ce1fe2585
|
changes
|
2020-01-27 22:26:43 -07:00 |
|
kevinz000
|
9d047f07f8
|
separate this a bit
|
2020-01-27 21:08:47 -07:00 |
|
kevinz000
|
57b977c2e5
|
why
|
2020-01-27 20:41:45 -07:00 |
|
kevinz000
|
7d53d6e162
|
s
|
2020-01-27 20:24:02 -07:00 |
|
kevinz000
|
7ae43a2249
|
fix
|
2020-01-27 17:51:59 -07:00 |
|
kevinz000
|
3055c2b4c1
|
Merge pull request #10742 from Ghommie/Ghommie-cit532
Fixes det revolver being risky to use.
|
2020-01-27 17:43:46 -07:00 |
|