 kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
|
Thalpy
|
84c3c104cd
|
Pointed out that a message could be misinterpreted as lewd.
|
2019-06-08 06:32:12 +01:00 |
|
|
deathride58
|
8bf5777844
|
Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
|
2019-06-08 01:07:56 -04:00 |
|
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
|
Fermi
|
c6c98b539d
|
Minor bug fix.
|
2019-06-08 01:22:43 +01:00 |
|
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
|
Ghommie
|
af2598035a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-05 19:32:17 +02:00 |
|
|
Ghommie
|
0513f3464a
|
one
|
2019-06-05 19:20:25 +02:00 |
|
|
Poojawa
|
1f1f951924
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-06-03 05:35:52 -05:00 |
|
|
Fermi
|
fd22dbfc0d
|
More fixes. Need to check over merging math.
|
2019-06-02 03:59:52 +01:00 |
|
|
Fermi
|
0fa445c153
|
Fixes and test.
|
2019-06-02 03:24:01 +01:00 |
|
|
Fermi
|
3cf3268c76
|
New non-harmful medicinal darts.
|
2019-06-01 22:52:03 +01:00 |
|
|
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 |
|
|
kevinz000
|
8cd0b69b61
|
adrenals
|
2019-05-28 01:00:41 -07: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 |
|
|
Poojawa
|
971ddef989
|
reverts forensics components. If I can't figure it out, MURDER IT
|
2019-05-22 04:10:29 -05:00 |
|
|
Poojawa
|
f6f4c946e6
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-22 00:08:13 -05: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 |
|