 Lin
|
1649f42570
|
bruh
|
2020-03-18 01:24:54 +00:00 |
|
|
Detective Google
|
6b392e09c2
|
Merge remote-tracking branch 'upstream/master' into hudpatches
|
2020-03-17 16:29:13 -05:00 |
|
|
Detective Google
|
af872d1476
|
push
|
2020-03-17 16:10:15 -05:00 |
|
|
kevinz000
|
fcf51a285d
|
Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5
Positronic overlays fix.
|
2020-03-17 09:29:39 -07:00 |
|
|
kevinz000
|
7a9525d7c7
|
Merge pull request #11499 from Citadel-Station-13/Ghommie-patch-3
Fixing right click / verb set_APTFT
|
2020-03-17 09:29:17 -07:00 |
|
|
kevinz000
|
2ae50af752
|
Merge pull request #11487 from Ghommie/Ghommie-cit626
Shortcut fix for a sticky situation.
|
2020-03-17 09:28:01 -07:00 |
|
|
kevinz000
|
a928681401
|
Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff
Removes stun bullet .45/Kitchen Gun a lot more desirable for heavy duty cleaning!
|
2020-03-17 09:25:51 -07:00 |
|
|
kevinz000
|
2e4282befa
|
Merge pull request #11498 from necromanceranne/diaghud_fix
Replaced and added missing Diagnostic HUDSunglasses sprites
|
2020-03-17 09:25:32 -07:00 |
|
|
kevinz000
|
c14b1c2857
|
linter
|
2020-03-16 14:18:47 -07:00 |
|
|
kevinz000
|
9bd275e430
|
Merge remote-tracking branch 'citadel/master' into shield_refactor
|
2020-03-16 13:47:53 -07:00 |
|
|
kevinz000
|
0692184a0a
|
k
|
2020-03-16 13:34:07 -07:00 |
|
|
kevinz000
|
b062c76ca7
|
Merge pull request #11485 from Ghommie/Ghommie-cit625
Fixing a little issue with the musician trait etcetera.
|
2020-03-16 13:23:25 -07:00 |
|
|
kevinz000
|
2e90761f88
|
Merge pull request #11482 from Ghommie/Ghommie-cit624
fixing missing icon issues for some survival pod machinery.
|
2020-03-16 13:23:06 -07:00 |
|
|
kevinz000
|
fd7bfaba06
|
Merge pull request #11480 from Ghommie/Ghommie-cit623
Banana pies, beams. runtime errors and warnings.
|
2020-03-16 13:22:49 -07:00 |
|
|
kevinz000
|
3c97782a87
|
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
mining borg nerfs - "they should be outclassed lategame"
|
2020-03-16 13:22:23 -07:00 |
|
|
kevinz000
|
70880624e6
|
implement blocktypes
|
2020-03-16 13:20:58 -07:00 |
|
|
kevinz000
|
ceb3d39266
|
k
|
2020-03-16 12:51:30 -07:00 |
|
|
kevinz000
|
7a25e04324
|
bet
|
2020-03-16 11:15:11 -07:00 |
|
|
kevinz000
|
7fdbcc55c6
|
s
|
2020-03-16 11:12:10 -07:00 |
|
|
kevinz000
|
d3724d5fbd
|
f
|
2020-03-16 10:59:34 -07:00 |
|
|
kevinz000
|
26ee02ef39
|
dab
|
2020-03-16 10:52:23 -07:00 |
|
|
kevinz000
|
a929fa1e8d
|
s
|
2020-03-16 10:46:56 -07:00 |
|
|
kevinz000
|
e3301f8722
|
bet
|
2020-03-16 10:44:02 -07:00 |
|
|
necromanceranne
|
6f0fc2bdea
|
I LOVE YOU KITCHEN GUN!
|
2020-03-17 03:20:53 +11:00 |
|
|
Seris02
|
ffb2e65c17
|
why I hate byond (#11496)
|
2020-03-16 17:20:51 +01:00 |
|
|
Ghom
|
a505806ef2
|
No comment.
|
2020-03-16 17:13:56 +01:00 |
|
|
Ghom
|
a24a67e489
|
Update reagent_containers.dm
|
2020-03-16 17:07:30 +01:00 |
|
|
Ghom
|
be8f5e1193
|
Update posibrain.dm
|
2020-03-16 17:05:12 +01:00 |
|
|
Ghom
|
75a84c06b1
|
Update MMI.dm
|
2020-03-16 17:04:29 +01:00 |
|
|
Ghom
|
d47c24a8d0
|
Fixing right click / verb set_APTFT
|
2020-03-16 16:44:15 +01:00 |
|
|
necromanceranne
|
19fd006103
|
Fixed some missing sprites
|
2020-03-17 02:12:28 +11:00 |
|
|
kevinz000
|
8fdb1e5964
|
Merge pull request #11465 from Seris02/duffelbagholding
duffel bags of holding
|
2020-03-16 06:12:40 -07:00 |
|
|
kevinz000
|
6af9c54da5
|
better
|
2020-03-16 04:59:55 -07:00 |
|
|
kevinz000
|
a77be038b8
|
refactoring this whole thing again
|
2020-03-16 04:56:32 -07:00 |
|
|
kevinz000
|
c35ffacf50
|
k
|
2020-03-16 04:29:18 -07:00 |
|
|
kevinz000
|
763c835a53
|
bitflags not equals
|
2020-03-16 04:26:19 -07:00 |
|
|
kevinz000
|
2a9e4bebdd
|
priority
|
2020-03-16 04:24:18 -07:00 |
|
|
kevinz000
|
69374c64c9
|
k
|
2020-03-16 04:18:22 -07:00 |
|
|
kevinz000
|
857f793600
|
ok
|
2020-03-16 04:12:54 -07:00 |
|
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
|
kevinz000
|
94db06509c
|
slight desword reflect meme buff
|
2020-03-16 03:50:26 -07:00 |
|
|
kevinz000
|
d32bff7815
|
return list
|
2020-03-16 03:35:10 -07:00 |
|
|
kevinz000
|
703fca5f90
|
add owner argument
|
2020-03-16 03:24:19 -07:00 |
|
|
kevinz000
|
9ead492bb0
|
changes
|
2020-03-16 00:28:18 -07:00 |
|
|
Detective Google
|
828b5cdacf
|
why was this backwards
|
2020-03-16 01:57:23 -05:00 |
|
|
Detective Google
|
94f694e568
|
adds some hudpatches
seemed like fun flavor, inspired by bay and a request.
|
2020-03-16 01:44:26 -05:00 |
|
|
Hatterhat
|
1fe67d5ce9
|
a finger of the monkey's paw curls.
|
2020-03-16 01:35:47 -05:00 |
|
|
kevinz000
|
fae84f9ee6
|
Merge pull request #11462 from Ghommie/Ghommie-cit621
Fixing some bug reports.
|
2020-03-15 23:03:59 -07:00 |
|
|
Ghommie
|
5e5bdec85d
|
More runtime errors.
|
2020-03-16 01:55:02 +01:00 |
|
|
Ghommie
|
2553384c6e
|
Shortcut fix for a sticky situation.
|
2020-03-16 01:23:12 +01:00 |
|