Merge remote-tracking branch 'origin/master' into hardsync-1.5

2021-02-16 19:41:53 +08:00
parent 78ef87b012 975c98731e
commit 3f40e353aa
71 changed files with 513 additions and 171 deletions
@@ -36,6 +36,6 @@
 	log_combat(owner, null, "swallowed an implanted pill", target)
 	if(target.reagents.total_volume)
 		target.reagents.reaction(owner, INGEST)
-		target.reagents.trans_to(owner, target.reagents.total_volume, log = TRUE)
+		target.reagents.trans_to(owner, target.reagents.total_volume, log = "dental pill swallow")
 	qdel(target)
 	return 1