Linzolle
|
d22631700c
|
update the fucking craft component because artur forgot to
|
2020-02-13 12:59:56 -06:00 |
|
kevinz000
|
863ce5152b
|
Merge remote-tracking branch 'citadel/master' into stuff
|
2020-02-13 04:14:44 -07:00 |
|
Ghom
|
a7d29ae830
|
Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
Station Locked firing pins
|
2020-02-13 09:42:22 +01:00 |
|
Ghom
|
500ed0dd57
|
Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10
refactors and changes up gravity gun projectiles a bit
|
2020-02-13 09:39:26 +01: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 |
|
necromanceranne
|
165f46b836
|
goodbye blood bullets
|
2020-02-13 17:05:36 +11:00 |
|
Trilbyspaceclone
|
7cd3a51c4e
|
Update pistol.dm
|
2020-02-12 14:48:53 -05:00 |
|
Trilbyspaceclone
|
49a7657404
|
Correction
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-12 14:26:29 -05: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 |
|
Trilbyspaceclone
|
a4a128f9dd
|
Ok?
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-11 15:55:54 -05:00 |
|
Hatterhat
|
1d071ff127
|
one off
|
2020-02-10 21:40:51 -06:00 |
|
kevinz000
|
d406086258
|
Update gravity.dm
|
2020-02-10 04:26:26 -07:00 |
|
kevinz000
|
0b28e17860
|
Update gravity.dm
|
2020-02-10 04:13:59 -07: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 |
|
Hatterhat
|
d24afcde1b
|
pb burst from 60 to 81
|
2020-02-09 19:07:24 -06:00 |
|
Arturlang
|
29207b22fb
|
Merge branch 'master' into debug_outfit_updates
|
2020-02-09 22:05:26 +02:00 |
|
Ghom
|
2a0ba12896
|
Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
gun qdel fix
|
2020-02-09 02:53:38 +01:00 |
|
TrilbySpaceClone
|
612b5c5da3
|
better name
|
2020-02-08 03:27:43 -05:00 |
|
TrilbySpaceClone
|
5dbfc9a514
|
Yay
|
2020-02-08 03:25:09 -05:00 |
|
kevinz000
|
c6c1cc484c
|
slight buff
|
2020-02-07 23:40:02 -07:00 |
|
kevinz000
|
826ed7d4f2
|
o k.
|
2020-02-07 23:39:09 -07:00 |
|
kevinz000
|
7c16830e91
|
ok
|
2020-02-07 23:31:38 -07:00 |
|
kevinz000
|
f8d5eae0c3
|
Update gravity.dm
|
2020-02-07 16:24:12 -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
|
673079f995
|
Update gravity.dm
|
2020-02-07 03:31:15 -07:00 |
|
kevinz000
|
b5d6afac9a
|
Update gravity.dm
|
2020-02-07 03:20:45 -07:00 |
|
kevinz000
|
4f2acb6298
|
Update gun.dm
|
2020-02-07 00:08:19 -07: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 |
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +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 |
|
Ghommie
|
7e2ad2b71f
|
Fixing accidental nerfs to the magpistol.
|
2020-02-05 18:45:15 +01:00 |
|
kevinz000
|
3d7fef76f3
|
Update sniper.dm
|
2020-02-05 05:57:16 -07:00 |
|
kevinz000
|
67489d62d4
|
Update projectile.dm
|
2020-02-05 05:56:31 -07:00 |
|
Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07: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 |
|
kevinz000
|
54d70cd9fe
|
Update gun.dm
|
2020-02-03 18:33:24 -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 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|