Qustinnus 2312ff09be Fixing conflicts

2017-07-19 11:19:52 +02:00

..

admin

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

assembly

Rename Bumped to CollidedWith

2017-07-15 00:25:22 +00:00

atmospherics

Adds a move delay when resisting out of cryo (#29313)

2017-07-18 10:43:01 -04:00

awaymissions

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

cargo

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

chatter

…

client

[s]Fixes panic bunker (#29289)

2017-07-17 09:13:13 -03:00

clothing

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

crafting

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

detectivework

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

emoji

…

error_handler

…

events

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

fields

Removes old height parameter from CanPass proc (#29218)

2017-07-13 08:57:25 -03:00

flufftext

Refactor Lung Handling (#29280)

2017-07-18 10:58:23 -04:00

food_and_drinks

Fixing conflicts

2017-07-19 11:19:52 +02:00

games

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

goonchat

Fixes goonchat cookie false positives

2017-07-15 19:32:54 +02:00

holiday

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

holodeck

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

html_interface

…

hydroponics

Fixing conflicts

2017-07-19 11:19:52 +02:00

jobs

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

language

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

library

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

lighting

[Ready] Shuttle dock() rewrite (#29049)

2017-07-17 12:17:56 +12:00

mapping

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

mining

Picking up ores by crossing them no longer spams your chat box (#29323)

2017-07-18 21:24:21 -03:00

mob

Fixing conflicts

2017-07-19 11:19:52 +02:00

modular_computers

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

ninja

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

orbit

…

paperwork

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

power

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

procedural_mapping

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

projectiles

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

reagents

Fixing conflicts

2017-07-19 11:19:52 +02:00

recycling

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

research

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

ruins

Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232)

2017-07-17 12:25:01 -03:00

security_levels

Changes all access const to be a define (#29260)

2017-07-16 18:44:23 +02:00

server_tools

Fixes world.internet_address in irc check

2017-07-05 22:22:03 -04:00

shuttle

Fixes a ... likely important bug with shuttle code.... (#29335)

2017-07-18 14:52:09 +02:00

space_transition

…

spells

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

station_goals

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

stock_market

…

surgery

Fixing conflicts

2017-07-19 11:19:52 +02:00

tgui

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

tooltip

Replaces all instances of spawn() with addtimer/INVOKE_ASYNC (#28958)

2017-07-06 10:13:44 -04:00

uplink

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

vehicles

Rename Bumped to CollidedWith

2017-07-15 00:25:22 +00:00

VR

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

zombie

…