 Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
|
Artur
|
db36a90e35
|
Fixes.
|
2020-01-30 19:23:38 +01:00 |
|
|
Artur
|
d937ded07c
|
Fixes points
|
2020-01-30 18:54:39 +01:00 |
|
|
CitadelStationBot
|
55a0e4e55d
|
Automatic changelog generation for PR #9860 [ci skip]
|
2020-01-29 21:15:26 -06:00 |
|
|
kevinz000
|
e6e545b1f2
|
Merge pull request #9860 from Ghommie/Ghommie-cit374
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
|
2020-01-29 20:15:22 -07:00 |
|
|
CitadelStationBot
|
0316a15142
|
Automatic changelog generation for PR #10746 [ci skip]
|
2020-01-29 21:01:19 -06:00 |
|
|
Ghom
|
c96267eb06
|
Merge pull request #10746 from Citadel-Station-13/kevinz000-patch-9
CAPTURE THE FLAG NOW HAS CLAYMORES
|
2020-01-30 04:01:17 +01:00 |
|
|
Ghom
|
96e6e5903d
|
Merge pull request #10783 from r4d6/fix
AAAAAAH
|
2020-01-30 04:00:07 +01:00 |
|
|
r4d6
|
cd048ebd77
|
AAAAAAH
|
2020-01-29 21:50:55 -05:00 |
|
|
kevinz000
|
0e1c46150f
|
Merge pull request #10767 from KeRSedChaplain/gangnerf
Removes stim packs from gangs
|
2020-01-29 16:24:51 -07:00 |
|
|
CitadelStationBot
|
c1b60db699
|
Automatic changelog generation for PR #10749 [ci skip]
|
2020-01-29 17:19:40 -06:00 |
|
|
Ghom
|
f74475a6e0
|
Merge pull request #10749 from kevinz000/duke_moxley
It's high noon...
|
2020-01-30 00:19:37 +01:00 |
|
|
CitadelStationBot
|
27019974f8
|
Automatic changelog generation for PR #10773 [ci skip]
|
2020-01-29 16:51:04 -06:00 |
|
|
kevinz000
|
cff69db1c3
|
Merge pull request #10773 from Putnam3145/whoops-gaseous
Fixes to hypno toggle
|
2020-01-29 15:51:01 -07:00 |
|
|
Lin
|
cde6601c60
|
Merge pull request #10759 from Ghommie/Ghommie-cit534
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-29 19:58:26 +00:00 |
|
|
Lin
|
15f36fab60
|
Merge pull request #10763 from Citadel-Station-13/cosmosbedsheet
Adds cosmic bedsheet to loadout for donator
|
2020-01-29 19:43:01 +00:00 |
|
|
Lin
|
293e6576c8
|
Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
|
2020-01-29 19:25:13 +00:00 |
|
|
Ghom
|
319973f2eb
|
Merge pull request #10775 from r4d6/fix
Fix HE Manifold Sprites, for good. [Speedmerge please]
|
2020-01-29 19:01:57 +01:00 |
|
|
r4d6
|
c57dedd808
|
fix
|
2020-01-29 12:30:05 -05:00 |
|
|
Putnam
|
7626750c49
|
hypno tweaks
|
2020-01-28 23:03:29 -08:00 |
|
|
CitadelStationBot
|
6553aa634f
|
Automatic changelog generation for PR #10295 [ci skip]
|
2020-01-28 22:34:52 -06:00 |
|
|
Ghom
|
7839724013
|
Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
|
2020-01-29 05:34:49 +01:00 |
|
|
CitadelStationBot
|
cbd1fd2a67
|
Automatic changelog generation for PR #10761 [ci skip]
|
2020-01-28 22:31:21 -06:00 |
|
|
Ghom
|
dca1d8bcd3
|
Merge pull request #10761 from Putnam3145/fix-forced-gender
Makes gender change potion not work on people with pref
|
2020-01-29 05:31:18 +01:00 |
|
|
CitadelStationBot
|
31f24b8600
|
Automatic changelog generation for PR #10728 [ci skip]
|
2020-01-28 20:46:34 -06:00 |
|
|
Ghom
|
bf97c2da3e
|
Merge pull request #10728 from kevinz000/hugbox_meteor_time
Meteor waves are now directional (and tell you the direction on the ""1 minute""+ warning)
|
2020-01-29 03:46:32 +01:00 |
|
|
Ghom
|
44c141f009
|
Merge branch 'master' into hugbox_meteor_time
|
2020-01-29 02:28:12 +01:00 |
|
|
CitadelStationBot
|
754fb126f5
|
Automatic changelog generation for PR #10751 [ci skip]
|
2020-01-28 19:16:41 -06:00 |
|
|
Ghom
|
3671f58612
|
Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1
traitor+bro now have a minimum population of 25
|
2020-01-29 02:16:38 +01:00 |
|
|
CitadelStationBot
|
987e0e16e2
|
Automatic changelog generation for PR #10748 [ci skip]
|
2020-01-28 18:59:45 -06:00 |
|
|
Ghom
|
2643fd053b
|
Merge pull request #10748 from Trilbyspaceclone/door-
correct door to vault being all access
|
2020-01-29 01:59:42 +01:00 |
|
|
Ghom
|
cf3466252e
|
Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
[s] more reasonable reagent logging
|
2020-01-29 01:59:09 +01:00 |
|
|
kevinz000
|
d3343a1e26
|
Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2
Makes transfer_ckey() less pedant.
|
2020-01-28 17:59:00 -07:00 |
|
|
kevinz000
|
c5fdc24e73
|
Merge pull request #10696 from Citadel-Station-13/Ghommie-patch-1
Whops, I forgot that was a get_hearers_in_view()
|
2020-01-28 17:58:40 -07:00 |
|
|
kevinz000
|
b08503de70
|
Merge pull request #10699 from Putnam3145/no-newline-on-txts
Made .editorconfig not auto-newline on txts
|
2020-01-28 17:58:23 -07:00 |
|
|
kevinz000
|
3de59b75fa
|
Merge pull request #10678 from Ghommie/Ghommie-cit516
Stops the donor patriotic cape from being considered a bed sheet.
|
2020-01-28 17:58:07 -07:00 |
|
|
Putnam3145
|
6d6c101044
|
Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7
[s] botany logging
|
2020-01-28 16:57:50 -08:00 |
|
|
kevinz000
|
3bf0e1d5c4
|
Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
|
2020-01-28 17:57:26 -07:00 |
|
|
Putnam3145
|
a00d1fb05e
|
Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5
The meteor wave report time to impact is now accurate (tip you were getting 2-3 minute warnings all along)
|
2020-01-28 16:56:50 -08:00 |
|
|
kevinz000
|
3ed288dd14
|
Merge pull request #10750 from LetterN/patch-1
Updates README
|
2020-01-28 17:56:21 -07:00 |
|
|
CitadelStationBot
|
540e76d118
|
Automatic changelog generation for PR #10754 [ci skip]
|
2020-01-28 18:56:14 -06:00 |
|
|
kevinz000
|
96df844aa3
|
Merge pull request #10754 from MalricB/Virgomangood
Reunites Shaggy (hair from virgo) with Scooby Terrowin
|
2020-01-28 17:56:11 -07:00 |
|
|
CitadelStationBot
|
194d26b044
|
Automatic changelog generation for PR #10753 [ci skip]
|
2020-01-28 18:55:52 -06:00 |
|
|
kevinz000
|
70d4be0ea6
|
Merge pull request #10753 from Trilbyspaceclone/changlog_messing3
Updates changlog
|
2020-01-28 17:55:49 -07:00 |
|
|
kevinz000
|
3d3086ac23
|
Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3
An oversight with one of the new area helper procs.
|
2020-01-28 17:55:39 -07:00 |
|
|
kevinz000
|
9dfcef68ed
|
Merge branch 'master' into duke_moxley
|
2020-01-28 17:53:08 -07:00 |
|
|
TrilbySpaceClone
|
a3ce2b06f6
|
tada
|
2020-01-28 16:09:49 -05:00 |
|
|
TrilbySpaceClone
|
92e355267f
|
Revert "correct door to vault being all access"
This reverts commit f145dd1730.
|
2020-01-28 16:07:15 -05:00 |
|
|
KeRSe
|
9c18d4fdad
|
makes stimulants no longer purchasable by gangs
|
2020-01-28 15:53:29 -05:00 |
|
|
CitadelStationBot
|
94d1b7a035
|
Automatic changelog generation for PR #10414 [ci skip]
|
2020-01-28 11:12:33 -06:00 |
|