LetterJay f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145 ...

[MIRROR] Fixes aliums being able to attack the SM crystal

2017-10-01 16:31:44 -04:00

..

admin

Merge branch 'master' into upstream-merge-31128

2017-10-01 15:46:15 -04:00

assembly

[MIRROR] Fixed small error causing signalers to fail to attach to each other in an assembly (#2750)

2017-09-14 07:36:13 -05:00

atmospherics

Alt-clicking descriptions when examining

2017-09-28 21:51:53 -05:00

awaymissions

Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138

2017-10-01 16:20:56 -04:00

cargo

[MIRROR] Adds some new plushies (#2866)

2017-09-22 22:31:07 -05:00

chatter

…

client

updates

2017-10-01 00:59:59 -05:00

clothing

Merge branch 'master' into upstream-merge-29741

2017-09-30 13:35:47 -04:00

crafting

[MIRROR] Ammo cleanup (#2643)

2017-09-22 22:30:44 -05:00

detectivework

Fixes evidence bag not respecting inventory

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

emoji

Configuration datum refactor

2017-09-28 21:37:53 -05:00

error_handler

Configuration datum refactor

2017-09-28 21:37:53 -05:00

events

Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00

fields

[READY]Refactors timestops to use fields (#30858)

2017-09-28 21:46:34 -05:00

flufftext

[MIRROR] Fixes to more Initialize procs (#2733)

2017-09-13 22:54:12 -05:00

food_and_drinks

Merge pull request #31064 from YPOQ/silverfriedfoods

2017-09-28 21:55:42 -05:00

games

Alt-clicking descriptions when examining

2017-09-28 21:51:53 -05:00

goonchat

Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow

2017-09-28 16:02:31 -05:00

holiday

[MIRROR] New squeaky datum and plushes (#2847)

2017-09-22 19:43:56 -05:00

holodeck

Fixes more CanPass misuse (#30493)

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

html_interface

…

hydroponics

Merge branch 'master' into upstream-merge-31116

2017-10-01 15:09:10 -04:00

jobs

Update silicon.dm

2017-09-29 23:44:43 -05:00

language

…

library

[MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)

2017-09-22 23:35:22 -05:00

lighting

[MIRROR] Fixes lighting hard deleting (#2760)

2017-09-14 06:44:17 -05:00

mapping

…

mentor

…

mining

Alt-clicking descriptions when examining

2017-09-28 21:51:53 -05:00

mob

Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143

2017-10-01 16:29:35 -04:00

modular_computers

Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00

ninja

Merge pull request #31074 from pubby/ninjaoutfit

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

orbit

…

paperwork

Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988

2017-09-30 12:57:52 -04:00

power

Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145

2017-10-01 16:31:44 -04: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 #3034 from Citadel-Station-13/upstream-merge-31138

2017-10-01 16:20:56 -04:00

reagents

Update hypospray.dm

2017-09-30 14:20:25 -05:00

recycling

[MIRROR] Various grammar fixes (#2842)

2017-09-17 22:35:51 -05:00

research

[READY]Refactors timestops to use fields (#30858)

2017-09-28 21:46:34 -05:00

ruins

(Ready) Clockwork Cult Rework: Proof-of-concept

2017-09-26 15:22:09 -05:00

security_levels

Configuration datum refactor

2017-09-28 21:37:53 -05:00

server_tools

Merge branch 'master' into upstream-merge-31000

2017-10-01 03:31:49 -04:00

shuttle

Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00

space_transition

…

spells

Fixes some hardset dna misuse

2017-09-30 14:51:52 -05:00

station_goals

Merge branch 'master' into upstream-merge-30297

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

stock_market

DisplayTimeText mk2

2017-09-24 18:59:57 -05:00

surgery

Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00

telesci

…

tgui

…

tooltip

Strip propriety macros from tooltips (#31113)

2017-09-30 08:03:28 -05:00

uplink

Wave 3 of guns

2017-09-27 23:08:36 +08:00

vehicles

…

vore

Ashdrake noms (#2868)

2017-09-21 06:29:08 -05:00

VR

Merge branch 'master' into upstream-merge-30494

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

zombie

[MIRROR] Zombies now stay dead if they suicide (#2914)

2017-09-23 05:54:36 -05:00