Commit Graph
44522 Commits
Author SHA1 Message Date
SandPoot 382473eb88 Thicc 2021-09-17 14:15:39 -03:00
SandPoot f61c505bbf Glued items too 2021-09-16 01:37:05 -03:00
SandPoot 456f68b32b Upload files 2021-09-16 01:05:28 -03:00
LinandGitHub d536d22100 Merge pull request #15109 from Citadel-Station-13/silicons-patch-11
fixes airlocks not unshocking themselves
2021-09-14 01:09:22 -05:00
LinandGitHub 4cdee473a4 Merge pull request #15132 from Citadel-Station-13/silicons-patch-17
[03:37:30] Runtime in recycler.dm, line 185: Cannot execute null.forceMove().
2021-09-14 01:08:15 -05:00
LinandGitHub d53820d9bf Merge pull request #15130 from Citadel-Station-13/when_why
[02:58:00] Runtime in atoms.dm, line 574: type mismatch: "catghost" &= 16777215
2021-09-14 01:08:06 -05:00
Changelogs bde0e54eb6 Automatic changelog compile [ci skip] 2021-09-14 00:26:53 +00:00
siliconsandGitHub 8bb364df0a fix (#15128) 2021-09-14 02:25:10 +02:00
siliconsandGitHub 4af82878dc Update uplink_ammo.dm (#15141) 2021-09-14 02:24:37 +02:00
siliconsandGitHub ac0fd70b0b Update misc_floor.dm (#15140) 2021-09-14 02:24:15 +02:00
siliconsandGitHub 6524e3d539 Update species.dm (#15126) 2021-09-14 02:23:52 +02:00
CitadelStationBot 6ce75c57d7 Automatic changelog generation for PR #15071 [ci skip] 2021-09-13 17:09:31 -05:00
siliconsandGitHub 85659a297f Merge pull request #15071 from Putnam3145/remove-bomb-research-cap
Remove arbitrary bomb research cap + tweak formula a little
2021-09-13 15:09:28 -07:00
CitadelStationBot 1fe1d2582e Automatic changelog generation for PR #15099 [ci skip] 2021-09-13 17:09:07 -05:00
siliconsandGitHub 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
siliconsandGitHub abbd3d7708 Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right
Mafia updates
2021-09-13 15:08:50 -07:00
siliconsandGitHub 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
Putnam3145andGitHub 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
siliconsandGitHub 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
siliconsandGitHub e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners
prisoners - aka ports prisoners from tg hell yeah
2021-09-12 20:59:12 -07:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub a0ad386b59 Merge pull request #15124 from zeroisthebiggay/why
adrenals are actually useful plus fixes all speedups
2021-09-12 20:57:58 -07:00
siliconsandGitHub fcac5fa3c0 Update recycler.dm 2021-09-12 20:40:25 -07:00
siliconsandGitHub 4c058114a6 Update login.dm 2021-09-12 20:37:03 -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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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 NandGitHub de4311e4d9 shut up 2021-09-11 12:50:06 +08:00