Jordan Brown e52fafcbb7 Merge pull request #37364 from Jalleo/Inducer_change ...

Removes the ability for inducers and circuits to charge energy weapons.

2018-04-23 08:47:55 -05:00

..

admin

Merge pull request #6470 from Citadel-Station-13/upstream-merge-37304

2018-04-22 22:19:06 -05:00

antagonists

Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218

2018-04-22 02:34:53 -05:00

assembly

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

atmospherics

Parenthesizes some macros (#37212)

2018-04-16 03:47:46 -05:00

awaymissions

Can't push CTF flag carriers (#37321)

2018-04-22 19:19:32 -05:00

cargo

fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239)

2018-04-16 19:14:08 -05:00

chatter

…

client

Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858

2018-04-12 07:06:08 -05:00

clothing

Makes engine goggle numbers more visible (#37324)

2018-04-22 19:21:13 -05:00

crafting

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

detectivework

Detective Scanner Fixes (#36915)

2018-04-09 13:05:30 -05:00

emoji

…

error_handler

Readds dropped #endif (#37174)

2018-04-13 22:10:47 -05:00

events

Fixes Kudzu growing in space (#36701)

2018-04-19 03:13:47 -05:00

fields

…

flufftext

Fixes bloodbath effects not working on people in crit (#36598)

2018-04-03 22:01:59 -05:00

food_and_drinks

blacklist his grace from being deep-fried

2018-04-15 12:41:19 -05:00

games

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

goonchat

…

holiday

Finishes overflow roles (#37053)

2018-04-09 05:10:14 -05:00

holodeck

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

hydroponics

Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270

2018-04-22 22:19:28 -05:00

integrated_electronics

Merge pull request #37364 from Jalleo/Inducer_change

2018-04-23 08:47:55 -05:00

jobs

Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132

2018-04-14 07:44:36 -05:00

keybindings

[MIRROR] Moves quick equip hotkey up to /mob (#6229)

2018-04-02 01:36:42 -05:00

language

…

library

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

lighting

…

mapping

Merge pull request #6475 from Citadel-Station-13/upstream-merge-37314

2018-04-22 22:20:58 -05:00

mining

Merge pull request #6435 from Citadel-Station-13/upstream-merge-37196

2018-04-22 02:41:25 -05:00

mob

Merge pull request #6477 from Citadel-Station-13/upstream-merge-37320

2018-04-22 22:21:45 -05:00

modular_computers

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

ninja

…

NTNet

Merge pull request #36693 from kevinz000/patch-471

2018-04-11 05:02:19 -05:00

orbit

…

paperwork

Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788

2018-04-10 07:20:33 +00:00

power

Merge pull request #6429 from Citadel-Station-13/upstream-merge-37207

2018-04-22 02:39:18 -05:00

procedural_mapping

…

projectiles

Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)

2018-04-18 09:33:31 -05:00

reagents

Gives beer and soda dispensers their own circuitboards and Design ID's (#37315)

2018-04-22 19:19:51 -05:00

recycling

Parenthesizes some macros (#37212)

2018-04-16 03:47:46 -05:00

research

Gives beer and soda dispensers their own circuitboards and Design ID's (#37315)

2018-04-22 19:19:51 -05:00

ruins

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

security_levels

…

server_tools

…

shuttle

Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks

2018-04-19 03:15:01 -05:00

spells

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

station_goals

Merge pull request #37233 from KorPhaeron/gps3

2018-04-15 16:01:10 -05:00

stock_market

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

surgery

Merge pull request #37201 from kevinz000/patch-483

2018-04-15 22:25:14 -05:00

telesci

…

tgui

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

tooltip

…

unit_tests

…

uplink

Provides more control over uplink surplus chances. (#36983)

2018-04-11 05:16:32 -05:00

vehicles

fixes the laws of matter conservation (#37300)

2018-04-20 15:32:32 -05:00

vending

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

VR

Merge branch 'master' into upstream-merge-36974

2018-04-10 07:48:12 +00:00

zombie

…