Poojawa 8406baebbe Makes APC cell_type actually pick a cell (#2747) ...

* Ports TG#30327

* Update apc.dm

* maybe delta can be fully copies over, yes?

2017-09-13 19:57:21 -05:00

..

admin

Merge branch 'master' into upstream-merge-30297

2017-09-13 06:41:37 -05:00

assembly

clean up

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

atmospherics

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

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

awaymissions

Makes the station Z level into a list instead of a single define

2017-09-11 12:40:35 -05:00

cargo

Merge branch 'master' into upstream-merge-30494

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

chatter

…

client

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -05:00

clothing

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -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

Merge branch 'master' into upstream-merge-30297

2017-09-12 23:36:35 -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

Merge branch 'master' into upstream-merge-30494

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

games

…

goonchat

Fixes admin volume not updating datum var

2017-09-12 14:16:49 -05:00

holiday

…

holodeck

Fixes more CanPass misuse (#30493)

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

html_interface

…

hydroponics

[MIRROR] It's oranges (#2486)

2017-09-13 17:56:54 -05:00

jobs

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -05:00

language

…

library

Merge branch 'master' into upstream-merge-30176

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

lighting

Merge pull request #2726 from Citadel-Station-13/upstream-merge-30631

2017-09-12 18:21:08 -05:00

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

Merge branch 'master' into upstream-merge-30633

2017-09-13 08:00:06 -05:00

mob

[MIRROR] Adds "large bun" hairstyle (#2609)

2017-09-13 18:34:40 -05:00

modular_computers

[MIRROR] Standardized power displays (#2539)

2017-09-13 17:57:16 -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

Makes APC cell_type actually pick a cell (#2747)

2017-09-13 19:57:21 -05:00

procedural_mapping

Makes the station Z level into a list instead of a single define

2017-09-11 12:40:35 -05:00

projectiles

Merge pull request #2701 from Citadel-Station-13/upstream-merge-30564

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

reagents

[MIRROR] Minor touchups to chemistry/bar/virology machinery #2484

2017-09-13 17:59:07 -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

Update security_levels.dm

2017-09-11 15:58:47 -05:00

server_tools

Server tools versioning and fix to displayed testmerges

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

shuttle

[MIRROR] Fix monastery shuttle + Pods (#2599)

2017-09-13 17:58:25 -05:00

space_transition

…

spells

Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415

2017-09-12 23:31:38 -05:00

station_goals

Merge branch 'master' into upstream-merge-30297

2017-09-12 23:36:35 -05:00

stock_market

…

surgery

Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415

2017-09-12 23:31:38 -05:00

telesci

…

tgui

…

tooltip

…

uplink

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -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

…