Commit Graph

41644 Commits

Author SHA1 Message Date
Putnam3145
2156a1566d Merge pull request #14294 from DeltaFire15/maroon-broke
Once again fixes objective generation
2021-02-24 03:37:24 -08:00
silicons
504a36f50d Update holy_weapons.dm 2021-02-24 01:36:03 -07:00
silicons
fd497b3297 Update traits.dm 2021-02-24 01:23:06 -07:00
silicons
94cc70f7b9 Update traits.dm 2021-02-24 01:21:00 -07:00
DeltaFire
60708b03df check 2021-02-24 05:16:15 +01:00
R3dtail
8400a664e8 Enables Novel Posting 2021-02-23 22:00:49 -06:00
Changelogs
afbc8edd35 Automatic changelog compile [ci skip] 2021-02-24 00:13:51 +00:00
kappa-sama
a55d492d9d reading moment 2021-02-23 18:58:18 -05:00
keronshb
04764600bb Unlocks Sentient disease abilities
Let's the Sentient Disease start with stuff to unlock.
2021-02-23 16:25:18 -05:00
CitadelStationBot
86235abef6 Automatic changelog generation for PR #14299 [ci skip] 2021-02-23 13:52:44 -06:00
silicons
fcb9efcbdf Merge pull request #14299 from SandPoot/nerf-crowbar
Fixes all crowbars openning powered airlocks
2021-02-23 12:52:42 -07:00
SandPoot
6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
keronshb
6798e6266b Merge remote-tracking branch 'upstream/master' 2021-02-23 14:39:05 -05:00
CitadelStationBot
9f3b30acea Automatic changelog generation for PR #14268 [ci skip] 2021-02-23 06:01:30 -06:00
DeltaFire
b214d70383 Merge pull request #14268 from Citadel-Station-13/silicons-patch-16
alternatively, replaces the cube sentinel spawn with an actual simplemob sentinel that drops a carbon sentinel body on death so you still get to run this to the ground without being able to be a literal alien queen
2021-02-23 13:01:27 +01:00
DeltaFire
cc8c75539e sigh 2021-02-23 12:50:33 +01:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Changelogs
d1475285b3 Automatic changelog compile [ci skip] 2021-02-23 00:13:36 +00:00
CitadelStationBot
0eaa93dc6a Automatic changelog generation for PR #14253 [ci skip] 2021-02-22 14:10:24 -06:00
silicons
178fe9cf55 Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
2021-02-22 13:10:21 -07:00
keronshb
eb3299e969 Removes Dragon Tooth
Why bother
2021-02-22 13:54:53 -05:00
Lin
150689c84a Merge pull request #14282 from Citadel-Station-13/silicons-patch-17
>put "spawn a new copy of this" in the garbage collection logic of a mob >that seems like it'll cause problems, huh.
2021-02-22 11:18:12 -06:00
Lin
5517678780 Merge pull request #14286 from Citadel-Station-13/metalmaskDonator
Donator Item - Metal Mask
2021-02-22 11:15:37 -06:00
Lin
4b886f4e08 Merge pull request #14291 from timothyteakettle/why-
[s] sanitize your damn inputs
2021-02-22 11:11:44 -06:00
Timothy Teakettle
5c2f5cf8a7 Update charter.dm 2021-02-22 17:07:10 +00:00
CitadelStationBot
d7b20d27c2 Automatic changelog generation for PR #14280 [ci skip] 2021-02-21 20:04:56 -06:00
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
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