DeityLink 5c5d94b062 [Cult 3.0] Soul Blade fixes, new Cult Armor, Arcane Tattoos (#19921) ...

* cult tattoos

* duh

* I just like forgot most of the commits

* coloured dagger

* daazdazdaz

2018-10-04 06:58:11 -03:00

..

diseases

Role datums rebase (#19648)

2018-09-11 15:31:57 +01:00

gamemode

[Cult 3.0] Soul Blade fixes, new Cult Armor, Arcane Tattoos (#19921)

2018-10-04 06:58:11 -03:00

helper_datums

Role datums rebase (#19648)

2018-09-11 15:31:57 +01:00

inventory

…

research

Bleeding-edge into role_datums, episode 3: revenge of git merge (#18712)

2018-07-03 04:28:11 -07:00

saycode

…

statistics

Fixes nukes not actually ending the round (#19869)

2018-09-29 21:21:30 -03:00

wires

Fixed duplicated jukebox defines (#19727)

2018-09-20 17:55:05 -04:00

action.dm

Bleeding-edge into role_datums, episode 3: revenge of git merge (#18712)

2018-07-03 04:28:11 -07:00

ai_laws.dm

Bleeding-edge into role_datums, episode 3: revenge of git merge (#18712)

2018-07-03 04:28:11 -07:00

alt_control.dm

[Cult 3.0] Spire, Forge, and Soul Blade (#19748)

2018-09-22 00:32:55 +01:00

browser.dm

…

circuits.dm

…

computerfiles.dm

…

datacore.dm

…

datumvars.dm

Role datums rebase (#19648)

2018-09-11 15:31:57 +01:00

disease.dm

…

emotes.dm

Role datums rebase (#19648)

2018-09-11 15:31:57 +01:00

feedback.dm

#warning -> #warn, episode 2, season finale (#19730)

2018-09-20 18:13:07 -04:00

locking_category.dm

…

map_elements.dm

Bleeding-edge into role_datums, episode 3: revenge of git merge (#18712)

2018-07-03 04:28:11 -07:00

mind.dm

Fixes Vampire things (#19826)

2018-09-30 14:10:01 -03:00

mixed.dm

Bleeding-edge into role_datums, episode 3: revenge of git merge (#18712)

2018-07-03 04:28:11 -07:00

modules.dm

…

profiling.dm

…

recipe.dm

Bleeding-edge into role_datums, episode 3: revenge of git merge (#18712)

2018-07-03 04:28:11 -07:00

recruiter.dm

…

religions.dm

Merge branch 'Bleeding-Edge' into SillYConvert

2018-09-27 00:34:30 +00:00

shuttle.dm

Role datums rebase (#19648)

2018-09-11 15:31:57 +01:00

sun.dm

…

supplypacks.dm

Merge remote-tracking branch 'pomfrepo/Bleeding-Edge' into role_datums_rebasaroo

2018-09-25 10:36:47 +01:00

tether.dm

…

ui_icons.dm

[Cult 3.0] Spire, Forge, and Soul Blade (#19748)

2018-09-22 00:32:55 +01:00

uplink_item.dm

Turns out a full rebase will show you what you've accidentally commented out

2018-09-25 15:47:38 +01:00