Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning

modular_citadel/code/game/objects/items.dm

@@ -11,4 +11,7 @@
 	alternate_screams = list('modular_citadel/sound/voice/scream_silicon.ogg')
 
 /obj/item/clothing/head/ushanka
-	alternate_screams = list('modular_citadel/sound/misc/cyka1.ogg', 'modular_citadel/sound/misc/cheekibreeki.ogg')
+	alternate_screams = list('modular_citadel/sound/misc/cyka1.ogg', 'modular_citadel/sound/misc/cheekibreeki.ogg')
+
+/obj/item/proc/grenade_prime_react(obj/item/grenade/nade)
+	return

modular_citadel/code/game/objects/items/balls.dm

@@ -16,7 +16,7 @@
 	righthand_file = 'modular_citadel/icons/mob/inhands/balls_right.dmi'
 	item_state = "tennis_classic"
 	alternate_worn_icon = 'modular_citadel/icons/mob/mouthball.dmi'
-	slot_flags = SLOT_HEAD | SLOT_NECK | SLOT_EARS	//Fluff item, put it wherever you want!
+	slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_NECK | ITEM_SLOT_EARS	//Fluff item, put it wherever you want!
 	throw_range = 14
 	w_class = WEIGHT_CLASS_SMALL
 

modular_citadel/code/game/objects/items/melee/misc.dm

@@ -45,7 +45,7 @@
 					return
 			playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
 			target.Knockdown(softstun_ds, TRUE, FALSE, hardstun_ds, stam_dmg)
-			add_logs(user, target, "stunned", src)
+			log_combat(user, target, "stunned", src)
 			src.add_fingerprint(user)
 			target.visible_message("<span class ='danger'>[user] has knocked down [target] with [src]!</span>", \
 				"<span class ='userdanger'>[user] has knocked down [target] with [src]!</span>")

modular_citadel/code/game/objects/items/robot/robot_upgrades.dm

@@ -0,0 +1,30 @@
+//V-tech kicked in yo
+/obj/effect/proc_holder/silicon/cyborg/vtecControl
+	name = "vTec Control"
+	desc = "Allows finer-grained control of the vTec speed boost."
+	action_icon = 'icons/mob/actions.dmi'
+	action_icon_state = "Chevron_State_0"
+
+	var/currentState = 0
+	var/maxReduction = 2
+
+
+/obj/effect/proc_holder/silicon/cyborg/vtecControl/Click(mob/living/silicon/robot/user)
+
+	var/mob/living/silicon/robot/self = usr
+
+	currentState = (currentState + 1) % 3
+
+	if(usr)
+		switch(currentState)
+			if (0)
+				self.speed += maxReduction
+			if (1)
+				self.speed -= maxReduction*0.5
+			if (2)
+				self.speed -= maxReduction*0.5
+
+	action.button_icon_state = "Chevron_State_[currentState]"
+	action.UpdateButtonIcon()
+
+	return