Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE

I JUST CONFLICTED EVERYTHING
This commit is contained in:
variableundefined
2019-01-31 11:03:33 +08:00
committed by GitHub
271 changed files with 347 additions and 347 deletions
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1)
..()
if(!istype(S1, /obj/docking_port/stationary/transit))
playsound(get_turf(src.loc), 'sound/effects/Explosion1.ogg',50,1)
playsound(get_turf(src.loc), 'sound/effects/explosion1.ogg',50,1)