Meghan-Rossi ef7dfaa6cc Resolve conflicts, fix compile errors

2019-12-19 18:44:47 +00:00

..

antagonist

Security / PseudoCargo Expansion

2019-11-24 17:23:48 -05:00

area

Moves tether_midpoint area

2019-09-16 23:35:40 -05:00

dna

Fixes cloning (#6498)

2019-10-27 17:25:40 -04:00

gamemodes

Merge pull request #6550 from listerla/grammar-time

2019-11-29 19:49:14 -05:00

jobs

Resolve conflicts, fix compile errors

2019-12-19 18:44:47 +00:00

machinery

Replaces lentext with length

2019-12-12 13:13:18 -05:00

magic

Update Chat System to use to_chat(src, "") instead of src << ""

2019-11-05 19:22:38 -05:00

mecha

Merge pull request #6506 from Heroman3003/mech-runtime-roundstart-fix

2019-10-30 21:00:21 -04:00

objects

Resolve conflicts, fix compile errors

2019-12-19 18:44:47 +00:00

turfs

Xenowork Prep For Future (#6491)

2019-11-04 21:38:02 -05:00

vehicles

…

verbs

Update Chat System to use to_chat(src, "") instead of src << ""

2019-11-05 19:22:38 -05:00

atoms_movable_vr.dm

…

atoms_movable.dm

Actually fixes icon scaling on later byond versions

2019-08-30 15:53:16 +03:00

atoms.dm

Fixes the washing bug with boots

2019-09-03 01:34:54 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

Adds New Alert Levels (#6019)

2019-03-30 18:29:12 -04:00

shuttle_engines.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

skincmd.dm

…

socket_talk.dm

…

sound.dm

Adds Sound Code and toggles

2019-10-13 02:05:16 -05:00

supplyshuttle.dm

…

trader_visit.dm

…

world.dm

Switches to a different system for gateway map use.

2019-10-30 10:54:27 +10:00