Cerebulon 89f0db9bdb conflict resolution

2022-10-15 00:51:23 +01:00

..

__datastructures

use static for shared member vars

2022-04-24 07:52:32 +01:00

__defines

trained drakes can collect/drop items and use buttons, fire alarms, and levers (#8734)

2022-10-13 17:59:35 -08:00

_global_vars

Added survivalist job, wilderness spawn and checkpoint spawn to Cynosure.

2022-06-15 21:44:02 +10:00

_helpers

fix || in type2parent switch, gentle refactor

2022-10-09 11:54:05 +01:00

_onclick

Merge pull request #8600 from Atermonera/readds_abilities

2022-05-03 11:08:33 -05:00

ATMOSPHERICS

phoron be gone

2022-05-10 14:50:29 -05:00

controllers

Ports Diagonal Movement (#8199)

2022-10-07 23:36:14 -08:00

core

transform behavior- A|I.Clear|Set & M.Clear|Update

2022-07-06 09:41:00 +01:00

datums

trained drakes can collect/drop items and use buttons, fire alarms, and levers (#8734)

2022-10-13 17:59:35 -08:00

defines

more soap, better soap

2022-10-03 11:38:57 +01:00

game

trained drakes can collect/drop items and use buttons, fire alarms, and levers (#8734)

2022-10-13 17:59:35 -08:00

js

use /global/ sugar for bare globals, no leading /

2022-04-24 07:54:34 +01:00

modules

conflict resolution

2022-10-15 00:51:23 +01:00

unit_tests

remove unused sources in code/*

2022-04-26 21:17:59 +01:00

ZAS

Merge pull request #8583 from Spookerton/spkrtn/sys/workspace-settings-improvement

2022-04-28 22:11:09 -08:00

__spaceman_dmm.dm

moved sdmm defines to as early as possible in env

2022-09-26 22:53:07 +01:00

_away_mission_tests.dm

…

_macros.dm

removes some legacy procs, adds some other procs

2022-04-03 14:19:45 +01:00

_map_tests.dm

…

_unit_tests.dm

…

global_init.dm

…

global.dm

Ports Diagonal Movement (#8199)

2022-10-07 23:36:14 -08:00

hub.dm

…

names.dm

use /global/ sugar for bare globals, no leading /

2022-04-24 07:54:34 +01:00

stylesheet.dm

trained drakes can collect/drop items and use buttons, fire alarms, and levers (#8734)

2022-10-13 17:59:35 -08:00

world.dm

…