ItsSelis 7e75bf19a6 Resolve conflicts

2022-07-03 16:18:28 +02:00

..

antagonist

More Input Conversion

2022-06-19 12:21:51 +02:00

area

Using incorporeal_move instead of moving defines

2022-05-21 20:53:13 +02:00

dna

Apparently an empty list wasn't better

2022-05-03 20:38:04 -04:00

gamemodes

Chaplain, multiline stuff and decimals

2022-06-20 18:39:09 +02:00

jobs

Makes Talon Captain restricted behind 60 hours of Talon playtime

2022-07-03 07:20:43 +10:00

machinery

A pAI death tweak I forgot!

2022-06-29 02:12:17 -04:00

magic

Input Conversion Part 2

2022-06-19 03:40:24 +02:00

mecha

Merge pull request #13193 from Heroman3003/traitening

2022-06-29 02:00:04 -04:00

objects

Resolve conflicts

2022-07-03 16:18:28 +02:00

turfs

Merge branch 'master' of https://github.com/VOREStation/VOREStation into tgui-input-conversions

2022-06-19 12:22:34 +02:00

vehicles

…

verbs

Remove suicide act

2021-10-27 20:35:12 -04:00

atoms_movable_vr.dm

…

atoms_movable.dm

Fix merge

2021-10-27 13:51:21 -04:00

atoms.dm

Fixes ambigous genders being too ambigous

2022-06-18 15:55:48 +10:00

base_turf.dm

Input Conversion Part 1

2022-06-19 03:05:03 +02:00

json.dm

…

periodic_news.dm

…

response_team_vr.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

…

trader_visit_vr.dm

…

trader_visit.dm

…

world.dm

…