Commit Graph

42628 Commits

Author SHA1 Message Date
CitadelStationBot
71915b8767 Automatic changelog generation for PR #14573 [ci skip] 2021-04-21 14:50:50 -05:00
silicons
75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
2021-04-21 13:50:46 -06:00
Changelogs
00db1679fc Automatic changelog compile [ci skip] 2021-04-21 00:06:45 +00:00
CitadelStationBot
8cb23baa92 Automatic changelog generation for PR #14443 [ci skip] 2021-04-20 06:53:02 -05:00
silicons
f0c2188c5f Merge pull request #14443 from necromanceranne/baton_change_pr
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
2021-04-20 05:52:59 -06:00
Changelogs
9b2e6732cd Automatic changelog compile [ci skip] 2021-04-20 00:07:13 +00:00
CitadelStationBot
edc10e5100 Automatic changelog generation for PR #14571 [ci skip] 2021-04-18 20:38:43 -05:00
silicons
821511e64e Merge pull request #14571 from BlueWildrose/piracyisillegal
Space pirate sleepers can now be crowbared to be destroyed
2021-04-18 19:38:41 -06:00
CitadelStationBot
b6be757827 Automatic changelog generation for PR #14631 [ci skip] 2021-04-18 20:13:26 -05:00
silicons
cb87f798c3 Merge pull request #14631 from keronshb/slaughtereventlower
Kev please don't kill me for a one number change but this lowers Slaughter Demon Weight
2021-04-18 19:13:24 -06:00
keronshb
c872055821 Lowers demons weight
Bit too hjgh
2021-04-18 21:03:54 -04:00
CitadelStationBot
eca9235441 Automatic changelog generation for PR #14582 [ci skip] 2021-04-18 20:02:55 -05:00
silicons
74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
2021-04-18 19:02:53 -06:00
BlueWildrose
911d8ffc12 requested changes 2021-04-18 18:02:04 -07:00
silicons
af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
2021-04-18 19:00:14 -06:00
silicons
848f1fc50d Merge pull request #14578 from qweq12yt/louder-sm-delams
LOUDER DELAMS
2021-04-18 18:57:47 -06:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
CitadelStationBot
25577396cf Automatic changelog generation for PR #14546 [ci skip] 2021-04-18 19:53:16 -05:00
silicons
b41790842b Merge pull request #14546 from Putnam3145/bluespace-pipe
Ports bluespace pipes from yogs
2021-04-18 18:53:14 -06:00
CitadelStationBot
cc8fb68926 Automatic changelog generation for PR #14543 [ci skip] 2021-04-18 19:52:56 -05:00
silicons
0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes
Cargo bugfixes
2021-04-18 18:52:54 -06:00
CitadelStationBot
1e0bef190d Automatic changelog generation for PR #14625 [ci skip] 2021-04-18 19:52:31 -05:00
silicons
73d5b99b64 Merge pull request #14625 from Hatterhat/patch-4
solars plastitanium glass fix
2021-04-18 18:52:29 -06:00
CitadelStationBot
257b94fe3b Automatic changelog generation for PR #14624 [ci skip] 2021-04-18 19:51:36 -05:00
silicons
9c780f7672 Merge pull request #14624 from DrPainis/patch-9
adds ash drake meat
2021-04-18 18:51:34 -06:00
silicons
5ec71d5beb Merge pull request #14621 from LetterN/patch-7
Easy area bflag editing
2021-04-18 18:51:24 -06:00
CitadelStationBot
57da565e68 Automatic changelog generation for PR #14617 [ci skip] 2021-04-18 19:51:03 -05:00
silicons
757db58ef5 Merge pull request #14617 from keronshb/dragnetadjust
CONSITENCY: Matches Dragnet breakout time to Energy Bolas
2021-04-18 18:51:01 -06:00
CitadelStationBot
11a130bac5 Automatic changelog generation for PR #14608 [ci skip] 2021-04-18 19:50:39 -05:00
silicons
9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
2021-04-18 18:50:37 -06:00
CitadelStationBot
bc7ff72188 Automatic changelog generation for PR #14613 [ci skip] 2021-04-18 19:50:30 -05:00
silicons
3b08587cf1 Merge pull request #14613 from HeroWithYay/Bottle
New Bottle Sprites
2021-04-18 18:50:28 -06:00
silicons
cd9ccb82d7 Merge pull request #14594 from DrPainis/patch-7
Makes insect blood not look like diarrhea.
2021-04-18 18:49:43 -06:00
CitadelStationBot
85356e413b Automatic changelog generation for PR #14603 [ci skip] 2021-04-18 19:49:31 -05:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
CitadelStationBot
f6b2ec0215 Automatic changelog generation for PR #14591 [ci skip] 2021-04-18 19:48:10 -05:00
silicons
02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles
ports deathrattle implants but without mob statchange because i am not gonna port that today
2021-04-18 18:48:08 -06:00
silicons
791f2bb746 Merge pull request #14592 from zeroisthebiggay/patch-8
ports "Allow Revenants to read deadchat" from TG
2021-04-18 18:48:01 -06:00
CitadelStationBot
7e02a02d1e Automatic changelog generation for PR #14584 [ci skip] 2021-04-18 19:47:43 -05:00
silicons
2e8d9f2ab7 Merge pull request #14584 from zeroisthebiggay/n
deletes box ghost burger
2021-04-18 18:47:41 -06:00
Changelogs
4e177df13d Automatic changelog compile [ci skip] 2021-04-19 00:06:56 +00:00
Lin
8f578552ea Merge pull request #14626 from Citadel-Station-13/losing_my_shit
(i swear this is not due to anyone in particular unironically) fixes heretic not being on jobban panel because every other coder was too busy to for 6 months
2021-04-18 17:51:16 +00:00
silicons
52a4a5a042 nothing to see here folks 2021-04-18 08:29:51 -07:00
The0bserver
34e6a179ad By popular request 2021-04-17 21:29:19 -04:00
Changelogs
3302d38829 Automatic changelog compile [ci skip] 2021-04-18 00:06:27 +00:00
silicons
9d4a9a6677 Update functions.dm 2021-04-17 16:22:13 -07:00
silicons
bb50a4f160 Update topic.dm 2021-04-17 16:21:33 -07:00
CitadelStationBot
9208287e3d Automatic changelog generation for PR #14606 [ci skip] 2021-04-17 18:00:51 -05:00
silicons
30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui
TGUIZES the cloning computer
2021-04-17 17:00:49 -06:00
CitadelStationBot
aae60d0876 Automatic changelog generation for PR #14599 [ci skip] 2021-04-17 18:00:39 -05:00