Jordan Brown 7c6845b750 Merge pull request #36824 from Robustin/mblood ...

Monkeys can now die of bloodloss

2018-04-01 00:17:25 -05:00

..

admin

Merge pull request #6197 from Citadel-Station-13/upstream-merge-36796

2018-03-31 18:44:41 -05:00

antagonists

Merge pull request #6191 from Citadel-Station-13/upstream-merge-36787

2018-03-31 18:42:51 -05:00

assembly

Fixes strobe shields' icon getting stuck (#36714)

2018-03-28 13:42:48 -05:00

atmospherics

Removes empty New()

2018-03-31 09:11:04 -05:00

awaymissions

…

cargo

Fixes the cargo Express Console's description [wtf why is there a sprites tag] (#36765)

2018-03-28 13:38:04 -05:00

chatter

…

client

Merge pull request #36780 from KorPhaeron/oocban

2018-03-31 06:16:41 -05:00

clothing

runtime

2018-03-31 06:16:05 -05:00

crafting

Fixed table crafting with tools in surrounding area (#36786)

2018-03-31 06:15:08 -05:00

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #36432 from ShizCalev/braindamageeventruntime

2018-03-17 07:54:04 -05:00

fields

…

flufftext

[MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)

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

food_and_drinks

fixes a drinking glass smash runtime (#36826)

2018-03-31 07:11:44 -05:00

games

…

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

…

hydroponics

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

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

integrated_electronics

Merge pull request #36795 from robbym/master

2018-03-31 06:17:00 -05:00

jobs

Merge branch 'master' into digileg-runtime

2018-03-19 21:33:50 -05:00

keybindings

…

language

…

library

[MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)

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

lighting

…

mapping

…

mining

[MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017)

2018-03-19 21:12:46 -05:00

mob

Merge pull request #36824 from Robustin/mblood

2018-04-01 00:17:25 -05:00

modular_computers

…

ninja

…

NTNet

…

orbit

…

paperwork

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

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

power

[MIRROR] Lowers damage cap on breaking hacked apcs (#6026)

2018-03-19 21:44:19 -05:00

procedural_mapping

…

projectiles

Merge pull request #6186 from Citadel-Station-13/upstream-merge-36785

2018-03-31 18:41:24 -05:00

reagents

Merge pull request #6198 from Citadel-Station-13/upstream-merge-36804

2018-03-31 19:03:13 -05:00

recycling

…

research

Little fix to RPED (#36610)

2018-03-28 13:39:18 -05:00

ruins

Fixes blueprints exploit (#36625)

2018-03-29 04:35:09 -05:00

security_levels

…

server_tools

…

shuttle

[MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017)

2018-03-19 21:12:46 -05:00

spells

[MIRROR] Sintouched antag datums (#6096)

2018-03-26 04:19:49 -05:00

station_goals

…

stock_market

…

surgery

Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617

2018-03-31 06:17:11 -05:00

telesci

…

tgui

…

tooltip

…

unit_tests

Update _unit_tests.dm

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

uplink

Clown Ops

2018-03-17 07:52:41 -05:00

vehicles

Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

2018-03-14 16:49:40 -05:00

vending

[MIRROR] Modularises vending machines (#6050)

2018-03-22 06:10:17 -05:00

VR

…

zombie

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

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