Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
Thalpy
|
a58766c885
|
Fixed explosions not occuring when temps were high enough.
|
2019-05-29 21:11:21 +01:00 |
|
Thalpy
|
71eb285472
|
Few tweaks and fixes to last commits.
|
2019-05-29 20:04:52 +01:00 |
|
Thalpy
|
45149ffc11
|
Beaker resistance check moved.
|
2019-05-29 18:29:56 +01:00 |
|
Fermi
|
ae35366e97
|
Some fixes before bed.
|
2019-05-29 05:41:12 +01:00 |
|
Fermi
|
7129969606
|
Some comments didn't delete properly.
|
2019-05-29 04:02:04 +01:00 |
|
Fermi
|
67860a9fff
|
Removed Kev File, sorry Kev.
|
2019-05-29 03:49:51 +01:00 |
|
Fermi
|
42513fda9b
|
Pre extra file culling.
|
2019-05-29 03:49:14 +01:00 |
|
Fermi
|
8282819c84
|
CHECK PLASMA THOUGH!
|
2019-05-28 05:03:58 +01:00 |
|
Ghommie
|
cc334b9a57
|
honestly if they don't wear a gas mask, they do deserve the stunlock...
But ok.
|
2019-05-28 00:43:54 +02:00 |
|
Ghommie
|
b5c4a44f01
|
pepper spray & teargas de-dunked.
|
2019-05-28 00:30:55 +02:00 |
|
Fermi
|
79a7b6b45b
|
Fixes.
|
2019-05-27 20:25:57 +01:00 |
|
Fermi
|
4607a2b6c3
|
Compile safe. Today's fixes.
|
2019-05-27 05:39:52 +01:00 |
|
Fermi
|
4cb697d2ec
|
Final changes before checks.
|
2019-05-26 17:37:20 +01:00 |
|
Fermi
|
bd85095590
|
Prebed tweaks
|
2019-05-26 05:34:28 +01:00 |
|
Fermi
|
91f10442cf
|
Merge branch 'pr/12'
|
2019-05-26 02:05:48 +01:00 |
|
Fermi
|
a0073295e1
|
Updating from Cit, pre PR.
|
2019-05-26 01:49:58 +01:00 |
|
Fermi
|
e3d3f30ea9
|
Could this be the final commit?!
|
2019-05-25 16:12:46 +01:00 |
|
Fermi
|
e2c1eb1d7c
|
prebed fixes
|
2019-05-25 05:27:28 +01:00 |
|
Fermi
|
faf6585b69
|
Winding down to the final commits.
|
2019-05-25 01:04:00 +01:00 |
|
Fermi
|
05aaeb4d70
|
Current state
|
2019-05-24 06:06:25 +01:00 |
|
Fermi
|
b1c11071de
|
Fixed acid to water and funbits.
|
2019-05-24 01:50:33 +01:00 |
|
Fermi
|
2f7a4082ab
|
woooah.
|
2019-05-23 23:09:32 +01:00 |
|
Fermi
|
a480ccb9fa
|
Changes
|
2019-05-23 05:26:38 +01:00 |
|
Fermi
|
f932fadfc6
|
Blood commit.
|
2019-05-22 18:46:46 +01:00 |
|
Fermi
|
7cb7f5de73
|
Update of master required.
|
2019-05-22 16:50:53 +01:00 |
|
Fermi
|
485def8d28
|
More fixed upon the last!
|
2019-05-21 22:06:55 +01:00 |
|
Fermi
|
ac3f0c790e
|
Fixed compling errors from last time.
|
2019-05-21 20:28:40 +01:00 |
|
Fermi
|
be4f188589
|
FermiChem? More like, FermiFixes!
|
2019-05-21 20:08:46 +01:00 |
|
deathride58
|
4a17f192e8
|
Merge pull request #8201 from Citadel-Station-13/kevinz000-patch-19
Changes OD thresholds to match RP server and only trigger when you /exceed/ it per definition of threshold
|
2019-05-21 08:05:54 -04:00 |
|
Fermi
|
71088eace9
|
More fixes
|
2019-05-21 05:05:32 +01:00 |
|
Fermi
|
a9bc75fc0e
|
why do I even bother
|
2019-05-21 02:53:17 +01:00 |
|
Fermi
|
bb4aecbd5f
|
Progressional fixes
|
2019-05-20 07:44:39 +01:00 |
|
Fermi
|
a6ede9fecc
|
Endless fixes
|
2019-05-19 23:32:30 +01:00 |
|
Fermi
|
072a4ce6a6
|
Sleepy fixes
|
2019-05-19 04:20:34 +01:00 |
|
Fermi
|
8130a10d3a
|
Gosh darn fixes
|
2019-05-19 03:39:26 +01:00 |
|
Fermi
|
791d021d50
|
Even more fixes.
|
2019-05-19 01:37:20 +01:00 |
|
Fermi
|
a837eda98b
|
More fixes.
|
2019-05-18 22:50:20 +01:00 |
|
Fermi
|
0700e0c080
|
Near completion - missing Neko's pH paper and reaction vars.
|
2019-05-18 03:02:14 +01:00 |
|
Fermi
|
2f75f861ce
|
Explode proc set up
|
2019-05-18 01:19:04 +01:00 |
|
Fermi
|
cabf490134
|
Fixed compiling errors for Neko.
|
2019-05-17 16:57:42 +01:00 |
|
Fermi
|
fa5531285a
|
Push for Neko, probably doesn't compile atm.
|
2019-05-17 16:23:34 +01:00 |
|
deathride58
|
276a6e9896
|
Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49
buff sleepy pens to quickly drain stamina after 10 seconds
|
2019-05-17 00:54:17 -04:00 |
|
Fermi
|
538c6e98ac
|
On-mob_life proc doesn't work for some reason. Fix it/badger helpers.
|
2019-05-16 01:26:46 +01:00 |
|
Fermi
|
246a344fed
|
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
|
2019-05-16 00:58:30 +01:00 |
|
Fermi
|
6dba14eafd
|
Final fix.
|
2019-05-15 05:34:16 +01:00 |
|
Fermi
|
2218956a09
|
Gearing up for PR
|
2019-05-15 05:27:09 +01:00 |
|
Fermi
|
0d907db516
|
Almost done. Just need to update reagent vars.
|
2019-05-14 21:20:38 +01:00 |
|
Fermi
|
76aec5a5ed
|
Holder fixes
|
2019-05-14 16:51:03 +01:00 |
|
Fermi
|
3229e4bf3a
|
Reverted holder, (sorry Kev)
|
2019-05-14 02:48:12 +01:00 |
|