Commit Graph

44502 Commits

Author SHA1 Message Date
silicons
faed0eff01 Merge pull request #15099 from Hatterhat/tablets-gaming
tablets gaming - an NT IRN "buff"
2021-09-13 15:09:04 -07:00
CitadelStationBot
17b3c3db2a Automatic changelog generation for PR #15120 [ci skip] 2021-09-13 17:08:52 -05:00
silicons
abbd3d7708 Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right
Mafia updates
2021-09-13 15:08:50 -07:00
silicons
a1eaab5446 Merge pull request #15136 from Citadel-Station-13/revert-15112-fix-supermatter-cascade
Revert "Reworks supermatter gas output to be less cascade-y, more risky"
2021-09-13 12:02:50 -07:00
Putnam3145
99908e17c5 Revert "Reworks supermatter gas output to be less cascade-y, more risky" 2021-09-13 11:39:32 -07:00
CitadelStationBot
7a4d1042e6 Automatic changelog generation for PR #15062 [ci skip] 2021-09-12 23:10:53 -05:00
silicons
47568e50bf Merge pull request #15062 from zeroisthebiggay/patch-18
bread is no longer equipped on the head; instead you actually hold it in your mouth
2021-09-12 21:10:50 -07:00
CitadelStationBot
bb6f4b0c1d Automatic changelog generation for PR #15070 [ci skip] 2021-09-12 22:59:15 -05:00
silicons
e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners
prisoners - aka ports prisoners from tg hell yeah
2021-09-12 20:59:12 -07:00
silicons
4f0d5e8c9a Merge pull request #15112 from Putnam3145/fix-supermatter-cascade
Reworks supermatter gas output to be less cascade-y, more risky
2021-09-12 20:58:48 -07:00
CitadelStationBot
78657bb0de Automatic changelog generation for PR #15113 [ci skip] 2021-09-12 22:58:38 -05:00
silicons
3a5f6e1649 Merge pull request #15113 from keronshb/unhuboxsm
Stops the SM from blowing things up
2021-09-12 20:58:36 -07:00
CitadelStationBot
401159bbec Automatic changelog generation for PR #15123 [ci skip] 2021-09-12 22:58:11 -05:00
silicons
8d72664eef Merge pull request #15123 from keronshb/hitbyfix
Fixes a runtime with Hitby
2021-09-12 20:58:09 -07:00
CitadelStationBot
ff2a63c5fe Automatic changelog generation for PR #15124 [ci skip] 2021-09-12 22:58:00 -05:00
silicons
a0ad386b59 Merge pull request #15124 from zeroisthebiggay/why
adrenals are actually useful plus fixes all speedups
2021-09-12 20:57:58 -07:00
Changelogs
45895c52e6 Automatic changelog compile [ci skip] 2021-09-13 00:27:21 +00:00
Putnam3145
137a30a047 more nerfs lol 2021-09-12 15:04:42 -07:00
zerothebigboy
d41648b365 dumbasskevinz 2021-09-11 23:34:02 -04:00
zerothebigboy
223ba8d6c1 why 2021-09-11 23:20:01 -04:00
zerothebigboy
f077f374bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why 2021-09-11 23:04:48 -04:00
zerothebigboy
ba72e3d8f0 why 2021-09-11 23:04:21 -04:00
Changelogs
1bce3461ec Automatic changelog compile [ci skip] 2021-09-12 00:27:13 +00:00
keronshb
4cb198fe05 Fixes Hitby runtime 2021-09-11 17:38:32 -04:00
keronshb
32675f611a Merge remote-tracking branch 'upstream/master' 2021-09-11 14:16:14 -04:00
Putnam3145
083704e29d lowered max oxy mult, made temp not matter 2021-09-11 11:03:15 -07:00
Putnam3145
3965ad9dae yeah that's just too much gas sorry 2021-09-11 10:25:39 -07:00
CitadelStationBot
0e944f5363 Automatic changelog generation for PR #15102 [ci skip] 2021-09-11 00:17:27 -05:00
silicons
149d149dff Merge pull request #15102 from timothyteakettle/icecream
allows custom taste text and color on the custom ice cream setting in the ice cream vat
2021-09-10 22:17:25 -07:00
CitadelStationBot
8152d84f94 Automatic changelog generation for PR #15122 [ci skip] 2021-09-11 00:17:10 -05:00
silicons
6b17f53118 Merge pull request #15122 from LetterN/patch-10
possibly fixes arc blasting loud sfx
2021-09-10 22:17:08 -07:00
CitadelStationBot
368bc3e45b Automatic changelog generation for PR #15121 [ci skip] 2021-09-11 00:17:02 -05:00
silicons
9ccb105e98 Merge pull request #15121 from LetterN/WHO-BROKE-THIS-THEME-REEEEEE
fixes cwc tgui theme
2021-09-10 22:16:59 -07:00
Letter N
de4311e4d9 shut up 2021-09-11 12:50:06 +08:00
LetterN
1d53bf2094 i forgot 2021-09-11 12:39:32 +08:00
LetterN
791da1b9b4 mafia update. 2021-09-11 11:38:15 +08:00
silicons
237fdb9893 Merge pull request #15118 from Putnam3145/another-auxmos-fix
Another auxmos fix
2021-09-10 18:17:01 -07:00
Putnam3145
9b83dc94bb Another auxmos fix 2021-09-10 18:00:39 -07:00
Changelogs
ad95f4cb56 Automatic changelog compile [ci skip] 2021-09-11 00:25:09 +00:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
CitadelStationBot
eae147f6a3 Automatic changelog generation for PR #15063 [ci skip] 2021-09-10 02:16:57 -05:00
silicons
fd785c6abf Merge pull request #15063 from zeroisthebiggay/intern
ports various tg armor resprites and some such
2021-09-10 00:16:54 -07:00
CitadelStationBot
8c845134fb Automatic changelog generation for PR #15097 [ci skip] 2021-09-10 02:16:28 -05:00
silicons
4836f222d0 Merge pull request #15097 from LetterN/generic-housekeeping-pr
Generic syncs
2021-09-10 00:16:25 -07:00
keronshb
5587cc91cd Other fix 2021-09-09 21:56:58 -04:00
Lin
4883a93da1 Merge pull request #15092 from lolman360/patch-1
allows autohydro trays to be manually filled
2021-09-09 20:21:40 -05:00
Lin
9efb28c208 Merge pull request #15107 from Citadel-Station-13/silicons-patch-8
makes techweb error nodes stack trace
2021-09-09 20:08:48 -05:00
Lin
a1a6414777 Merge pull request #15096 from Citadel-Station-13/movespeed
Tweaks reagent speedups and taser slowdowns and fixes stabilzied light pink for those xenobio people
2021-09-09 20:08:35 -05:00
Lin
43faf70d6a Merge pull request #15088 from Citadel-Station-13/silicons-patch-4
how did no one notice ephedrine (see: every painkiller speedup buff which uses the same system) was broken until i abused it and got to be the beta tester?
2021-09-09 20:08:22 -05:00
CitadelStationBot
1e30ed46dc Automatic changelog generation for PR #15103 [ci skip] 2021-09-09 19:59:50 -05:00