d79cc5f85d
oof
2020-08-04 20:57:37 -07:00
0a137d2584
whew
2020-08-04 20:52:35 -07:00
6618435ee4
Automatic changelog generation for PR #12912 [ci skip]
2020-08-02 01:12:52 -05:00
f45329bfd7
Merge pull request #12912 from Linzolle/penlight
...
uv penlight icon
2020-08-01 23:12:49 -07:00
2ef7e1bf0a
Automatic changelog generation for PR #12999 [ci skip]
2020-08-01 23:05:54 -05:00
65d184c552
Merge pull request #12999 from KeRSedChaplain/guardianfix
...
Removes clockwork guardian's projectile deflection. OOPS!
2020-08-01 21:05:52 -07:00
6f2d4ac4df
makes clockwork guardians have no projectile deflection
2020-08-01 23:36:36 -04:00
a8a1284541
Automatic changelog generation for PR #12983 [ci skip]
2020-08-01 19:45:45 -05:00
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
8e021892ca
Automatic changelog compile [ci skip]
2020-08-02 00:11:56 +00:00
b9f8af2779
Automatic changelog generation for PR #12993 [ci skip]
2020-08-01 15:31:36 -05:00
7e0e60c126
Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis
...
Toyslabfixfortravis
2020-08-01 13:31:33 -07:00
44e6b6ccc7
I removed the Dread_Ipad, Clockwork Slab reigns supreme
2020-08-01 16:18:25 -04:00
0d7572b777
Automatic changelog generation for PR #12976 [ci skip]
2020-08-01 05:35:49 -05:00
e8ec73ba7d
Merge pull request #12976 from Hatterhat/durathread-kits
...
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07:00
d83db599c2
Automatic changelog generation for PR #12980 [ci skip]
2020-08-01 05:35:02 -05:00
d2d598dcfe
Merge pull request #12980 from dapnee/What-if-I-keep-fixing-maps
...
Map Edits Three: The Mappening
2020-08-01 03:34:59 -07:00
3a7c6121bb
Automatic changelog generation for PR #12970 [ci skip]
2020-08-01 05:34:21 -05:00
128225ca6f
Merge pull request #12970 from kappa-sama/patch-35
...
salt pr
2020-08-01 03:34:17 -07:00
0dbc52230f
Automatic changelog generation for PR #12965 [ci skip]
2020-08-01 05:33:46 -05:00
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
66534fd5b6
Automatic changelog generation for PR #12947 [ci skip]
2020-08-01 05:29:19 -05:00
8dfa3fcce8
Merge pull request #12947 from Seris02/podpersonfix
...
replica pod fix bounty
2020-08-01 03:29:16 -07:00
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
71783cf760
Merge pull request #12 from Citadel-Station-13/master
...
updating my branch pog
2020-08-01 04:23:22 -04:00
26a44997e8
Automatic changelog generation for PR #12975 [ci skip]
2020-08-01 02:51:21 -05:00
974fd83e45
Merge pull request #12975 from MrJWhit/abductor-spawntext
...
Changes to abductors spawntext
2020-08-01 00:51:18 -07:00
78deda2a9a
Automatic changelog generation for PR #12742 [ci skip]
2020-08-01 02:17:14 -05:00
320c91f4d3
Merge pull request #12742 from KeRSedChaplain/clockcultrework
...
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
11a0154ec1
changes Neovgre's sounds again
2020-08-01 01:26:35 -04:00
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
7a0dff1f77
fixes the invisible slabs and buffs a couple scripture casting times
2020-07-31 23:03:59 -04:00
3ac679f08b
Automatic changelog generation for PR #12979 [ci skip]
2020-07-31 21:45:17 -05:00
bc254eb31a
Merge pull request #12979 from Auris456852/master
...
Adds roboticist cartridge to the PDA vendor
2020-07-31 19:45:15 -07:00
d9a6069122
Automatic changelog generation for PR #12966 [ci skip]
2020-07-31 21:44:42 -05:00
053e18247b
Merge pull request #12966 from ike709/master
...
CentCom Galactic Ban DB
2020-07-31 19:44:40 -07:00
dc70f390bb
Turns out I was the one screaming all along
2020-07-31 21:40:08 -04:00
aa605ec007
Changes the death sound for Ratvar to have more oomph behind it
2020-07-31 21:02:12 -04:00
be0740a2e7
Automatic changelog compile [ci skip]
2020-08-01 00:11:48 +00:00
f8de31695c
Automatic changelog generation for PR #12988 [ci skip]
2020-07-31 17:48:50 -05:00
b437383e55
Merge pull request #12988 from Citadel-Station-13/silicons-patch-65
...
so it turns out mob burning checked for no oxygen instead of yes oxygen due to some other pr so you can only die of being on fire if you're in space in a hardsuit
2020-07-31 17:48:47 -05:00
e17e1c3a11
conforms to same as everything else
2020-07-31 22:45:03 +01:00
d1edbab264
Update life.dm
2020-07-31 14:39:40 -07:00
dfa26309d1
copypaste moment
2020-07-31 17:07:47 -04:00
159d5c1896
Merge pull request #12985 from Citadel-Station-13/silicons-patch-64
...
okay so no-clickdelay telekinetic sharp-object-throwing is not okay.
2020-07-31 14:27:14 -05:00
c7100d6e66
Automatic changelog generation for PR #12962 [ci skip]
2020-07-31 14:25:59 -05:00
0f07c8fca6
Merge pull request #12962 from dapnee/morechangestokilo
...
Another Pass Over Kilo
2020-07-31 14:25:56 -05:00
82170264f5
Automatic changelog generation for PR #12952 [ci skip]
2020-07-31 14:24:51 -05:00
39bd5e74a4
Merge pull request #12952 from dapnee/hahabox
...
Minor Fixes to Box
2020-07-31 14:24:48 -05:00
80c11fe998
Automatic changelog generation for PR #12967 [ci skip]
2020-07-31 14:22:15 -05:00
silicons