Commit Graph

41713 Commits

Author SHA1 Message Date
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
Letter N
889802a376 a 2021-03-03 14:16:36 +08:00
Letter N
4b62633fd8 a 2021-03-03 14:11:38 +08:00
Changelogs
d8196613da Automatic changelog compile [ci skip] 2021-03-03 00:14:17 +00:00
CitadelStationBot
041961a110 Automatic changelog generation for PR #14344 [ci skip] 2021-03-02 17:57:28 -06:00
silicons
824f346763 Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix
[FIX] More pacifism bug squashing
2021-03-02 16:57:26 -07:00
Lin
195d05b051 Merge pull request #14343 from Hatterhat/thanks-jay
no more nt chokers society has progressed past the need for nt chokers
2021-03-02 15:09:39 -06:00
Letter N
6514f4034c a 2021-03-02 12:57:26 +08:00
Letter N
364381937f fix+disallows admins rigging votes 2021-03-02 10:18:30 +08:00
Letter N
1fdb7fd639 cleanup 2021-03-02 09:49:49 +08:00
CitadelStationBot
0d7b25dec6 Automatic changelog generation for PR #14324 [ci skip] 2021-03-01 19:42:30 -06:00
silicons
1d8533c1cd Merge pull request #14324 from dzahlus/ash-drake-transform-powergaming
Changes to ash drake transformation
2021-03-01 18:42:28 -07:00
dzahlus
ca1fe9d6c0 Update shapeshift.dm
for keb
2021-03-02 02:40:23 +01:00
CitadelStationBot
482e8c63e8 Automatic changelog generation for PR #14290 [ci skip] 2021-03-01 19:35:39 -06:00
silicons
b5bb90ecf8 Merge pull request #14290 from SandPoot/properlegioninheritance
Legions pass their type to the mob they infect
2021-03-01 18:35:37 -07:00
silicons
7af3c986ad Merge pull request #14328 from R3dtail/patch-3
Makes Clownification Less Abysmal :honk:
2021-03-01 18:32:29 -07:00
CitadelStationBot
253c8c4fde Automatic changelog generation for PR #14342 [ci skip] 2021-03-01 19:31:28 -06:00
silicons
6c6ebb3002 Merge pull request #14342 from MarinaGryphon/patch-1
Fixes #14341
2021-03-01 18:31:25 -07:00
CitadelStationBot
159dd3988c Automatic changelog generation for PR #14295 [ci skip] 2021-03-01 19:30:30 -06:00
silicons
dea79157dd Merge pull request #14295 from Putnam3145/fusion
Removes open-air fusion completely.
2021-03-01 18:30:27 -07:00
CitadelStationBot
4fa63bebe9 Automatic changelog generation for PR #14307 [ci skip] 2021-03-01 19:27:54 -06:00
silicons
3d417167c6 Merge pull request #14307 from Putnam3145/supermatter-events
Adds a new event: supermatter surge
2021-03-01 18:27:51 -07:00
CitadelStationBot
0cb75319d0 Automatic changelog generation for PR #14320 [ci skip] 2021-03-01 19:27:09 -06:00
silicons
0612451aef Merge pull request #14320 from Putnam3145/valentine-removal
Removes auto-matchmaking from valentine's event
2021-03-01 18:27:07 -07:00
CitadelStationBot
a25f9f068c Automatic changelog generation for PR #14322 [ci skip] 2021-03-01 19:27:00 -06:00
silicons
6f91da89d7 Merge pull request #14322 from Putnam3145/pai-policy
Adds a pAI policy config
2021-03-01 18:26:57 -07:00
CitadelStationBot
95b5044217 Automatic changelog generation for PR #14327 [ci skip] 2021-03-01 19:26:18 -06:00
silicons
c23db5daee Merge pull request #14327 from qweq12yt/pacifist-zombo-fix
fixes pacifist zombies
2021-03-01 18:26:16 -07:00
Changelogs
e9508df89d Automatic changelog compile [ci skip] 2021-03-02 00:11:54 +00:00
dzahlus
f206213603 60 second cooldown instead of 3 minutes 2021-03-01 22:16:23 +01:00
Lin
8919a8bb99 Merge pull request #14338 from Citadel-Station-13/silicons-patch-1
fixes florarevolution runtime when hitting hydrotrays
2021-03-01 14:15:31 -06:00
Letter N
09ce499146 aeiou 2021-03-01 21:55:34 +08:00
CitadelStationBot
88dfc6cf03 Automatic changelog generation for PR #14331 [ci skip] 2021-02-28 23:50:01 -06:00
silicons
3303a66e25 Merge pull request #14331 from LetterN/fix-gearpainter
Fixes gearpainter del operation
2021-02-28 22:49:58 -07:00
CitadelStationBot
7f72cb530a Automatic changelog generation for PR #14334 [ci skip] 2021-02-28 23:49:32 -06:00
silicons
25a9f80c36 Merge pull request #14334 from SandPoot/this-proc-can't-be-split
Cannot modify null.real_name
2021-02-28 22:49:30 -07:00
silicons
638b6d05ac Merge pull request #14333 from Detective-Google/hamburger
departmental-ish turtlenecks
2021-02-28 22:49:09 -07:00
Hatterhat
28833b67b8 you guys are not gonna fucking believe this 2021-02-28 21:09:41 -06:00
qweq12yt
2bfe99c2be fixes kinetic accelerator reload() proc 2021-02-28 23:27:52 -03:00
MarinaGryphon
cc0f79f772 Fixes #14341 2021-02-28 19:05:10 -06:00
Changelogs
8700b98a71 Automatic changelog compile [ci skip] 2021-03-01 00:15:08 +00:00
qweq12yt
d3aeb714f1 flamethrowers now can't be used by pacifists 2021-02-28 20:21:19 -03:00
CitadelStationBot
d8b1878fea Automatic changelog generation for PR #14340 [ci skip] 2021-02-28 03:23:03 -06:00
silicons
ed93343e7c Merge pull request #14340 from Vynzill/jungleagony
Jungle Gateway Quickfix
2021-02-28 02:23:01 -07:00
CitadelStationBot
d22856c6a5 Automatic changelog generation for PR #14293 [ci skip] 2021-02-28 02:26:58 -06:00
silicons
e36f148014 Merge pull request #14293 from SmArtKar/tcg_gaming
[READY] TCG fixes
2021-02-28 01:26:56 -07:00
silicons
2bcf05ee22 Update hydroponics.dm 2021-02-28 01:23:37 -07:00
Vynzill
60011f339d Jungle Gateway Quickfix
haha, whoops! forgot I left a cursed rice hat in front of gate during my testing
2021-02-28 00:33:10 -06:00
Letter N
573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
Changelogs
59ba3155e0 Automatic changelog compile [ci skip] 2021-02-28 00:14:48 +00:00