Mervill 3f68bd7202 Merge branch 'master' into a_intent ...

Conflicts:
	code/modules/mob/mob_defines.dm

2016-12-04 00:38:37 -08:00

..

admin

Adds a ckey whitelist, stripping out some dead code (#21875)

2016-12-04 15:33:15 +11:00

assembly

m_intent now uses defines

2016-12-03 00:25:44 -08:00

atmospherics

a_intent now uses defines

2016-12-02 22:27:30 -08:00

awaymissions

w_class now uses defines

2016-12-01 21:33:14 -08:00

cargo

w_class now uses defines

2016-12-01 21:33:14 -08:00

chatter

…

client

Cid Randomizer Detector will not check webclients

2016-12-01 00:45:49 -08:00

clothing

a_intent now uses defines

2016-12-02 22:27:30 -08:00

crafting

…

detectivework

a_intent now uses defines

2016-12-02 22:27:30 -08:00

emoji

…

events

Merge pull request #21888 from XDTM/VineCodeScaresMe

2016-12-03 21:26:17 +04:00

flufftext

Remove slash from end of type refs/defs

2016-11-30 19:23:15 -08:00

food_and_drinks

a_intent now uses defines

2016-12-02 22:27:30 -08:00

games

w_class now uses defines

2016-12-01 21:33:14 -08:00

holiday

Removes code from xmas celebrate() and move to the appropriate holiday datum.

2016-11-26 21:36:55 -02:00

holodeck

a_intent now uses defines

2016-12-02 22:27:30 -08:00

html_interface

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

hydroponics

Merge branch 'master' into a_intent

2016-12-04 00:38:37 -08:00

jobs

Adds a ckey whitelist, stripping out some dead code (#21875)

2016-12-04 15:33:15 +11:00

library

w_class now uses defines

2016-12-01 21:33:14 -08:00

lighting

Makes using the cheat engine to remove darkness or ai static harder

2016-12-01 14:38:28 -08:00

mining

a_intent now uses defines

2016-12-02 22:27:30 -08:00

mob

Merge branch 'master' into a_intent

2016-12-04 00:38:37 -08:00

modular_computers

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

ninja

…

orbit

…

paperwork

a_intent now uses defines

2016-12-02 22:27:30 -08:00

power

a_intent now uses defines

2016-12-02 22:27:30 -08:00

procedural_mapping

…

projectiles

a_intent now uses defines

2016-12-02 22:27:30 -08:00

reagents

a_intent now uses defines

2016-12-02 22:27:30 -08:00

recycling

a_intent now uses defines

2016-12-02 22:27:30 -08:00

research

a_intent now uses defines

2016-12-02 22:27:30 -08:00

ruins

w_class now uses defines

2016-12-01 21:33:14 -08:00

security_levels

…

shuttle

Fixes all remaining addtimers missed

2016-11-27 08:31:07 +00:00

space_transition

…

spells

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

station_goals

Replaces "specflags" with "species_traits" (#21851)

2016-12-01 21:16:33 +13:00

stock_market

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

surgery

a_intent now uses defines

2016-12-02 22:27:30 -08:00

telesci

w_class now uses defines

2016-12-01 21:33:14 -08:00

tgui

Tgui cleanup

2016-11-27 18:09:45 -05:00

tooltip

Adds a new UI style, Clockwork

2016-11-17 16:44:35 -05:00

uplink

reduces cost of throwing weapons box (#21649)

2016-11-20 20:41:32 -06:00

vehicles

w_class now uses defines

2016-12-01 21:33:14 -08:00

VR

…

zombie

Replaces "specflags" with "species_traits" (#21851)

2016-12-01 21:16:33 +13:00