LetterJay 5a9b7a5173 Merge pull request #5434 from Citadel-Station-13/upstream-merge-35541 ...

[MIRROR] Fixes lye/plastic/charcoal conflicts

2018-02-12 10:03:16 -06:00

..

admin

Highlander antag datum (#35519)

2018-02-11 15:33:02 -06:00

antagonists

Highlander antag datum (#35519)

2018-02-11 15:33:02 -06:00

assembly

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

atmospherics

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

awaymissions

Fixes wrong ID for syndicate ghost roles

2018-02-11 15:35:14 -06:00

cargo

Update packs.dm

2018-02-07 14:09:28 -05:00

chatter

…

client

[s]Blacklists the most recent version of byond for basically being a wall hack (#35516)

2018-02-11 05:14:04 -06:00

clothing

Update soft_caps.dm

2018-02-11 05:35:55 -06:00

crafting

[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)

2018-02-06 19:06:31 -06:00

detectivework

…

emoji

…

error_handler

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

events

Heart Disease 2: Electric Boogaloo (#35296)

2018-02-08 03:02:29 -06:00

fields

…

flufftext

Replaces some var values with defines

2018-02-10 11:11:09 -06:00

food_and_drinks

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

games

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

goonchat

Darkens chatbox a lil to go along with the UI's dark theme (#5250)

2018-02-04 22:27:38 -06:00

holiday

[MIRROR] Future proofs Easter calculations (#5247)

2018-02-04 22:22:56 -06:00

holodeck

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

html_interface

…

hydroponics

Hatchets are now small instead of tiny.

2018-02-09 14:22:34 -06:00

integrated_electronics

Fixes scaner circuit typo (#35508)

2018-02-11 12:43:06 -06:00

jobs

Merge pull request #5427 from Citadel-Station-13/upstream-merge-35417

2018-02-11 23:35:29 +00:00

keybindings

modules

2018-01-31 06:56:28 -06:00

language

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

library

modules

2018-01-31 06:56:28 -06:00

lighting

Merge pull request #34982 from vuonojenmustaturska/lightingdeopt

2018-01-28 10:34:04 -06:00

mapping

Ruins now log to world only in TESTING mode (#35421)

2018-02-11 05:13:18 -06:00

mining

Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456

2018-02-11 09:43:09 -06:00

mob

Fixes wrong ID for syndicate ghost roles

2018-02-11 15:35:14 -06:00

modular_computers

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

ninja

Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304)

2018-02-05 04:23:09 -06:00

NTNet

…

orbit

…

paperwork

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

power

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

procedural_mapping

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

projectiles

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

reagents

Merge pull request #35541 from 81Denton/chem-conflicts

2018-02-12 09:02:42 -06:00

recycling

[MIRROR] Adds sprites for conveyor belt constructs (#5276)

2018-02-04 23:12:47 -06:00

research

Merge pull request #5418 from Citadel-Station-13/upstream-merge-35502

2018-02-11 09:43:17 -06:00

ruins

Update lavaland_ruin_code.dm

2018-02-11 18:31:57 -05:00

security_levels

[READY] Adds night shifts (#4281)

2018-02-04 21:28:41 -06:00

server_tools

…

shuttle

Removes uneedful code

2018-02-09 14:23:45 -06:00

spells

modules

2018-01-31 06:56:28 -06:00

station_goals

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

stock_market

…

surgery

Replaces some var values with defines

2018-02-10 11:11:09 -06:00

telesci

…

tgui

Datum var cleanup (#34314)

2018-01-21 21:39:46 -06:00

tooltip

…

unit_tests

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

uplink

modules

2018-01-31 06:56:28 -06:00

vehicles

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

vore

I swear every player on this server is a complete idiot

2018-02-04 08:16:54 -06:00

VR

…

zombie

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00