silicons
|
61061dc25a
|
Merge pull request #14280 from timothyteakettle/banning-panel-fix
prioritises mobs with clients in the banning panel
|
2021-02-21 19:04:53 -07:00 |
|
Jay
|
73be04412b
|
Donator Item - Metal Mask
|
2021-02-21 19:57:43 -06:00 |
|
Changelogs
|
4c55c78912
|
Automatic changelog compile [ci skip]
|
2021-02-22 00:13:57 +00:00 |
|
kappa-sama
|
81fdb96968
|
small moment
|
2021-02-21 17:50:23 -05:00 |
|
CitadelStationBot
|
3d482b328b
|
Automatic changelog generation for PR #14264 [ci skip]
|
2021-02-21 15:56:28 -06:00 |
|
silicons
|
f581d8c8e0
|
Merge pull request #14264 from dzahlus/pain-emote-updates
Pain emote is now added to getting wounded! As well as more pain sounds
|
2021-02-21 14:56:26 -07:00 |
|
silicons
|
4ba9df18de
|
Merge pull request #14279 from Adelphon/boon
bugfix
|
2021-02-21 14:53:39 -07:00 |
|
CitadelStationBot
|
d6f723d60e
|
Automatic changelog generation for PR #14235 [ci skip]
|
2021-02-21 15:52:59 -06:00 |
|
silicons
|
f1392307d9
|
Merge pull request #14235 from Vynzill/junglechanges
Jungle gateway nerf and touch ups: ape edition
|
2021-02-21 14:52:57 -07:00 |
|
CitadelStationBot
|
098c9fdd5b
|
Automatic changelog generation for PR #14269 [ci skip]
|
2021-02-21 15:50:34 -06:00 |
|
silicons
|
ae63422727
|
Merge pull request #14269 from Putnam3145/aphro-readd
More arousal logging; adds back aphro/nympho
|
2021-02-21 14:50:32 -07:00 |
|
CitadelStationBot
|
7c007197e7
|
Automatic changelog generation for PR #14229 [ci skip]
|
2021-02-21 15:48:55 -06:00 |
|
CitadelStationBot
|
01e68733e1
|
Automatic changelog generation for PR #14265 [ci skip]
|
2021-02-21 15:48:53 -06:00 |
|
silicons
|
841bb2aac2
|
Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
|
2021-02-21 14:48:50 -07:00 |
|
Hatterhat
|
1eb2d3dd93
|
buhhh lingfist nerf
|
2021-02-21 02:58:19 -06:00 |
|
silicons
|
1585afa1ef
|
Update jacqueen.dm
|
2021-02-20 20:55:31 -07:00 |
|
Letter N
|
7c0a63f729
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-21 09:57:22 +08:00 |
|
Letter N
|
0bb5ec3316
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-21 09:55:36 +08:00 |
|
kiwedespars
|
6a694841aa
|
i forgot this thing
microstagger is now a stagger
|
2021-02-20 17:46:06 -08:00 |
|
kiwedespars
|
15a8d1d5e0
|
i did a thing
- reverted salt nerf
- made it so you can't parry while resting
|
2021-02-20 17:24:30 -08:00 |
|
timothyteakettle
|
69e9a94829
|
prioritise clients
|
2021-02-21 00:18:25 +00:00 |
|
Changelogs
|
bcffa931b9
|
Automatic changelog compile [ci skip]
|
2021-02-21 00:14:18 +00:00 |
|
Adelphon
|
f795d007a9
|
bugfix
|
2021-02-20 18:18:27 -05:00 |
|
Putnam
|
a26f850f1c
|
don't push before thinking, kids
|
2021-02-20 07:41:37 -08:00 |
|
Putnam
|
d6350b2e75
|
undergarment logging too
|
2021-02-20 07:41:11 -08:00 |
|
Putnam
|
c24c339718
|
Fixed a runtime might cause issues.
This might also break logging completely, which, why. This isn't a high-priority log, though, so.
|
2021-02-20 07:36:46 -08:00 |
|
CitadelStationBot
|
0768e693c4
|
Automatic changelog generation for PR #14258 [ci skip]
|
2021-02-20 04:02:26 -06:00 |
|
silicons
|
293404f728
|
Merge pull request #14258 from IronEleven/IronEleven-patch-1
Raises Space Vine Population Requirement
|
2021-02-20 03:02:24 -07:00 |
|
CitadelStationBot
|
6eedbdf984
|
Automatic changelog generation for PR #14260 [ci skip]
|
2021-02-20 04:02:18 -06:00 |
|
silicons
|
c70b9bb58d
|
Merge pull request #14260 from timothyteakettle/undeleted-query
fixes the 'undeleted query' message at the start of every shift
|
2021-02-20 03:02:15 -07:00 |
|
CitadelStationBot
|
30926fcfee
|
Automatic changelog generation for PR #14263 [ci skip]
|
2021-02-20 04:02:09 -06:00 |
|
silicons
|
ecad553fe2
|
Merge pull request #14263 from Hatterhat/metabreak-b-gon
the one where i make anomaly announcements and brand intelligence always announce
|
2021-02-20 03:02:06 -07:00 |
|
silicons
|
e36794d0f5
|
Merge pull request #14271 from shellspeed1/revert-14248-trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs
Revert "Fix for floorbots not placing a plate before placing a floor."
|
2021-02-20 02:59:16 -07:00 |
|
CitadelStationBot
|
fa3bb2a08b
|
Automatic changelog generation for PR #14272 [ci skip]
|
2021-02-20 03:58:22 -06:00 |
|
silicons
|
7fdcacdf19
|
Merge pull request #14272 from MrJWhit/random-port
Port of "removes unnecessary %"
|
2021-02-20 02:58:19 -07:00 |
|
CitadelStationBot
|
ea94617d76
|
Automatic changelog generation for PR #14273 [ci skip]
|
2021-02-20 03:58:08 -06:00 |
|
silicons
|
cabc471d92
|
Merge pull request #14273 from timothyteakettle/chaplain-vampire
chaplain vampires won't burn in their own chapel now
|
2021-02-20 02:58:06 -07:00 |
|
Changelogs
|
b7d40558e9
|
Automatic changelog compile [ci skip]
|
2021-02-20 00:13:42 +00:00 |
|
Timothy Teakettle
|
7c00a9723d
|
Revert "test"
This reverts commit 7b8b16dc22.
|
2021-02-19 23:09:57 +00:00 |
|
Timothy Teakettle
|
7b8b16dc22
|
test
|
2021-02-19 22:19:00 +00:00 |
|
CitadelStationBot
|
22cd71a189
|
Automatic changelog generation for PR #14261 [ci skip]
|
2021-02-19 14:37:12 -06:00 |
|
silicons
|
030f8ad681
|
Merge pull request #14261 from SmArtKar/tcg_qol
[READY] Small QoL changes to TCG
|
2021-02-19 13:37:10 -07:00 |
|
Timothy Teakettle
|
9528cc9ce4
|
woops i left that in
|
2021-02-19 19:36:19 +00:00 |
|
Timothy Teakettle
|
94ad05b2bc
|
better idea
|
2021-02-19 17:14:36 +00:00 |
|
Timothy Teakettle
|
9de5e5f5fa
|
Update vampire.dm
|
2021-02-19 17:07:41 +00:00 |
|
MrJWhit
|
ea47ab1610
|
Update seed_extractor.dm
|
2021-02-19 10:00:43 -05:00 |
|
shellspeed1
|
f17be50d5f
|
Revert "Fix for floorbots not placing a plate before placing a floor."
|
2021-02-18 23:28:10 -08:00 |
|
Letter N
|
6abad913ff
|
the sqel
|
2021-02-19 14:52:18 +08:00 |
|
Putnam
|
257cd6bb34
|
keyword argument funnies, whoops comma
|
2021-02-18 21:55:28 -08:00 |
|
Lin
|
d2f9237ecd
|
Merge pull request #14237 from Citadel-Station-13/silicons-patch-11
adds sanity checks to heretic blade shatters
|
2021-02-18 23:51:23 -06:00 |
|