ec4f754416
Merge remote-tracking branch 'Upstream/master'
2021-04-20 02:59:03 -04:00
9b2e6732cd
Automatic changelog compile [ci skip]
2021-04-20 00:07:13 +00:00
edc10e5100
Automatic changelog generation for PR #14571 [ci skip]
2021-04-18 20:38:43 -05:00
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
b6be757827
Automatic changelog generation for PR #14631 [ci skip]
2021-04-18 20:13:26 -05:00
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
c872055821
Lowers demons weight
...
Bit too hjgh
2021-04-18 21:03:54 -04:00
eca9235441
Automatic changelog generation for PR #14582 [ci skip]
2021-04-18 20:02:55 -05:00
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
911d8ffc12
requested changes
2021-04-18 18:02:04 -07:00
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
848f1fc50d
Merge pull request #14578 from qweq12yt/louder-sm-delams
...
LOUDER DELAMS
2021-04-18 18:57:47 -06:00
25577396cf
Automatic changelog generation for PR #14546 [ci skip]
2021-04-18 19:53:16 -05:00
b41790842b
Merge pull request #14546 from Putnam3145/bluespace-pipe
...
Ports bluespace pipes from yogs
2021-04-18 18:53:14 -06:00
cc8fb68926
Automatic changelog generation for PR #14543 [ci skip]
2021-04-18 19:52:56 -05:00
0dcc6b44ba
Merge pull request #14543 from qweq12yt/cargo-bugfixes
...
Cargo bugfixes
2021-04-18 18:52:54 -06:00
1e0bef190d
Automatic changelog generation for PR #14625 [ci skip]
2021-04-18 19:52:31 -05:00
73d5b99b64
Merge pull request #14625 from Hatterhat/patch-4
...
solars plastitanium glass fix
2021-04-18 18:52:29 -06:00
257b94fe3b
Automatic changelog generation for PR #14624 [ci skip]
2021-04-18 19:51:36 -05:00
9c780f7672
Merge pull request #14624 from DrPainis/patch-9
...
adds ash drake meat
2021-04-18 18:51:34 -06:00
5ec71d5beb
Merge pull request #14621 from LetterN/patch-7
...
Easy area bflag editing
2021-04-18 18:51:24 -06:00
57da565e68
Automatic changelog generation for PR #14617 [ci skip]
2021-04-18 19:51:03 -05:00
757db58ef5
Merge pull request #14617 from keronshb/dragnetadjust
...
CONSITENCY: Matches Dragnet breakout time to Energy Bolas
2021-04-18 18:51:01 -06:00
11a130bac5
Automatic changelog generation for PR #14608 [ci skip]
2021-04-18 19:50:39 -05:00
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
bc7ff72188
Automatic changelog generation for PR #14613 [ci skip]
2021-04-18 19:50:30 -05:00
3b08587cf1
Merge pull request #14613 from HeroWithYay/Bottle
...
New Bottle Sprites
2021-04-18 18:50:28 -06:00
cd9ccb82d7
Merge pull request #14594 from DrPainis/patch-7
...
Makes insect blood not look like diarrhea.
2021-04-18 18:49:43 -06:00
85356e413b
Automatic changelog generation for PR #14603 [ci skip]
2021-04-18 19:49:31 -05:00
e8e625cb5c
Merge pull request #14603 from Putnam3145/fix-base-option
...
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
f6b2ec0215
Automatic changelog generation for PR #14591 [ci skip]
2021-04-18 19:48:10 -05:00
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
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
7e02a02d1e
Automatic changelog generation for PR #14584 [ci skip]
2021-04-18 19:47:43 -05:00
2e8d9f2ab7
Merge pull request #14584 from zeroisthebiggay/n
...
deletes box ghost burger
2021-04-18 18:47:41 -06:00
4e177df13d
Automatic changelog compile [ci skip]
2021-04-19 00:06:56 +00:00
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
52a4a5a042
nothing to see here folks
2021-04-18 08:29:51 -07:00
34e6a179ad
By popular request
2021-04-17 21:29:19 -04:00
3302d38829
Automatic changelog compile [ci skip]
2021-04-18 00:06:27 +00:00
9d4a9a6677
Update functions.dm
2021-04-17 16:22:13 -07:00
bb50a4f160
Update topic.dm
2021-04-17 16:21:33 -07:00
9208287e3d
Automatic changelog generation for PR #14606 [ci skip]
2021-04-17 18:00:51 -05:00
30fd90a87c
Merge pull request #14606 from SandPoot/cloning-machine-tgui
...
TGUIZES the cloning computer
2021-04-17 17:00:49 -06:00
aae60d0876
Automatic changelog generation for PR #14599 [ci skip]
2021-04-17 18:00:39 -05:00
6a181610a9
Merge pull request #14599 from BlueWildrose/revenantevil
...
Revenant changes port from TG - revenants no longer spend their current essence to unlock new abilities; a fix
2021-04-17 17:00:36 -06:00
4186b15a69
plastitanium glass OSC
2021-04-17 16:51:08 -05:00
1a651a6b65
Automatic changelog generation for PR #14622 [ci skip]
2021-04-17 16:07:07 -05:00
ab12adaf28
Merge pull request #14622 from DeltaFire15/heal-surgery-oops
...
Fixes organic repair surgeries showing for targets without any organic bodyparts
2021-04-17 16:07:05 -05:00
fa141ac259
Automatic changelog generation for PR #14616 [ci skip]
2021-04-17 16:00:54 -05:00
The0bserver