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

2019-10-24 09:50:20 +02:00
parent 6c34a51ff4 7011533bb7
commit 4c8d7023c5
134 changed files with 2374 additions and 1101 deletions
@@ -756,7 +756,6 @@ Turf and target are separate in case you want to teleport some distance from a t
 		loc = loc.loc
 	return null

-
 //For objects that should embed, but make no sense being is_sharp or is_pointed()
 //e.g: rods
 GLOBAL_LIST_INIT(can_embed_types, typecacheof(list(