 kevinz000
|
2cc0e8ee6c
|
k
|
2020-01-16 21:17:43 -07:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
kevinz000
|
d7a8494d2d
|
fix
|
2020-01-16 21:03:28 -07:00 |
|
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
|
kevinz000
|
2ba226b912
|
aa
|
2020-01-16 20:57:02 -07:00 |
|
|
Putnam
|
5ace1df9af
|
better logging, that also works
|
2020-01-16 19:09:13 -08:00 |
|
|
kevinz000
|
b505c1e087
|
WEH
|
2020-01-16 19:22:47 -07:00 |
|
|
kevinz000
|
14aaca8fa5
|
compile
|
2020-01-16 19:18:54 -07:00 |
|
|
Ghom
|
c1e9618757
|
Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs
Revert "shotgun pointblanking people actually throws them"
|
2020-01-16 23:18:37 +01:00 |
|
|
kevinz000
|
d110d7bae9
|
Merge pull request #10347 from deathride58/stambufferbuff
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2020-01-16 14:51:38 -07:00 |
|
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
|
r4d6
|
ce16c91b2f
|
Code changes
|
2020-01-16 14:08:14 -05:00 |
|
|
Ghom
|
ca13be3c92
|
Merge pull request #10456 from Putnam3145/arousal-bad
Removes arousal damage and replaces it with simpler systems
|
2020-01-16 13:30:31 +01:00 |
|
|
Artur
|
1f718df41a
|
Reverts crafting changes
|
2020-01-16 14:26:36 +02:00 |
|
|
Artur
|
c05ee11533
|
Fixes buggy interfaces for chemical stuff
|
2020-01-16 12:16:13 +02:00 |
|
|
Artur
|
3a132d0a25
|
Linter fixes
|
2020-01-16 11:45:46 +02:00 |
|
|
Artur
|
472d18403c
|
Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties
|
2020-01-16 11:38:09 +02:00 |
|
|
Artur
|
6e4829e971
|
Really works properly now
|
2020-01-16 11:33:05 +02:00 |
|
|
kevinz000
|
b22e1a1cb4
|
compile
|
2020-01-16 02:27:35 -07:00 |
|
|
kevinz000
|
1d184b8cad
|
s
|
2020-01-16 00:21:21 -07:00 |
|
|
kevinz000
|
350c5aa060
|
compile
|
2020-01-16 00:18:40 -07:00 |
|
|
kevinz000
|
26525b8fa7
|
s
|
2020-01-16 00:14:03 -07:00 |
|
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -07:00 |
|
|
Tupinambis
|
dd9e62c8bb
|
Sillycon law prevention clause removal.
|
2020-01-15 23:15:18 -06:00 |
|
|
kevinz000
|
88d6c1a166
|
OKFINE
|
2020-01-15 22:02:07 -07:00 |
|
|
kevinz000
|
327c1e04e0
|
s
|
2020-01-15 22:00:08 -07:00 |
|
|
r4d6
|
f98f033bb3
|
Fix linter
|
2020-01-15 23:57:13 -05:00 |
|
|
Putnam
|
de4e65c467
|
Savefile conversion for inesct
|
2020-01-15 20:13:09 -08:00 |
|
|
kevinz000
|
512b112154
|
happythink
|
2020-01-15 20:45:05 -07:00 |
|
|
kevinz000
|
ab0c1f3f59
|
oh it's a list
|
2020-01-15 19:36:20 -07:00 |
|
|
kevinz000
|
4f665930cc
|
a a
|
2020-01-15 19:32:38 -07:00 |
|
|
Ghom
|
7d9f4f9fe5
|
Merge pull request #10417 from kevinz000/nightshift_1
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
|
2020-01-16 03:21:49 +01:00 |
|
|
Ghom
|
70c1b0635a
|
early returns.
|
2020-01-16 03:14:39 +01:00 |
|
|
kevinz000
|
eca7eeace3
|
aa
|
2020-01-15 19:11:49 -07:00 |
|
|
kevinz000
|
45c92bcb6f
|
s
|
2020-01-15 19:07:47 -07:00 |
|
|
kevinz000
|
ded4d1bed6
|
compile
|
2020-01-15 18:58:26 -07:00 |
|
|
Ghommie
|
9c526d0348
|
riot foam dart design cost consistency.
|
2020-01-16 02:56:58 +01:00 |
|
|
kevinz000
|
02841f8e92
|
compile
|
2020-01-15 18:49:37 -07:00 |
|
|
kevinz000
|
b42de8d457
|
compile
|
2020-01-15 18:49:29 -07:00 |
|
|
r4d6
|
8bc8edb56f
|
Fixes
|
2020-01-15 20:46:28 -05:00 |
|
|
kevinz000
|
c710c332e4
|
compile
|
2020-01-15 18:37:09 -07:00 |
|
|
kevinz000
|
e8d8d32a33
|
ree
|
2020-01-15 18:34:16 -07:00 |
|
|
kevinz000
|
90be124730
|
Merge remote-tracking branch 'citadel/master' into map_network_helpers
|
2020-01-15 18:30:14 -07:00 |
|
|
kevinz000
|
2a4e2204c5
|
no definemania then..
|
2020-01-15 18:29:45 -07:00 |
|
|
kevinz000
|
8f7460ff96
|
definemania
|
2020-01-15 18:24:13 -07:00 |
|
|
kevinz000
|
c5b95ff5d0
|
Mapping helpers
|
2020-01-15 18:22:43 -07:00 |
|
|
kevinz000
|
554f23e790
|
aight bet
|
2020-01-15 18:04:05 -07:00 |
|
|
kevinz000
|
872628d9aa
|
Apply suggestions from code review
thank you gamer
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-15 18:02:23 -07:00 |
|
|
r4d6
|
755b0fac3c
|
Merge branch 'master' into Passive-Vents
|
2020-01-15 19:15:50 -05:00 |
|
|
r4d6
|
6045d818d8
|
Add passive vents
|
2020-01-15 19:12:13 -05:00 |
|