Merge branch 'master' into wound-port

2020-07-21 01:10:51 +01:00
parent 037cec508e b6f689b06d
commit 75a2035774
105 changed files with 695 additions and 263 deletions
@@ -781,9 +781,8 @@
 		/obj/item/toy/crayon/spraycan/borg,
 		/obj/item/hand_labeler/borg,
 		/obj/item/razor,
-		/obj/item/rsf,
-		/obj/item/instrument/violin,
-		/obj/item/instrument/guitar,
+		/obj/item/rsf/cyborg,
+		/obj/item/instrument/piano_synth,
 		/obj/item/reagent_containers/dropper,
 		/obj/item/lighter,
 		/obj/item/storage/bag/tray,
@@ -589,6 +589,8 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 /mob/Stat()
 	..()

+	SSvote?.render_statpanel(src)
+
 	//This is only called from client/Stat(), let's assume client exists.

 	if(statpanel("Status"))