Fermi 01c3f66f7c Great, merge conflicts.

2019-06-01 02:42:55 +01:00

..

admin

Increases salt 100 fold

2019-05-16 09:43:03 -05:00

antagonists

…

arousal

Fixed the forceMove issue.

2019-05-29 20:17:22 +01:00

awaymissions

…

cargo

…

client

Added them to loadout too.

2019-05-09 12:09:18 +02:00

clothing

Almost done. Just need to update reagent vars.

2019-05-14 21:20:38 +01:00

crafting

…

custom_loadout

fixes darksabre stuff

2019-05-18 21:14:19 -05:00

events

…

food_and_drinks/snacks

…

integrated_electronics/subtypes

Updated integrated circuits

2019-05-09 15:25:48 -07:00

jobs

reduce minimal player age for command jobs

2019-03-14 16:46:30 -05:00

keybindings

fixes the bug where you can sometimes get permanently stuck sprinting when using the sprint hotkey (#8033)

2019-02-22 06:09:41 -08:00

mentor

brown from green

2019-04-11 00:11:18 -04:00

mining

…

mob

make hostile mobs gurgle people

2019-05-17 05:13:30 -05:00

power

…

projectiles

Update magweapon_energy.dm

2019-05-22 12:42:28 -04:00

reagents

Great, merge conflicts.

2019-06-01 02:42:55 +01:00

recycling/disposal

…

research

Delete autolathe_designs.dm

2019-05-10 16:47:59 -04:00

uplink

…

vehicles

…

vore

clears blindness on vore OOC escape

2019-04-17 01:27:08 -05:00