Commit Graph

18740 Commits

Author SHA1 Message Date
DrPainis
7d6cb67c91 literally just changes one letter (#14634) 2021-04-24 21:40:41 +02:00
Lin
0c5d19ecc8 Merge pull request #14633 from Citadel-Station-13/silicons-patch-24
fixes a slightly important thing
2021-04-22 18:28:35 +00: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
silicons
8510542260 Update autobunker.dm 2021-04-20 04:55:00 -07: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
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
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
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
silicons
b41790842b Merge pull request #14546 from Putnam3145/bluespace-pipe
Ports bluespace pipes from yogs
2021-04-18 18:53:14 -06:00
silicons
0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes
Cargo bugfixes
2021-04-18 18:52:54 -06:00
silicons
9c780f7672 Merge pull request #14624 from DrPainis/patch-9
adds ash drake meat
2021-04-18 18:51:34 -06: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
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06: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
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
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
silicons
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
DrPainis
ec67182421 makes drakes drop meat 2021-04-17 02:58:22 -04:00
DrPainis
a329188f95 moves list_reagents back to where it was
fuck
2021-04-17 02:56:46 -04:00
DrPainis
ea585233a2 makes goliath meat have reagents again
sorry, I lost my brain cells for a second
2021-04-17 02:56:06 -04:00
DrPainis
c69233c731 adds ash drake meat
yes, it's unnecessary
no, I don't care
let me eat drakes
2021-04-17 02:52:21 -04:00
DeltaFire
d4d9fef82c oop 2021-04-16 16:06:34 +02:00
Lin
f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff
Pirate related fixes and communication console fixes
2021-04-14 21:39:06 -05:00
The0bserver
6be351ecb6 I will try this. 2021-04-14 01:48:18 -04:00
The0bserver
f16c6931e2 Fixes, removes the functionality after confering. 2021-04-13 23:50:11 -04:00
The0bserver
27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver
bcbccd864f I'm going monkey 2021-04-13 19:46:07 -04:00
The0bserver
2046ca2eb2 a test 2021-04-13 19:42:07 -04:00
The0bserver
2e65dbf07f Mandrill Maze 2021-04-13 18:45:01 -04:00
The0bserver
4b888fe715 Emag Crate 2021-04-13 18:28:58 -04:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
Hatterhat
32bbbecc39 pirate payoff minimum from 20k to 1k (#14581)
* removes 20k minimum on pirate payoff

* Update pirates.dm
2021-04-13 15:13:53 +02:00
Blue Wildrose
8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
The0bserver
b1fd4a33a2 funny gold sound 2021-04-11 20:30:10 -04:00
The0bserver
c390b5b6e4 a fix for a fox 2021-04-11 20:27:48 -04:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
Lin
3fc5dc5d36 Merge pull request #14267 from Citadel-Station-13/silicons-patch-15
allows all non queen/empress SIMPLE MOB xenos to spawn from gold cores
2021-04-11 13:54:52 -05:00
The0bserver
9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver
ee961ce417 PLEASE LET ME RELOAD I BEG YOU 2021-04-11 06:18:56 -04:00
The0bserver
4d27b91745 Maybe now you will reload. 2021-04-11 05:59:46 -04:00
The0bserver
bdaf0987e4 im going insane 2021-04-11 05:31:23 -04:00
The0bserver
1569709d53 Soundfix 2021-04-11 04:43:35 -04:00
The0bserver
e75088420d Error fixing. 2021-04-11 04:38:46 -04:00