Zuhayr 5989a0c625 Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

..

beast

…

computer2

Merge remote-tracking branch 'upstream/master' into dev

2014-09-10 22:14:37 +01:00

disease2

…

gamemodes

…

hivebot

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

mining

…

optics

…

pda2

Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize().

2014-08-26 00:03:18 +02:00

powerarmor

…

spacecraft

…

_debug.dm

…

Agouri_stuff.dm

…

ai_lockdown.dm

…

AI_Visibility.dm

…

airtunnel.dm

…

assemblies.dm

…

asteroiddevice.dm

…

authorize.dm

…

blender.dm

…

BrokenInhands.dm

…

carpetsplosion.dm

…

conveyor.dm

…

dna_mutations.dm

…

dna.dm

…

filter_control.dm

…

game_kit.dm

…

heater.dm

…

jobs.dm

…

musicplayer.dm

…

new_year.dm

…

newcombatsystem.dm

…

pipe_filter.dm

…

pipe.dm

…

scrap.dm

…

shuttle_engines.dm

…

siphs.dm

…

spells.dm

…

tensioner.dm

…

toilets.dm

…

traps.dm

…

travel.dm

…

Ultralight.dm

…

vehicle.dm

…

Virus2Prob.dm

…