Commit Graph

15797 Commits

Author SHA1 Message Date
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Letter N
b30607b759 ayys update - ordering shit 2020-08-03 21:37:11 +08:00
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
silicons
d5a19ea4b2 Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
Lin
2885b861f2 Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
2020-08-02 12:52:07 -05:00
silicons
06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
zerothebigboy
aa782f1105 a 2020-08-02 02:27:24 -04:00
zerothebigboy
34a8d8f798 a 2020-08-02 01:38:23 -04:00
silicons
65d184c552 Merge pull request #12999 from KeRSedChaplain/guardianfix
Removes clockwork guardian's projectile deflection. OOPS!
2020-08-01 21:05:52 -07:00
silicons
25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00
Dan-Neposh
6f2d4ac4df makes clockwork guardians have no projectile deflection 2020-08-01 23:36:36 -04:00
Lin
d107d2ec49 Merge pull request #12983 from Citadel-Station-13/silicons-patch-63
fixes nukeops timer being from server start instead of roundstart which gives them 5 free minutes am i salty maybe just a little (no i'm not but we should fix this anyways)
2020-08-01 19:45:42 -05:00
silicons
128225ca6f Merge pull request #12970 from kappa-sama/patch-35
salt pr
2020-08-01 03:34:17 -07:00
silicons
2230a3665a Merge pull request #12965 from timothyteakettle/end-our-suffering
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
silicons
8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix
replica pod fix bounty
2020-08-01 03:29:16 -07:00
silicons
30d82d66d1 Merge pull request #12939 from Sishen1542/iaa-iaa
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
silicons
974fd83e45 Merge pull request #12975 from MrJWhit/abductor-spawntext
Changes to abductors spawntext
2020-08-01 00:51:18 -07:00
silicons
320c91f4d3 Merge pull request #12742 from KeRSedChaplain/clockcultrework
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
Dan-Neposh
9e36d65a05 HAHAHAHA NOTHING TO SEE HERE
THIS VARIABLE HAS ALWAYS BEEN THERE WHAT DO YOU MEAN HAHAHAHAHA
2020-08-01 00:00:41 -04:00
Dan-Neposh
7a0dff1f77 fixes the invisible slabs and buffs a couple scripture casting times 2020-07-31 23:03:59 -04:00
silicons
bc254eb31a Merge pull request #12979 from Auris456852/master
Adds roboticist cartridge to the PDA vendor
2020-07-31 19:45:15 -07:00
silicons
053e18247b Merge pull request #12966 from ike709/master
CentCom Galactic Ban DB
2020-07-31 19:44:40 -07:00
Dan-Neposh
aa605ec007 Changes the death sound for Ratvar to have more oomph behind it 2020-07-31 21:02:12 -04:00
silicons
d1edbab264 Update life.dm 2020-07-31 14:39:40 -07:00
kappa-sama
dfa26309d1 copypaste moment 2020-07-31 17:07:47 -04:00
Lin
b9848dbaee Merge pull request #12967 from Citadel-Station-13/silicons-patch-50
you need two hands free to fire the foam force crossbow! (no, you shouldn't.)
2020-07-31 14:22:11 -05:00
Lin
16fb4b3291 Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot
monkeys stop bleeding nonstop
2020-07-31 14:21:57 -05:00
Artur
9020e59aa0 kevinz fix 2020-07-31 04:32:46 +03:00
silicons
6b87f5c87a Update syndicate.dm 2020-07-30 17:29:36 -07:00
silicons
c178e53e2a Update syndicate.dm 2020-07-30 17:25:39 -07:00
Artur
2e3922d08e Merge remote-tracking branch 'origin/master' into bloodsucker_life 2020-07-31 02:07:14 +03:00
Artur
b22ffd6b6e Makes it properly work 2020-07-31 02:07:03 +03:00
Auris456852
03cff55017 Adds roboticist cartridge to the PDA vendor. 2020-07-30 23:31:31 +03:00
MrJWhit
2a23f88438 Whoopsie 2020-07-30 12:44:44 -04:00
MrJWhit
249cb136ef Reworks abducotr spawn text 2020-07-30 12:38:30 -04:00
Letter N
e40470f553 h. Updates NTOS, and axes p2p filetransfer! 2020-07-30 20:54:13 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
894ea242b4 asset cache update. may fuck shit up 2020-07-30 14:28:01 +08:00
Letter N
782e3c2ffb copypaste phase complete, major:vendies 2020-07-30 14:17:35 +08:00
Letter N
10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
Letter N
0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
kappa-sama
6356084fe9 this 2020-07-29 23:36:27 -04:00
silicons
f02bc4a572 Update toy.dm 2020-07-29 19:49:11 -07:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
timothyteakettle
caaedce6e2 end our suffering 2020-07-30 02:33:39 +01:00
timothyteakettle
55be55ce0f Revert "end our suffering"
This reverts commit 4e1fcc4e08.
2020-07-30 02:29:13 +01:00
timothyteakettle
4e1fcc4e08 end our suffering 2020-07-30 02:28:53 +01:00
timothyteakettle
940fe8240d monkey blood fix 2020-07-30 01:57:09 +01:00
silicons
c60e595d99 Merge pull request #12955 from Arturlang/bloodsucker_life
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00