Meghan-Rossi 3935aa3e47 fix conflict causing compile error

2020-02-08 19:32:03 +00:00

..

antagonist

Change various global species lists to GLOB versions, adds 2 more event subspecies.

2019-12-16 00:52:29 -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

Changeling Item Name/Desc Fixy (#6624)

2020-01-16 02:56:14 -05:00

jobs

Adds extra roboticist slot

2020-01-14 11:33:14 +10:00

machinery

2020 Civilian Wing Overhaul

2020-02-08 13:56:05 -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 #6478 from VOREStation/upstream-merge-6621

2020-01-21 01:33:06 -05:00

objects

fix conflict causing compile error

2020-02-08 19:32:03 +00:00

turfs

Fix various syntactic problems

2020-01-21 01:06:04 -05:00

vehicles

…

verbs

mow

2019-12-25 14:00:18 -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

…

shuttle_engines.dm

…

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