Commit Graph

34686 Commits

Author SHA1 Message Date
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
CitadelStationBot
07c7432f43 Automatic changelog generation for PR #12568 [ci skip] 2020-06-24 09:05:47 -05:00
Ghom
2b59621833 Merge pull request #12568 from Linzolle/chemmaster
fix analyze function on chem master
2020-06-24 16:05:43 +02:00
Linzolle
a0d45d49e4 recompile 2020-06-23 20:54:19 -05:00
Linzolle
15be6217bd Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into chemmaster 2020-06-23 20:49:12 -05:00
Changelogs
76841b79bc Automatic changelog compile [ci skip] 2020-06-24 00:08:20 +00:00
CitadelStationBot
4a955fde25 Automatic changelog generation for PR #12574 [ci skip] 2020-06-23 17:28:03 -05:00
Ghom
db7c3b1ee3 Merge pull request #12574 from DeltaFire15/random-item-whoopsie
Buying a 'random uplink item' can no longer force objective / class changes
2020-06-24 00:28:00 +02:00
CitadelStationBot
ac54e6e17b Automatic changelog generation for PR #12565 [ci skip] 2020-06-22 20:36:20 -05:00
Ghom
b69a31fef1 Merge pull request #12565 from timothyteakettle/some-small-fixes
two small fixes
2020-06-23 03:36:16 +02:00
Ghom
89fa7d6d2f Merge pull request #12577 from Citadel-Station-13/silicons-patch-1
removes snore spam
2020-06-23 03:29:01 +02:00
CitadelStationBot
3cac624f14 Automatic changelog generation for PR #12572 [ci skip] 2020-06-22 20:27:15 -05:00
Ghom
1ade833952 Merge pull request #12572 from DeltaFire15/no-free-nullcrates
Disables the stray syndicate crate event
2020-06-23 03:27:12 +02:00
CitadelStationBot
4c451d3e14 Automatic changelog generation for PR #12579 [ci skip] 2020-06-22 20:22:15 -05:00
Ghom
121ec32a2f Merge pull request #12579 from Detective-Google/aeugh
port tg#51713 (no more infinite singulo lattices on da ice)
2020-06-23 03:22:12 +02:00
CitadelStationBot
1033421fd2 Automatic changelog generation for PR #12583 [ci skip] 2020-06-22 20:20:49 -05:00
Ghom
c16381b570 Merge pull request #12583 from Detective-Google/eyepatch
fixes one of the icon states for the diagnostic hud eyepatch
2020-06-23 03:20:46 +02:00
Detective Google
09051189a3 fixes one of the icon states for the diagnostic hud eyepatch 2020-06-22 18:37:28 -05:00
Detective Google
472ed97b8c port tg#51713 2020-06-22 15:32:23 -05:00
silicons
78df740d19 Update debuffs.dm 2020-06-22 13:24:36 -07:00
Lin
a0a4007332 Merge pull request #12567 from Citadel-Station-13/kevinz000-patch-5
Slime color changing now has 65536 possible colors instead of 256
2020-06-21 19:37:54 -05:00
Changelogs
dc75f56378 Automatic changelog compile [ci skip] 2020-06-22 00:08:41 +00:00
CitadelStationBot
2920a89791 Automatic changelog generation for PR #12557 [ci skip] 2020-06-21 18:33:02 -05:00
Lin
2cd18f3dba Merge pull request #12557 from silicons/life
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
2020-06-21 18:32:58 -05:00
CitadelStationBot
80ec5b12f8 Automatic changelog generation for PR #12561 [ci skip] 2020-06-21 16:11:13 -05:00
silicons
99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
CitadelStationBot
94cfb4ba22 Automatic changelog generation for PR #12488 [ci skip] 2020-06-21 16:10:49 -05:00
silicons
8cd81ff89b Merge pull request #12488 from Ghommie/Ghommie-cit813
Porting Cargo small-order support, cargo goodies packs, beating vendors for loot/squish.
2020-06-21 14:10:45 -07:00
silicons
753fcbb84a Merge pull request #12556 from Detective-Google/bald-bald-bald-bald-bald-bald-bald
Ports the reworked snowcabin and beach away missions
2020-06-21 14:10:29 -07:00
Timothy Teakettle
983aac10a2 fixes it properly 2020-06-21 17:39:36 +01:00
DeltaFire
82d21e4824 smol fix 2020-06-21 03:44:12 +02:00
Changelogs
36c46c3c4c Automatic changelog compile [ci skip] 2020-06-21 00:08:22 +00:00
shellspeed1
06f0d42ee9 makes chem packs slightly cheaper 2020-06-20 16:53:39 -07:00
CitadelStationBot
33cae67acf Automatic changelog generation for PR #12558 [ci skip] 2020-06-20 18:44:21 -05:00
Lin
905d4ee74d Merge pull request #12558 from Citadel-Station-13/kevinz000-patch-4
Drastically buffs punch hit chance
2020-06-20 18:44:17 -05:00
DeltaFire
6cababd09b yeeah no more free random nullcrates 2020-06-21 01:30:39 +02:00
Detective Google
4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
Linzolle
1959b491fc unnecessary? 2020-06-19 22:53:55 -05:00
Linzolle
b873f244c9 finally 2020-06-19 22:46:31 -05:00
kevinz000
354cc7d0c7 Update jellypeople.dm 2020-06-19 19:31:38 -07:00
Changelogs
2e8a2fee66 Automatic changelog compile [ci skip] 2020-06-20 00:07:58 +00:00
Linzolle
e23569d470 compile 2020-06-19 18:42:19 -05:00
Linzolle
d023f67b1e add analysis screen check 2020-06-19 18:27:26 -05:00
Ghommie
48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000
6516e07bd8 Merge pull request #12566 from Ghommie/Ghommie-cit818
Fixing some runtimes issues and warnings bout rnd.
2020-06-19 14:22:40 -07:00
CitadelStationBot
d805ba3d9b Automatic changelog generation for PR #12414 [ci skip] 2020-06-19 16:09:13 -05:00
Ghom
e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
CitadelStationBot
ca7f452a7f Automatic changelog generation for PR #12542 [ci skip] 2020-06-19 16:07:26 -05:00
Ghom
dd009ada48 Merge pull request #12542 from bunny232/scrubber
Removes lewd events from the vent clog event
2020-06-19 23:07:23 +02:00