deathride58 538cb55b68 Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791 ...

[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar

2018-04-11 21:35:45 +00:00

..

admin

Adds "Man up" verb for admins. (#6296)

2018-04-10 17:34:45 -07:00

antagonists

Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791

2018-04-11 21:35:45 +00:00

assembly

things with stuff (#6233)

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

atmospherics

Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116

2018-04-11 21:26:47 +00:00

awaymissions

things with stuff (#6233)

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

cargo

Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983

2018-04-11 21:34:56 +00:00

chatter

…

client

Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082

2018-04-11 21:31:46 +00:00

clothing

things with stuff (#6233)

2018-04-07 23:07:09 -04: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

…

events

Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00:00

fields

…

flufftext

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

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

food_and_drinks

things with stuff (#6233)

2018-04-07 23:07:09 -04: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

things with stuff (#6233)

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

integrated_electronics

Merge pull request #6353 from Citadel-Station-13/upstream-merge-37044

2018-04-11 21:32:17 +00:00

jobs

Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00: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

things with stuff (#6233)

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

mining

things with stuff (#6233)

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

mob

Fixes overlay update for washing bloody hands (#37094)

2018-04-11 07:30:45 -05:00

modular_computers

things with stuff (#6233)

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

ninja

…

NTNet

things with stuff (#6233)

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

orbit

…

paperwork

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

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

power

oof

2018-04-11 14:59:54 -05:00

procedural_mapping

…

projectiles

getStaminaLoss()

2018-04-07 23:39:48 -04:00

reagents

remove 512 version checks

2018-04-11 14:26:41 -05:00

recycling

things with stuff (#6233)

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

research

things with stuff (#6233)

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

ruins

things with stuff (#6233)

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

security_levels

…

server_tools

…

shuttle

Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065

2018-04-10 07:47:00 +00:00

spells

things with stuff (#6233)

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

station_goals

…

stock_market

things with stuff (#6233)

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

surgery

Forcing the human liver to actually do its job v2 (#37032)

2018-04-11 09:33:49 -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

things with stuff (#6233)

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

vending

things with stuff (#6233)

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

VR

things with stuff (#6233)

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

zombie

…