skull132 d536d9f4aa Merge branch 'fake-master' into development ...

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm

2017-12-09 00:08:21 +02:00

..

ammunition.dm

Changes the placement of some items in the uplink (#2853)

2017-07-01 17:53:14 +03:00

announcements.dm

Merge branch 'fake-master' into development

2017-12-09 00:08:21 +02:00

badassery.dm

…

devices and tools.dm

Fixes some boxes starting with the wrong contents and more (#3247)

2017-08-07 22:53:43 +03:00

grenades.dm

Changes the placement of some items in the uplink (#2853)

2017-07-01 17:53:14 +03:00

hardsuit_modules.dm

Fixes ai core airlock, lack of bluespace crystals and a bit more (#3225)

2017-08-04 22:18:25 +03:00

highly visible and dangerous weapons.dm

Landmines (#3908)

2017-12-04 18:45:31 -06:00

implants.dm

…

medical.dm

Changes the placement of some items in the uplink (#2853)

2017-07-01 17:53:14 +03:00

specialty.dm

Job-Specific antag uplink item framework. (#3360)

2017-09-10 21:59:28 +02:00

stealth and camouflage items.dm

Removes cloaking devices (#2713)

2017-06-15 12:39:06 +03:00

stealthy and inconspicuous weapons.dm

Rings (#3886)

2017-12-04 18:53:39 -06:00

telecrystals.dm

…

uplink_categories.dm

Job-Specific antag uplink item framework. (#3360)

2017-09-10 21:59:28 +02:00

uplink_items.dm

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00