ikarrus e73586dadf Resolved Conflicts: ...

code/modules/security levels/keycard authentication.dm

2014-03-18 00:17:22 -06:00

..

__DEFINES

Fixes bullet_act not checking for damagetype on many, many objects.

2014-03-01 16:39:22 -08:00

__HELPERS

Merge pull request #3081 from ChuckTheSheep/Recursive-Fixes-and-Deaf-Bug-Fix

2014-03-17 22:06:09 -05:00

_globalvars

…

_onclick

Changed around the way things are attacked by objects and got rid of the tapping message as it can screw with afterattack stuff.

2014-03-07 03:19:12 -08:00

ATMOSPHERICS

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

controllers

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

datums

Resolved Conflicts:

2014-03-18 00:17:22 -06:00

defines

Added better sprites

2014-03-02 04:59:14 +04:00

game

Resolved Conflicts:

2014-03-18 00:17:22 -06:00

js

…

LINDA

Removes a now useless var from the atmos excited groups and makes hotspots use the correct proc to reset the breakdown cooldown

2014-03-06 06:14:01 -03:00

modules

Resolved Conflicts:

2014-03-18 00:17:22 -06:00

unused

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

WorkInProgress

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

_compile_options.dm

This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.

2014-02-27 10:56:06 -08:00

hub.dm

…

world.dm

…