Arkatos1 6b2add6eb9 Deconflict

2019-08-26 18:53:55 +02:00

..

carbon

Merge pull request #11797 from Couls/blood-changes

2019-08-26 06:41:39 -04:00

silicon

Deconflict

2019-08-26 18:53:55 +02:00

simple_animal

Merge remote-tracking branch 'upstream/master' into hardsuit-helmet

2019-08-25 18:15:10 -04:00

autohiss.dm

…

damage_procs.dm

Major Lavaland Update

2019-08-10 22:36:55 -04:00

death.dm

Merge

2019-05-09 17:06:35 +01:00

default_language.dm

…

life.dm

Merge pull request #11606 from Markolie/ghostqol

2019-08-11 16:23:23 +08:00

living_defense.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

living_defines.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

living.dm

Per Couls advice, removed the CanSuccumb verb and now borgs are considered InCritical when in low power mode

2019-08-11 23:45:49 -04:00

login.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

logout.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

say.dm

GHOST_EARS/SIGHT improvements

2019-06-03 19:40:48 +02:00

stat_states.dm

…

status_procs.dm

Fixes Stun Absorbtion Not Working

2019-08-23 16:57:18 -04:00

update_status.dm

nevermind, just generic fixes

2019-05-08 20:15:24 -04:00