Qustinnus 2312ff09be Fixing conflicts

2017-07-19 11:19:52 +02:00

..

camera

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

dead

Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#28551)

2017-07-17 12:13:03 +12:00

living

Fixing conflicts

2017-07-19 11:19:52 +02:00

death.dm

…

inventory.dm

Variable renames, some sets

2017-06-19 11:17:15 -04:00

login.dm

Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#28551)

2017-07-17 12:13:03 +12:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Fixing conflicts

2017-07-19 11:19:52 +02:00

mob_helpers.dm

Better

2017-05-27 10:46:10 -03:00

mob_movement.dm

Removes old height parameter from CanPass proc (#29218)

2017-07-13 08:57:25 -03:00

mob_transformation_simple.dm

…

mob.dm

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

say_readme.dm

…

say.dm

…

status_procs.dm

Fixing conflicts

2017-07-19 11:19:52 +02:00

transform_procs.dm

Disease Refactor (#29130)

2017-07-15 11:08:40 -04:00

update_icons.dm

…