 CitadelStationBot
|
32c496f70e
|
Automatic changelog generation for PR #10570 [ci skip]
|
2020-01-17 15:34:40 -06:00 |
|
|
Ghom
|
34872f6969
|
Merge pull request #10570 from kevinz000/map_network_helpers
Power cable + atmos pipe auto mapping helpers
|
2020-01-17 22:34:38 +01:00 |
|
|
kevinz000
|
3c2e6a959d
|
whitespace renormalize
|
2020-01-17 14:25:29 -07:00 |
|
|
CitadelStationBot
|
7c3d671eb1
|
Automatic changelog generation for PR #10569 [ci skip]
|
2020-01-17 15:24:15 -06:00 |
|
|
kevinz000
|
05e2b6a441
|
Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
|
2020-01-17 14:24:13 -07:00 |
|
|
CitadelStationBot
|
541a9cf9e7
|
Automatic changelog generation for PR #10375 [ci skip]
|
2020-01-17 10:36:45 -06:00 |
|
|
Ghom
|
72a83f05b5
|
Merge pull request #10375 from r4d6/radsuit
Add a Radiation Hardsuit
|
2020-01-17 17:36:43 +01:00 |
|
|
CitadelStationBot
|
1a604e6d9e
|
Automatic changelog generation for PR #10584 [ci skip]
|
2020-01-17 10:16:39 -06:00 |
|
|
Ghom
|
eaca04a1c2
|
Merge pull request #10584 from AffectedArc07/patch-1
Hotfix for CI line endings
|
2020-01-17 17:16:36 +01:00 |
|
|
AffectedArc07
|
835500980b
|
Hotfix for CI line endings
|
2020-01-17 16:00:15 +00:00 |
|
|
CitadelStationBot
|
7c77e30a2e
|
Automatic changelog generation for PR #10582 [ci skip]
|
2020-01-17 07:44:07 -06:00 |
|
|
Ghom
|
e7b925e779
|
Merge pull request #10582 from Putnam3145/more_flavor
Made temp flavor "more" pop up with actual temp flavor
|
2020-01-17 14:44:04 +01: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 |
|
|
CitadelStationBot
|
1860d553e4
|
Automatic changelog generation for PR #10347 [ci skip]
|
2020-01-16 15:51:40 -06: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
|
4dc85dd4ef
|
the compile file for this
|
2020-01-16 16:28:11 -05:00 |
|
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
|
CitadelStationBot
|
1108de8c37
|
Automatic changelog generation for PR #10456 [ci skip]
|
2020-01-16 06:30:34 -06: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 |
|
|
kevinz000
|
88d6c1a166
|
OKFINE
|
2020-01-15 22:02:07 -07:00 |
|
|
kevinz000
|
327c1e04e0
|
s
|
2020-01-15 22:00:08 -07:00 |
|
|
Putnam
|
fa0080d8d6
|
made climax with partner require EXPLICIT consent
|
2020-01-15 20:55:39 -08:00 |
|
|
Putnam
|
253a3a44ba
|
moved "aphro" magic string to a define
|
2020-01-15 20:15:40 -08:00 |
|
|
Putnam
|
a1922a459e
|
Moved Arousal tab stuff to IC tab
|
2020-01-15 20:14:23 -08: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
|
925dc0185e
|
dme
|
2020-01-15 19:36:56 -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 |
|
|
CitadelStationBot
|
04f4cf5c36
|
Automatic changelog generation for PR #10417 [ci skip]
|
2020-01-15 20:21:51 -06: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
|
b42de8d457
|
compile
|
2020-01-15 18:49:29 -07:00 |
|
|
kevinz000
|
c710c332e4
|
compile
|
2020-01-15 18:37:09 -07:00 |
|
|
kevinz000
|
e8d8d32a33
|
ree
|
2020-01-15 18:34:16 -07:00 |
|
|
kevinz000
|
6c2c9008c0
|
more dmemania
|
2020-01-15 18:30:48 -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 |
|
|
Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
|
r4d6
|
f7791c3db7
|
Hopefully help travis
|
2020-01-15 17:27:09 -05:00 |
|
|
r4d6
|
85e71c4d60
|
fix conflicts.
|
2020-01-15 17:18:18 -05:00 |
|
|
r4d6
|
e685c3fc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
|
2020-01-15 17:15:21 -05:00 |
|
|
CitadelStationBot
|
b21b3fee3c
|
Automatic changelog generation for PR #10567 [ci skip]
|
2020-01-15 14:42:30 -06:00 |
|
|
Lin
|
7bad8d00ad
|
Merge pull request #10567 from Ghommie/Ghommie-cot506
[s] more efficient supply reagents export.
|
2020-01-15 20:42:27 +00:00 |
|
|
Ghommie
|
4b090f938c
|
ok
|
2020-01-15 20:51:36 +01:00 |
|
|
CitadelStationBot
|
0b66a01d4a
|
Automatic changelog generation for PR #10563 [ci skip]
|
2020-01-15 08:51:18 -06:00 |
|