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

2021-02-12 13:18:09 +08:00
parent 92eb4fb684 891f00bc48
commit a2419f760a
118 changed files with 1105 additions and 196 deletions
@@ -33,6 +33,7 @@
 /datum/sabotage_objective/processing/check_conditions()
 	return won

+/*
 /datum/sabotage_objective/processing/power_sink
 	name = "Drain at least 100 megajoules of power using a power sink."
 	sabotage_type = "powersink"
@@ -44,6 +45,7 @@
 	for(var/s in GLOB.power_sinks)
 		var/obj/item/powersink/sink = s
 		won = max(won,sink.power_drained/1e8)
+*/

 /obj/item/paper/guides/antag/supermatter_sabotage
 	info = "Ways to sabotage a supermatter:<br>\