nemvar 00eb91eb25 Fixes ORM again. ...

Same fix as last time. Learn to properly resolve conflicts.

2019-08-06 14:09:34 +02:00

..

admin

VV refactors 2 - Actually not indefinitely WIP (#45217)

2019-08-03 14:43:26 +12:00

antagonists

Adds "you" to local visible_messages (#45631)

2019-08-06 02:15:34 -07:00

assembly

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

atmospherics

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

awaymissions

Merge pull request #45680 from 81Denton/unfuck_c4

2019-08-05 19:09:57 -07:00

bsql

…

buildmode

what has become of my life

2019-07-27 21:54:12 -04:00

cargo

Clothing /under repath (#45548)

2019-07-30 19:20:21 +12:00

chatter

…

client

Merge pull request #45567 from nemvar/clientcolour

2019-08-03 15:04:21 +12:00

clothing

Merge pull request #45680 from 81Denton/unfuck_c4

2019-08-05 19:09:57 -07:00

detectivework

…

discord

…

economy

Job specific ID cards (#45112)

2019-07-13 21:24:35 -07:00

emoji

…

error_handler

…

events

Adds a GPS component. (#45660)

2019-08-05 19:13:19 -07:00

fields

…

flufftext

Fixes a few more missing sword icons (#45256)

2019-07-18 21:49:43 -07:00

food_and_drinks

Adds "you" to local visible_messages (#45631)

2019-08-06 02:15:34 -07:00

games

…

goonchat

Removes the assimilation/hivemind gamemode (#45316)

2019-07-27 00:08:53 +02:00

holiday

Fixes the halloween code. (#45671)

2019-08-05 19:02:41 -07:00

holodeck

Fixes holodeck swords. (#45246)

2019-07-19 00:10:07 -07:00

hydroponics

converts some spawns into timers (#45429)

2019-07-29 02:23:15 -07:00

jobs

Merge pull request #45566 from SpacePrius/bartendertheater2electricboogaloo

2019-08-01 21:05:24 +12:00

keybindings

VV refactors 2 - Actually not indefinitely WIP (#45217)

2019-08-03 14:43:26 +12:00

language

…

library

[TMC] Defib Rework, Organ Damage Effects (#45104)

2019-07-29 02:18:22 -07:00

lighting

Avoid generating the atom colour list on the lighting object

2019-07-26 02:38:51 +00:00

mapping

[TMC] Defib Rework, Organ Damage Effects (#45104)

2019-07-29 02:18:22 -07:00

mining

Fixes ORM again.

2019-08-06 14:09:34 +02:00

mob

Toxin lovers don't throw up. (#45668)

2019-08-06 02:20:32 -07:00

modular_computers

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

ninja

Refactors plastic explosives

2019-08-02 22:31:05 +02:00

NTNet

…

paperwork

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

photography

[READY] Floydmats (Datum materials) & custom toolboxes (#45118)

2019-07-24 11:27:01 -04:00

plumbing

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

power

Merge pull request #45677 from 81Denton/logs

2019-08-04 22:54:17 +12:00

procedural_mapping

…

projectiles

Adds "you" to local visible_messages (#45631)

2019-08-06 02:15:34 -07:00

reagents

Adds "you" to local visible_messages (#45631)

2019-08-06 02:15:34 -07:00

recycling

Adds "you" to local visible_messages (#45631)

2019-08-06 02:15:34 -07:00

research

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

ruins

Adds a GPS component. (#45660)

2019-08-05 19:13:19 -07:00

security_levels

…

shuttle

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

spells

Fixes time-stop spell incantation (#45585)

2019-08-01 20:53:58 +12:00

station_goals

Adds a GPS component. (#45660)

2019-08-05 19:13:19 -07:00

surgery

Adds "you" to local visible_messages (#45631)

2019-08-06 02:15:34 -07:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

Refactors plastic explosives

2019-08-02 22:31:05 +02:00

vehicles

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

vending

Fix broken suits in medical outfit lockers (#45695)

2019-08-05 18:57:35 -07:00

VR

…

zombie

[TMC] Defib Rework, Organ Damage Effects (#45104)

2019-07-29 02:18:22 -07:00