Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-05 04:34:54 +01:00
parent a726f09201 038f78bbcd
commit 5dc1de1d04
146 changed files with 1190 additions and 1257 deletions
@@ -64,7 +64,7 @@
 		if(!L)
 			return OXYLOSS

-		L.Remove(user)
+		L.Remove()

 		// make some colorful reagent, and apply it to the lungs
 		L.create_reagents(10)