Commit Graph

331 Commits

Author SHA1 Message Date
kevinz000
313956002b Merge pull request #9269 from Thalpy/FermiGrenades
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Thalpy
f50e84a20c Merge branch 'master' into NeuroFix 2019-09-11 16:24:00 +01:00
Fermi
4f0afb6e45 50 to 100 2019-09-10 21:36:49 +01:00
Fermi
0a4090d83c Fixes weird message 2019-09-10 21:12:43 +01:00
Fermi
033057d380 OOPS 2019-09-08 02:55:40 +01:00
Fermi
77eef5de6f Heat plays a component now. 2019-08-30 20:42:22 +01:00
Fermi
124d8503dc Tests and fixes. 2019-08-29 00:12:16 +01:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Fermi
5a9b2bcad7 Added COORD 2019-08-12 05:10:46 +01:00
Fermi
ae1191a469 Changes an oversight (and a unintended wah!) 2019-08-12 05:10:05 +01:00
Fermi
75440a48c5 30 might be too much 2019-08-12 01:36:46 +01:00
Fermi
10ca106f06 [TO TEST] Adds nuance to hatmium and SDGF explosions. 2019-08-12 01:36:21 +01:00
Fermi
251ac24e02 [NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction. 2019-08-11 00:35:36 +01:00
Fermi
9d3aa1f3b0 Removing a comment block I missed. 2019-08-08 18:28:47 +01:00
Fermi
99e95dcedf Guess who forgot message admins 2019-08-07 18:57:38 +01:00
Fermi
b4208860d8 Spelling and a few more logs. 2019-08-07 17:45:40 +01:00
Fermi
a8e2311caf Bloomin' indents! 2019-08-07 14:53:20 +01:00
Fermi
7391581a26 2 small fixes. 2019-08-07 11:33:53 +01:00
Fermi
f4c5e6fd2f Attempts to deal with the potential future problem of people stunlocking 2019-08-06 16:43:55 +01:00
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master
YARR
2019-08-06 16:08:16 +01:00
CameronWoof
d09fa0d8a0 fix for smoke and odysseus exploits 2019-08-05 07:48:27 -07:00
Fermi
40d6dc1812 Oops. 2019-08-04 14:54:40 +01:00
Fermi
1f73e6eb1d Notice me!! 2019-08-01 03:48:35 +01:00
Fermi
3f75a42ff2 Guess who staged before compiling? 2019-08-01 03:46:30 +01:00
Fermi
88e6fa4703 Yamero! 2019-08-01 03:42:57 +01:00
Fermi
18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
Fermi
a9330b784a Reward those who try. 2019-07-30 23:16:05 +01:00
Fermi
5e5f2fea54 Heck 2019-07-29 00:05:26 +01:00
Fermi
d472177a4c A casual cough. 2019-07-28 23:59:33 +01:00
Fermi
4c01b7ad57 Maybe Oxy so people don't kill themselves. 2019-07-28 23:56:30 +01:00
Fermi
b6e2122d8d Fixes, but good. 2019-07-28 23:55:25 +01:00
Fermi
31709938c6 Pushing a buncha stuff so I can fix things. 2019-07-28 23:23:45 +01:00
Thalpy
123c9199ba Added Eigenlockers. I love them. 2019-07-25 20:51:09 +01:00
Fermi
d73fabffff . 2019-07-19 05:18:56 +01:00
Fermi
fbf542134a Cidadel makes me want to hurt myself. 2019-07-19 05:18:35 +01:00
Fermi
a5fcb918aa Astrogen tweaks and cat fixes. 2019-07-19 04:11:26 +01:00
Fermi
69725a902b Tweak 2019-07-17 01:10:36 +01:00
Fermi
f343ea24db Ugh fine 2019-07-16 02:06:17 +01:00
Fermi
ff41020b6f aaaa No I like it like this.... 2019-07-15 23:34:55 +01:00
Fermi
bb17af0f30 Better limit it a lil. 2019-07-15 23:30:29 +01:00
Fermi
f08e34cde6 Sigh. 2019-07-15 22:13:34 +01:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Thalpy
f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01:00
Fermi
7161870c8b Astral Tweak. 2019-07-14 04:06:06 +01:00
Fermi
8d12d0f017 I am very smart 2019-07-13 20:02:53 +01:00
Fermi
6c9f37790b Fixing bugs from merge conflicts. 2019-07-13 20:02:27 +01:00
Fermi
6a5d5fe494 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-13 19:18:46 +01:00
Fermi
f2076ba276 Weird pushing error. 2019-07-13 19:18:42 +01:00
Fermi
110f0cbb83 Fixes and making a message clearer so people don't think it's admins. 2019-07-13 19:17:19 +01:00