Fox McCloudandGitHub ce773d22a2 Merge pull request #5346 from KasparoVy/locker_z_level_voodoo_fix ...

Fixes Accidental Greentext for Maroon and Redtext for Assassination Objectives, Resolves #5306

2016-08-07 20:01:29 -04:00

..

area

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

dna

only sergey can stop white space abuse

2016-08-04 19:25:21 +01:00

gamemodes

get_turf instead of snowflake_check

2016-08-06 16:10:06 -04:00

jobs

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

machinery

Merge pull request #5304 from Ar3nn/teleshock

2016-08-05 19:34:42 -04:00

magic

…

mecha

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

objects

No locker permastuns.

2016-08-07 11:48:09 -04:00

turfs

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

verbs

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

alternate_appearance.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

asteroid.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

atoms_movable.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

atoms.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

data_huds.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

response_team.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

shuttle_engines.dm

…

skincmd.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

smoothwall.dm

…

sound.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00