Fox McCloud 964f5e9cbc Merge pull request #13020 from farie82/nerf-sentient-animals ...

Caps the health and damage of sentient animals

2020-03-14 23:24:49 -04:00

..

admin

Merge pull request #12932 from AffectedArc07/var/const-to-define

2020-03-14 15:33:44 -04:00

alarm

…

antagonists

malf ai

2020-01-17 08:32:24 -05:00

arcade

Merge pull request #12934 from farie82/Item-armor-fix

2020-02-24 19:42:19 -05:00

assembly

[Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)

2020-02-15 13:31:08 -07:00

atmos_automation

…

awaymissions

Merge branch 'master' into var/const-to-define

2020-03-03 22:44:07 +00:00

buildmode

…

busy_space

Update organizations.dm

2019-12-25 08:30:29 -05:00

client

Merge pull request #12616 from SteelSlayer/ai-voice-to-text-pref

2020-03-14 16:01:07 -04:00

clothing

Merge branch 'master' into var/const-to-define

2020-03-03 22:44:07 +00:00

countdown

…

crafting

Makes personal crafting for all recipes work again. (#13032)

2020-03-01 14:57:06 -07:00

customitems

…

detective_work

Replaces all var/const with #define

2020-01-28 21:25:20 +00:00

economy

Merge branch 'master' into var/const-to-define

2020-02-22 16:30:01 +00:00

error_handler

Runtime Transparency (#12886)

2020-01-07 14:46:09 -05:00

events

Merge pull request #13020 from farie82/nerf-sentient-animals

2020-03-14 23:24:49 -04:00

examine

…

ext_scripts

…

fancytitle

…

fish

Merge pull request #12934 from farie82/Item-armor-fix

2020-02-24 19:42:19 -05:00

flufftext

Fixes a few runtimes (#12893)

2020-02-14 22:17:29 -07:00

food_and_drinks

Merge branch 'master' into var/const-to-define

2020-03-03 22:44:07 +00:00

games

…

holiday

Merge pull request #12673 from Citinited/snow-machine-order-tweak

2020-03-14 15:57:08 -04:00

hydroponics

Merge branch 'master' into var/const-to-define

2020-03-09 10:33:59 +00:00

karma

…

keybindings

Ports TG/lummox fix to reduce impact of keysend floods

2020-01-05 00:01:08 -08:00

library

[Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)

2020-02-15 13:31:08 -07:00

lighting

…

logic

[Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)

2020-02-15 13:31:08 -07:00

map_fluff

…

martial_arts

Fixes attack logs

2020-03-06 16:38:31 -06:00

mining

Merge branch 'master' into var/const-to-define

2020-03-03 22:44:07 +00:00

mob

Merge pull request #12917 from farie82/log-whispering

2020-03-14 23:19:10 -04:00

modular_computers

Merge branch 'master' into var/const-to-define

2020-02-22 16:30:01 +00:00

nano

rewording

2020-02-28 10:26:51 -05:00

ninja

…

paperwork

Merge branch 'master' into var/const-to-define

2020-03-09 10:33:59 +00:00

pda

Make every obj/.../New() call it's parents

2020-01-29 10:43:32 +01:00

persistence

…

power

Merge branch 'master' into var/const-to-define

2020-03-09 10:33:59 +00:00

procedural_mapping

…

projectiles

Fixes #13070 - cyborg energy guns breaking (#13071)

2020-03-05 22:35:02 -07:00

reagents

Merge pull request #12932 from AffectedArc07/var/const-to-define

2020-03-14 15:33:44 -04:00

recycling

Fireaxe door fix; arg order fix

2020-03-01 15:57:14 +00:00

research

Merge branch 'master' into var/const-to-define

2020-03-09 10:33:59 +00:00

response_team

…

ruins

Merge branch 'master' into var/const-to-define

2020-02-22 16:30:01 +00:00

security_levels

Merge branch 'master' into var/const-to-define

2020-03-03 22:44:07 +00:00

shuttle

Merge branch 'master' into var/const-to-define

2020-03-09 10:33:59 +00:00

space_management

…

spacepods

[Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)

2020-02-15 13:31:08 -07:00

station_goals

…

store

…

surgery

Merge branch 'master' into var/const-to-define

2020-03-09 10:33:59 +00:00

telesci

Merge branch 'master' into var/const-to-define

2020-02-22 16:30:01 +00:00

tooltip

…

tram

…

vehicle

…

zombie

…