Artur
9dd9474164
Merge remote-tracking branch 'origin/master' into bloodsucker_death_lessspam
2020-08-02 11:12:18 +03: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
8b2163792a
Update necropolis_chests.dm
2020-08-01 21:05:23 -07:00
silicons
25d1fb761a
Merge remote-tracking branch 'citadel/master' into killer_queen
2020-08-01 20:51:38 -07:00
silicons
3fa35e4fa6
fix
2020-08-01 20:49:31 -07:00
silicons
20dea7e41f
fix
2020-08-01 20:45:49 -07:00
Dan-Neposh
6f2d4ac4df
makes clockwork guardians have no projectile deflection
2020-08-01 23:36:36 -04:00
timothyteakettle
d05c694ffe
trader tweaks
2020-08-02 01:57:46 +01: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
kappa-sama
e71c397e29
bye
2020-08-01 16:55:39 -04:00
b1tt3r1n0
58d1a066f2
hmm, would be busted considering price for ops.
2020-08-01 16:41:00 -04: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
CitadelStationBot
a2f6a7c207
Automatic changelog generation for PR #12979 [ci skip]
2020-08-01 00:16:53 -04: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
timothyteakettle
8d63714f3a
make tongue preference dna
2020-07-31 23:04:29 +01: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
silicons
1c2bc1b632
Update _song.dm
2020-07-31 00:24:48 -07:00
silicons
3a773809b6
Update guardian.dm
2020-07-31 00:22:46 -07: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
ba0c77a8bd
fix
2020-07-29 20:13:39 -07:00
silicons
b8522a2ae0
ok
2020-07-29 20:04:47 -07:00
silicons
f02bc4a572
Update toy.dm
2020-07-29 19:49:11 -07:00
