FalseIncarnate 36dec344fa Merge conflict fix

2018-04-20 02:04:01 -04:00

..

area

Merge pull request #8478 from Vivalas/fuck_air_alarms

2018-04-01 19:21:35 -07:00

dna

Removes All Weapons

2018-04-15 16:25:56 -04:00

gamemodes

Merge remote-tracking branch 'upstream/master' into remove-weapons

2018-04-19 17:01:38 -04:00

jobs

Merge remote-tracking branch 'upstream/master' into remove-weapons

2018-04-19 17:01:38 -04:00

machinery

Merge conflict fix

2018-04-20 02:04:01 -04:00

magic

no more runtimes

2018-03-29 00:44:53 -04:00

mecha

Merge remote-tracking branch 'upstream/master' into remove-weapons

2018-04-19 17:01:38 -04:00

objects

Merge conflict fix

2018-04-20 02:04:01 -04:00

turfs

Removes All Weapons

2018-04-15 16:25:56 -04:00

verbs

loose src

2018-01-25 16:14:30 +02:00

alternate_appearance.dm

…

asteroid.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

atoms_movable.dm

Ports TG's Garbage Subsystem

2018-03-28 20:02:39 -04:00

atoms.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

2018-03-04 13:52:55 +05:00

data_huds.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

response_team.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

shuttle_engines.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

skincmd.dm

…

smoothwall.dm

…

sound.dm

…