skull132 05c0d13013 Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm

2018-06-03 14:15:41 +03:00

..

acting

…

admin

Load static lore news from the DB at the start of the round (#4618)

2018-04-29 22:47:30 +03:00

alarm

…

ambient_occlusion

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

antag_contest

…

assembly

…

awaymissions

…

blob

…

cargo

Custom items 16/05 (#4749)

2018-05-16 21:34:21 +03:00

cciaa

Fixes #4463 (#4585)

2018-04-10 08:38:18 +03:00

client

Adds more tajaran fashion: part two (#4817)

2018-06-01 23:34:03 +03:00

clothing

Adds more tajaran fashion: part two (#4817)

2018-06-01 23:34:03 +03:00

customitems

Custom items 16/05 (#4749)

2018-05-16 21:34:21 +03:00

detectivework

Mental Medication Overhaul, Smoking, and Breathing Reagents (#4220)

2018-03-25 21:51:27 +03:00

economy

Load static lore news from the DB at the start of the round (#4618)

2018-04-29 22:47:30 +03:00

effects

…

events

Tweaks the lottery (#4777)

2018-05-29 23:55:26 +03:00

examine

…

ext_scripts

…

flufftext

…

food

Fixes Various Food Bugs (#4769)

2018-05-20 18:18:17 +03:00

games

Custom items 16/05 (#4749)

2018-05-16 21:34:21 +03:00

genetics

…

ghosttrap

Turns imaginary friends into abstract mobs (#4358)

2018-03-10 17:22:25 +02:00

global_listener

…

holodeck

Refactors gravity checking (#4591)

2018-04-12 20:31:05 +03:00

http

…

hydroponics

Duller syringes (#4818)

2018-05-29 00:26:16 +02:00

integrated_electronics

Integrated Electronics - GPS Tracker Z-Level (#4674)

2018-05-06 18:03:45 +03:00

intern

…

item_worth

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

law

Security Fines (#4634)

2018-04-29 20:34:49 +03:00

library

…

lighting

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

liquid

…

maps

Let's stack the FSM that is the reader. (#4369)

2018-03-10 20:24:19 +02:00

martial_arts

Bug and map fixes for the april update (#4576)

2018-04-09 09:45:51 +03:00

materials

Fixes cardox recipe (#4417)

2018-03-15 12:43:52 +02:00

merchant

…

mining

Merge branch 'master' into development

2018-05-07 18:16:22 +03:00

mob

Merge branch 'master' into development

2018-06-03 14:15:41 +03:00

modular_computers

New cam networks (#4522)

2018-04-06 23:11:03 +03:00

multiz

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

nano

…

orbit

…

organs

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

overmap

…

paperwork

Ports some sounds from baystation (#4675)

2018-05-02 00:20:56 +03:00

power

Fixes #3769 (#4849)

2018-06-03 12:55:33 +03:00

projectiles

Adds weaponry permission access and a bit more (#4665)

2018-05-09 10:22:51 +02:00

random_map

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

reagents

Merge branch 'master' into development

2018-05-29 22:49:41 +03:00

recycling

Small Disposal Fixes (#4826)

2018-05-31 00:44:46 +03:00

research

Removes genetics for real now (#4831)

2018-06-02 18:16:34 +03:00

scripting

…

security levels

…

shieldgen

…

shuttles

Removes the shuttle sound (#4587)

2018-04-12 20:28:21 +03:00

spells

More bugfixes (#4752)

2018-05-17 22:38:26 +03:00

supermatter

[Ready for Review] Unapologetic Psych Buffs - Now with 80% less Mike Pence! (#4377)

2018-04-08 16:29:33 +03:00

surgery

[Ready for Review] Unapologetic Psych Buffs - Now with 80% less Mike Pence! (#4377)

2018-04-08 16:29:33 +03:00

tables

fixes #4202 (#4773)

2018-05-20 18:14:55 +03:00

telesci

…

turbolift

Code and Map Bugfixes (#4514)

2018-04-19 00:03:46 +02:00

udp

…

vehicles

Fixes #4438 (#4442)

2018-03-21 07:00:57 +02:00

ventcrawl

…

virus2

…

web_interface

…

xgm

…