Commit Graph

41907 Commits

Author SHA1 Message Date
Fabian
1ca1ccfc36 unapologetic joy mask buff 2021-03-13 21:52:23 +01:00
Fabian
bb4459ef5e flushed pensive angry 2021-03-13 21:24:29 +01:00
Fabian
036ba24545 flooshed? 2021-03-13 20:17:01 +01:00
CitadelStationBot
a980c84958 Automatic changelog generation for PR #14310 [ci skip] 2021-03-12 20:40:05 -06:00
silicons
5a9fc99aba Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
2021-03-12 19:40:02 -07:00
CitadelStationBot
250f743d0c Automatic changelog generation for PR #14402 [ci skip] 2021-03-12 20:35:58 -06:00
silicons
2a6ccada97 Merge pull request #14402 from Hatterhat/limbgrowers
limb growers for pubby and delta
2021-03-12 19:35:56 -07:00
CitadelStationBot
6de000537a Automatic changelog generation for PR #14410 [ci skip] 2021-03-12 20:35:49 -06:00
silicons
9d48fba839 Merge pull request #14410 from Adelphon/hair
new hair/sprite fix
2021-03-12 19:35:47 -07:00
CitadelStationBot
a3b6e03a4f Automatic changelog generation for PR #14423 [ci skip] 2021-03-12 18:21:42 -06:00
Lin
907ac9fc8a Merge pull request #14423 from Putnam3145/mode-chaos
makes the chaos thing actually work (whoops)
2021-03-12 18:21:40 -06:00
Changelogs
8b2236f13a Automatic changelog compile [ci skip] 2021-03-13 00:14:22 +00:00
Putnam
49e1673047 how did i mess up a copypasta like this 2021-03-12 15:44:15 -08:00
Putnam
4fb560ea98 makes the chaos thing actually work (whoops) 2021-03-12 14:46:58 -08:00
CitadelStationBot
48ac19d8ee Automatic changelog generation for PR #14403 [ci skip] 2021-03-12 14:30:05 -06:00
Lin
9a16375e0b Merge pull request #14403 from Hatterhat/brped-desc
fixes the BRPED desc that has been quirky! for years
2021-03-12 14:30:02 -06:00
CitadelStationBot
1355bae0ed Automatic changelog generation for PR #14412 [ci skip] 2021-03-12 14:28:40 -06:00
Lin
48e01413c8 Merge pull request #14412 from Citadel-Station-13/silicons-patch-6
let's not have sentience potions able to sentience the paper wizard :)
2021-03-12 14:28:37 -06:00
Hatterhat
48de811919 fucking finally holy shit 2021-03-11 19:10:23 -06:00
Changelogs
dd2f68d337 Automatic changelog compile [ci skip] 2021-03-12 00:14:25 +00:00
silicons
753d79be69 Update boss.dm 2021-03-11 05:54:36 -07:00
Hatterhat
946096fd1d qm console announce 2021-03-10 22:35:33 -06:00
CitadelStationBot
35fd1b36cc Automatic changelog generation for PR #14392 [ci skip] 2021-03-10 18:34:50 -06:00
Lin
521570793f Merge pull request #14392 from R3dtail/patch-4
Readability/Grammar alteration
2021-03-10 18:34:47 -06:00
Changelogs
fb56be792e Automatic changelog compile [ci skip] 2021-03-11 00:14:32 +00:00
Adelphon
2477d94694 Update hair.dmi 2021-03-10 18:38:29 -05:00
Adelphon
56cccc2ca3 new hair 2021-03-10 18:14:07 -05:00
silicons
3292e3a725 Merge pull request #14393 from Auris456852/master
Corrects Hexacamphor
2021-03-10 14:02:35 -07:00
CitadelStationBot
71d93c4db4 Automatic changelog generation for PR #14376 [ci skip] 2021-03-10 15:02:14 -06:00
silicons
7e3d72eddb Merge pull request #14376 from Putnam3145/mode-chaos
Adds recent-chaos weighting for secret
2021-03-10 14:02:11 -07:00
silicons
cc6af1e8f1 Merge pull request #14401 from Hatterhat/tailfix
[@silicons wake up bro] eikobiko tail sprite but in the correct .dmi
2021-03-10 13:51:41 -07:00
Hatterhat
6a7d4e32d7 i'm gonna fight blackmajor over this 2021-03-10 13:55:00 -06:00
Hatterhat
2d157c51fa ok liberal 2021-03-10 09:09:50 -06:00
Hatterhat
2dc51f3a52 oops! all wrong .dmis! 2021-03-10 08:49:56 -06:00
CitadelStationBot
a4f4792500 Automatic changelog generation for PR #14306 [ci skip] 2021-03-10 02:32:55 -06:00
silicons
939a493334 Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
silicons
18fdd0c6cf Merge pull request #14337 from kiwedespars/we-hate-cqc
nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
CitadelStationBot
563b4a1d8f Automatic changelog generation for PR #14371 [ci skip] 2021-03-10 02:31:53 -06:00
silicons
03fbb256e4 Merge pull request #14371 from Sneakyrat6/matContainer
Material container fixes
2021-03-10 01:31:51 -07:00
Putnam
25b021a343 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos 2021-03-10 00:06:40 -08:00
Putnam
40dfd40bcd Made it not weight almost entirely based on chaos. 2021-03-10 00:04:35 -08:00
CitadelStationBot
f64fe21df3 Automatic changelog generation for PR #14380 [ci skip] 2021-03-10 00:27:03 -06:00
silicons
1946268783 Merge pull request #14380 from necromanceranne/augment_sprite_fixies
Fixes all the augmentation sprites so they actually are properly labelled and segmented
2021-03-09 23:27:00 -07:00
silicons
0db0612e56 Merge pull request #14383 from Literallynotpickles/no-more-triple-paramedic
Removes one paramedic slot
2021-03-09 23:26:53 -07:00
Putnam
0b109929c0 Adds recommended configs 2021-03-09 21:07:41 -08:00
Lin
1216a6edc5 Merge pull request #14381 from LetterN/patch-5
fixes drone inventory deleting stuff
2021-03-09 22:45:02 -06:00
silicons
007ed3e851 Merge pull request #14378 from necromanceranne/cyberlimbies
The augment manipulator can make printed prosthetics look like the roundstart choosable limbs
2021-03-09 21:41:24 -07:00
CitadelStationBot
e459938f78 Automatic changelog generation for PR #14379 [ci skip] 2021-03-09 22:39:43 -06:00
silicons
41b75c8eb9 Merge pull request #14379 from necromanceranne/too_many_limbs
Fixes being able to go over the defined limit of roundstart prosthetics
2021-03-09 21:39:41 -07:00
Changelogs
cc81a6d65e Automatic changelog compile [ci skip] 2021-03-10 00:14:05 +00:00