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

* Changes golem shell attackby istype chain to use an assoc list instead

* Makes the check use merge_type as opposed of item type

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

..

admin

Adds Internet admin midi (#30457)

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

assembly

clean up

2017-08-28 10:34:31 -05:00

atmospherics

this sure was FUN

2017-09-07 09:47:56 -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-29866

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

chatter

…

client

Adds Internet admin midi (#30457)

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

clothing

ok

2017-09-07 10:34:36 -05:00

crafting

Alters the pressure plate crafting recipe (#30452)

2017-09-06 20:35:50 -05:00

detectivework

…

emoji

…

error_handler

…

events

this sure was FUN

2017-09-07 09:47:56 -05:00

fields

clean up

2017-08-28 10:34:31 -05:00

flufftext

Prevents hallucinations revealing people's identity

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

food_and_drinks

line endings ree

2017-08-29 19:57:58 -07: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 pull request #2608 from Citadel-Station-13/upstream-merge-30262

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

jobs

Merge branch 'master' into upstream-merge-29105

2017-09-02 07:11:32 -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 a unique suicide to the hierophant club, plus some attack verbs (#30400)

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

mob

Merge pull request #2663 from Citadel-Station-13/upstream-merge-30389

2017-09-09 01:03:15 -05:00

modular_computers

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

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

ninja

commit

2017-09-01 09:52:29 -05:00

orbit

…

paperwork

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

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

power

Fixes containment field CanPass

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

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

reagents

Fix crit-only healing to include softcrit (#30520)

2017-09-09 16:29:36 -05:00

recycling

Fixes more CanPass misuse (#30493)

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

research

Revert "[MIRROR] Port material containers to datum components" (#2597)

2017-09-04 09:07:40 -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

…

shuttle

Fixes more CanPass misuse (#30493)

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

space_transition

…

spells

this sure was FUN

2017-09-07 09:47:56 -05:00

station_goals

…

stock_market

…

surgery

Quick sync (#2587)

2017-09-04 04:38:49 -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

…

zombie

…