Commit Graph

29177 Commits

Author SHA1 Message Date
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
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
CitadelStationBot
94d1b7a035 Automatic changelog generation for PR #10414 [ci skip] 2020-01-28 11:12:33 -06:00
Ghom
fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi
The Great Citadel De-Pissening of 2020
2020-01-28 18:12:30 +01:00
CitadelStationBot
678c0f0ff5 Automatic changelog generation for PR #10752 [ci skip] 2020-01-28 11:09:03 -06:00
Ghom
fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass
6 More Crates
2020-01-28 18:08:58 +01:00
CitadelStationBot
6b0dc5d438 Automatic changelog generation for PR #10590 [ci skip] 2020-01-28 10:58:47 -06:00
Ghom
7ff01ac152 Merge pull request #10590 from KathrinBailey/Kat'sBoxRework
Fixes bugs in BoxStation; turns on docking beacons on Box; fixes roundstart atmos differences.
2020-01-28 17:58:44 +01:00
CitadelStationBot
f6d79e8846 Automatic changelog generation for PR #10765 [ci skip] 2020-01-28 05:01:36 -06:00
Putnam3145
8e0a674845 Merge pull request #10765 from Citadel-Station-13/kevinz000-patch-15
skittish sanity checks aka "Kev, this isn't a powergamer trait" they said, and now look where we are at?
2020-01-28 03:01:33 -08:00
kevinz000
a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
CitadelStationBot
8bae366652 Automatic changelog generation for PR #10764 [ci skip] 2020-01-28 00:38:08 -06:00
kevinz000
b903c110d9 Merge pull request #10764 from deathride58/antinyoom
fixes spacemen going at lightspeed on local/testing servers
2020-01-27 23:38:05 -07:00
deathride58
74d0fe2770 fixes spacemen going at lightspeed on local/testing servers 2020-01-28 00:18:54 -05:00
Jay
7171b661d1 Adds cosmic bedsheet to loadout for donator 2020-01-27 22:15:00 -06:00
Putnam
cfd65d812a Makes gender change potion not work on people with pref 2020-01-27 19:13:50 -08:00
CitadelStationBot
bef55b54b0 Automatic changelog generation for PR #10709 [ci skip] 2020-01-27 21:06:04 -06:00
Ghom
2bf27e84e6 Merge pull request #10709 from Seris02/mammaltoxin
Adds mammal mutation toxin to green slime extract recipes
2020-01-28 04:06:01 +01:00