oranges 3e6c0624fc Merge pull request #30637 from tgstation/Cyberboss-patch-6 ...

Adds 5s delay to current immediate ahelp verb returns

2017-09-12 17:09:31 -05:00

..

admin

Merge pull request #30637 from tgstation/Cyberboss-patch-6

2017-09-12 17:09:31 -05:00

assembly

…

atmospherics

Merge pull request #2699 from Citadel-Station-13/upstream-merge-30551

2017-09-12 03:19:23 -05:00

awaymissions

Cleans up more paper fluff varedits. (#30418)

2017-09-06 18:42:43 -05:00

cargo

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

chatter

…

client

Ports MSO's fading note system

2017-09-11 23:07:30 -05:00

clothing

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

crafting

Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553

2017-09-12 01:22:11 -05:00

detectivework

Adds missing span-endings

2017-09-11 07:10:09 -05:00

emoji

…

error_handler

[s] Adds a security token to all admin hrefs

2017-09-08 21:16:02 -05:00

events

[s] Adds a security token to all admin hrefs

2017-09-08 21:16:02 -05:00

fields

…

flufftext

Prevents hallucinations revealing people's identity

2017-09-02 05:33:55 -05:00

food_and_drinks

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

games

…

goonchat

Adds Internet admin midi (#30457)

2017-09-08 09:32:29 -05:00

holiday

…

holodeck

Fixes more CanPass misuse (#30493)

2017-09-09 19:41:02 -05:00

html_interface

…

hydroponics

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

jobs

Merge branch 'master' into upstream-merge-30117

2017-09-11 18:10:15 -05:00

language

…

library

Merge branch 'master' into upstream-merge-30176

2017-09-06 17:43:07 -05:00

lighting

…

mapping

Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it

2017-08-29 17:10:59 -05:00

mentor

…

mining

Adds missing span-endings

2017-09-11 07:10:09 -05:00

mob

Update powers.dm

2017-09-12 03:10:07 -05:00

modular_computers

Allows atmos techs to download the SM monitor (#30458)

2017-09-06 21:00:25 -05:00

ninja

Adds missing span-endings

2017-09-11 07:10:09 -05:00

orbit

…

paperwork

Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262

2017-09-07 10:01:35 -05:00

power

Merge branch 'master' into upstream-merge-30117

2017-09-11 18:10:15 -05:00

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

reagents

Adds missing span-endings

2017-09-11 07:10:09 -05:00

recycling

Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220

2017-09-11 15:22:59 -05:00

research

Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531

2017-09-12 02:35:17 -05:00

ruins

Changes golem shell attackby istype chain to use an assoc list instead of an istype chain (#30542)

2017-09-10 14:18:25 -05:00

security_levels

…

server_tools

Server tools versioning and fix to displayed testmerges

2017-08-29 17:16:17 -05:00

shuttle

Update shuttle.dm

2017-09-11 17:09:44 -05:00

space_transition

…

spells

Adds missing span-endings

2017-09-11 07:10:09 -05:00

station_goals

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

stock_market

…

surgery

Merge pull request #2717 from Citadel-Station-13/sssssssssssssssssssssssssssssss

2017-09-12 03:21:06 -05:00

telesci

…

tgui

…

tooltip

…

uplink

Decreases hacked ai module cost (#2557)

2017-09-04 04:14:48 -05:00

vehicles

…

vore

Fixes prey digestion noises and loop (#2616)

2017-09-05 12:53:35 -05:00

VR

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

zombie

…