deathride58 79d304eeb7 Merge pull request #7015 from Citadel-Station-13/upstream-merge-38283 ...

[MIRROR] Stops swarmers from attacking field gens/turret covers

2018-06-05 21:04:15 +00:00

..

admin

Adds a Supplypod-delivery admin smite (#38069)

2018-06-04 00:37:24 -05:00

antagonists

Stop swarmers from attacking field gens/turret covers (#38283)

2018-06-05 13:17:12 -05:00

assembly

Fixes pocket items being deleted when monkeyizing (#38220)

2018-06-03 09:04:08 -05:00

atmospherics

Replaces airlock_controller/incinerator related varedits with defines/subtypes

2018-06-03 11:03:14 -05:00

awaymissions

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

cargo

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

chatter

…

client

Fixes datediff not returning (#38215)

2018-06-03 09:04:16 -05:00

clothing

Fixes pocket items being deleted when monkeyizing (#38220)

2018-06-03 09:04:08 -05:00

crafting

replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2

2018-05-02 13:14:43 -05:00

detectivework

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

emoji

Use spritesheets to reduce time spent sending PNG assets by 90+%

2018-05-09 22:44:57 -05:00

error_handler

…

events

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

fields

…

flufftext

[s] Hallucinations 4.0

2018-05-09 16:15:58 -05:00

food_and_drinks

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

games

…

goonchat

Merge pull request #37934 from AutomaticFrenzy/patch/ssping

2018-05-21 16:40:29 -05:00

holiday

drone masks for holidays

2018-05-09 13:42:54 -05:00

holodeck

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

hydroponics

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

integrated_electronics

Fix recycling the same assembly multiple times (#38275)

2018-06-05 04:13:44 -05:00

jobs

Antag reputation rewards are now configurable

2018-06-03 09:03:51 -05:00

keybindings

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00

language

Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

library

Fix infinite soapstone uses exploit (#38195)

2018-06-01 08:13:54 -05:00

lighting

AI Multicamera mode (#37695)

2018-05-31 22:41:48 -05:00

mapping

Delay smoothing atoms that have not initialized yet (#38173)

2018-06-03 14:25:35 -05:00

mining

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

mob

Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220

2018-06-03 16:19:36 -05:00

modular_computers

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

ninja

Merge branch 'master' into upstream-merge-37486

2018-05-21 11:59:57 -05:00

NTNet

…

orbit

…

paperwork

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

power

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

procedural_mapping

…

projectiles

[MIRROR] Fix inconsistent energy gun suicide (#7012)

2018-06-05 11:18:27 -07:00

reagents

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

recycling

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

research

Stock parts sorter now use get_parts_rating (#38191)

2018-06-01 04:15:02 -05:00

ruins

[MIRROR] Lavaland Clock Cult Ruin (#7011)

2018-06-05 11:16:55 -07:00

security_levels

…

shuttle

Removes drone overlays and the associated code (#38175)

2018-05-31 22:41:21 -05:00

spells

[MIRROR] Fix the Lightning Bolt spell (#7013)

2018-06-05 11:17:47 -07:00

station_goals

…

surgery

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

tgs

Update DMAPI to version 3.2.1.0

2018-05-08 21:33:58 -05:00

tgui

…

tooltip

Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2

2018-05-14 16:51:20 -05:00

unit_tests

…

uplink

[MIRROR] Fixes uplink refunds (#7014)

2018-06-05 11:19:33 -07:00

vehicles

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

vending

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

VR

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

zombie

…