deathride58 5f81921fa6 Merge branch 'master' into synctesting

2018-04-08 03:41:50 +00:00

..

admin

Merge branch 'master' into synctesting

2018-04-08 03:41:50 +00:00

antagonists

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

assembly

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

atmospherics

Merge branch 'master' into synctesting

2018-04-08 03:41:50 +00:00

awaymissions

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

cargo

Merge branch 'master' into upstream-merge-36442

2018-04-01 19:50:37 -05:00

chatter

…

client

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

clothing

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

crafting

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

detectivework

…

emoji

…

error_handler

[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

2018-03-05 13:23:28 -06:00

events

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

fields

[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

2018-03-05 13:23:28 -06:00

flufftext

Fixes bloodbath effects not working on people in crit (#36598)

2018-04-03 22:01:59 -05:00

food_and_drinks

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

games

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

goonchat

[MIRROR] Fixes stopsounds properly (#5931)

2018-03-13 05:46:27 -05:00

holiday

[MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)

2018-03-21 12:57:30 -05:00

holodeck

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

hydroponics

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

integrated_electronics

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

jobs

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

keybindings

[MIRROR] Moves quick equip hotkey up to /mob (#6229)

2018-04-02 01:36:42 -05:00

language

Mushroom people, revived!

2018-03-07 21:47:42 -06:00

library

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

lighting

…

mapping

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

mining

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

mob

getStaminaLoss()

2018-04-07 23:39:48 -04:00

modular_computers

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

ninja

[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

2018-03-05 13:23:28 -06:00

NTNet

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

orbit

…

paperwork

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

power

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

procedural_mapping

…

projectiles

getStaminaLoss()

2018-04-07 23:39:48 -04:00

reagents

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

recycling

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

research

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

ruins

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

security_levels

compile issues

2018-03-06 22:35:16 -06:00

server_tools

…

shuttle

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

spells

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

station_goals

[MIRROR] Converts several species traits into generic traits (#5710)

2018-03-05 12:34:01 -06:00

stock_market

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

surgery

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

telesci

…

tgui

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

tooltip

…

unit_tests

Update _unit_tests.dm

2018-03-20 11:11:41 -04:00

uplink

Refactors Spell and Martial Art Books to use Action Granters!

2018-03-28 12:18:06 -05:00

vehicles

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

vending

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

VR

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

zombie

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00