Mieszko Jędrzejczak 22a753957d Conflicts!

2017-04-16 19:21:20 +02:00

..

area

Merge pull request #6932 from uraniummeltdown/metastation

2017-03-26 19:34:38 -04:00

dna

Merge pull request #6591 from Crazylemon64/ipc_power_cord

2017-03-07 22:25:11 -05:00

gamemodes

Merge pull request #6867 from FalseIncarnate/potato

2017-04-16 10:12:15 -07:00

jobs

Loyalty implant -> Mindshield Implant

2017-04-09 16:50:51 +01:00

machinery

Merge pull request #7080 from SamHPurp/loyalty-to-mindshield

2017-04-11 19:50:59 -04:00

magic

…

mecha

Merge pull request #7061 from Fox-McCloud/damn-cells

2017-04-09 13:55:30 -07:00

objects

Fluffpocalypse

2017-04-15 22:05:15 +02:00

turfs

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

verbs

Removes 'Moderator' from Adminwho

2017-03-17 03:15:20 +00:00

alternate_appearance.dm

…

asteroid.dm

effect/glowshroom to structure/glowshroom

2017-03-27 18:52:19 -03:00

atoms_movable.dm

…

atoms.dm

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

data_huds.dm

Loyalty implant -> Mindshield Implant

2017-04-09 16:50:51 +01:00

response_team.dm

Loyalty implant -> Mindshield Implant

2017-04-09 16:50:51 +01:00

shuttle_engines.dm

removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA

2017-03-10 22:46:02 +04:00

skincmd.dm

…

smoothwall.dm

effect/glowshroom to structure/glowshroom

2017-03-27 18:52:19 -03:00

sound.dm

…