Merge remote-tracking branch 'upstream/master' into disco-inferno

code/game/objects/items/devices/flashlight.dm

@@ -75,7 +75,7 @@
 				var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
 				if(M.stat == DEAD || !eyes || M.disabilities & BLIND)	//mob is dead or fully blind
 					to_chat(user, "<span class='notice'>[M]'s pupils are unresponsive to the light!</span>")
-				else if((XRAY in M.mutations) || (eyes.colourblind_darkview && eyes.colourblind_darkview == eyes.get_dark_view())) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
+				else if((XRAY in M.mutations) || eyes.get_dark_view() >= 8) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
 					to_chat(user, "<span class='notice'>[M]'s pupils glow eerily!</span>")
 				else //they're okay!
 					if(M.flash_eyes(visual = 1))

code/game/objects/items/robot/robot_items.dm

@@ -36,198 +36,3 @@
 	name = "Overdrive"
 	icon = 'icons/obj/decals.dmi'
 	icon_state = "shock"
-
-#define BORG_HUG 0
-#define BORG_HUG_SUPER 1
-#define BORG_HUG_SHOCK 2
-#define BORG_HUG_CRUSH 3
-
-/obj/item/borg/cyborghug
-	name = "Hugging Module"
-	icon_state = "hugmodule"
-	desc = "For when a someone really needs a hug."
-	var/mode = BORG_HUG //0 = Hugs 1 = "Hug" 2 = Shock 3 = CRUSH
-	var/ccooldown = 0
-	var/scooldown = 0
-	var/shockallowed = FALSE//Can it be a stunarm when emagged. Only PK borgs get this by default.
-	var/boop = FALSE
-
-/obj/item/borg/cyborghug/attack_self(mob/living/user)
-	if(isrobot(user))
-		var/mob/living/silicon/robot/P = user
-		if(P.emagged && shockallowed)
-			if(mode < BORG_HUG_CRUSH)
-				mode++
-			else
-				mode = BORG_HUG
-		else if(mode < BORG_HUG_SUPER)
-			mode++
-		else
-			mode = BORG_HUG
-	switch(mode)
-		if(BORG_HUG)
-			to_chat(user, "<span class='notice'>Power reset. Hugs!</span>")
-		if(BORG_HUG_SUPER)
-			to_chat(user, "<span class='notice'>Power increased!</span>")
-		if(BORG_HUG_SHOCK)
-			to_chat(user, "<span class='warning'>BZZT. Electrifying arms...</span>")
-		if(BORG_HUG_CRUSH)
-			to_chat(user, "<span class='warning'>ERROR: ARM ACTUATORS OVERLOADED.</span>")
-
-/obj/item/borg/cyborghug/attack(mob/living/M, mob/living/silicon/robot/user)
-	if(M == user)
-		return
-	switch(mode)
-		if(BORG_HUG)
-			if(M.health >= config.health_threshold_crit)
-				if(user.zone_sel.selecting == "head")
-					user.visible_message("<span class='notice'>[user] playfully boops [M] on the head!</span>", \
-									"<span class='notice'>You playfully boop [M] on the head!</span>")
-					user.do_attack_animation(M)
-					playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
-				else if(ishuman(M))
-					if(M.lying)
-						user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
-										"<span class='notice'>You shake [M] trying to get \him up!</span>")
-					else
-						user.visible_message("<span class='notice'>[user] hugs [M] to make \him feel better!</span>", \
-								"<span class='notice'>You hug [M] to make \him feel better!</span>")
-					if(M.resting)
-						M.resting = FALSE
-						M.update_canmove()
-				else
-					user.visible_message("<span class='notice'>[user] pets [M]!</span>", \
-							"<span class='notice'>You pet [M]!</span>")
-				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-		if(BORG_HUG_SUPER)
-			if(M.health >= config.health_threshold_crit)
-				if(ishuman(M))
-					if(M.lying)
-						user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
-										"<span class='notice'>You shake [M] trying to get \him up!</span>")
-					else if(user.zone_sel.selecting == "head")
-						user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
-										"<span class='warning'>You bop [M] on the head!</span>")
-						user.do_attack_animation(M)
-					else
-						user.visible_message("<span class='warning'>[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...</span>", \
-								"<span class='warning'>You hug [M] firmly to make \him feel better! [M] looks uncomfortable...</span>")
-					if(M.resting)
-						M.resting = FALSE
-						M.update_canmove()
-				else
-					user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
-							"<span class='warning'>You bop [M] on the head!</span>")
-				playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
-		if(BORG_HUG_SHOCK)
-			if(!scooldown)
-				if(M.health >= config.health_threshold_crit)
-					if(ishuman(M))
-						M.electrocute_act(5, "[user]", safety = 1)
-						user.visible_message("<span class='userdanger'>[user] electrocutes [M] with their touch!</span>", \
-							"<span class='danger'>You electrocute [M] with your touch!</span>")
-						M.update_canmove()
-					else
-						if(!isrobot(M))
-							M.adjustFireLoss(10)
-							user.visible_message("<span class='userdanger'>[user] shocks [M]!</span>", \
-								"<span class='danger'>You shock [M]!</span>")
-						else
-							user.visible_message("<span class='userdanger'>[user] shocks [M]. It does not seem to have an effect</span>", \
-								"<span class='danger'>You shock [M] to no effect.</span>")
-					playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -1)
-					user.cell.charge -= 500
-					scooldown = TRUE
-					spawn(20)
-						scooldown = FALSE
-		if(BORG_HUG_CRUSH)
-			if(!ccooldown)
-				if(M.health >= config.health_threshold_crit)
-					if(ishuman(M))
-						user.visible_message("<span class='userdanger'>[user] crushes [M] in their grip!</span>", \
-							"<span class='danger'>You crush [M] in your grip!</span>")
-					else
-						user.visible_message("<span class='userdanger'>[user] crushes [M]!</span>", \
-								"<span class='danger'>You crush [M]!</span>")
-					playsound(loc, 'sound/weapons/smash.ogg', 50, 1, -1)
-					M.adjustBruteLoss(15)
-					user.cell.charge -= 300
-					ccooldown = TRUE
-					spawn(10)
-						ccooldown = FALSE
-
-#undef BORG_HUG
-#undef BORG_HUG_SUPER
-#undef BORG_HUG_SHOCK
-#undef BORG_HUG_CRUSH
-
-/obj/item/borg/cyborghug/peacekeeper
-	shockallowed = TRUE
-
-/obj/item/device/harmalarm
-	name = "Sonic Harm Prevention Tool"
-	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
-	icon_state = "megaphone"
-	var/cooldown = 0
-	var/emagged = FALSE
-
-/obj/item/device/harmalarm/emag_act(mob/user)
-	emagged = !emagged
-	if(emagged)
-		to_chat(user, "<span class='warning'>You short out the safeties on the [src]!</span>")
-	else
-		to_chat(user, "<span class='warning'>You reset the safeties on the [src]!</span>")
-
-/obj/item/device/harmalarm/attack_self(mob/user)
-	var/safety = !emagged
-	if(cooldown > world.time)
-		to_chat(user, "<span class='warning'>The device is still recharging!</span>")
-		return
-
-	if(isrobot(user))
-		var/mob/living/silicon/robot/R = user
-		if(R.cell.charge < 1200)
-			to_chat(user, "<span class='warning'>You don't have enough charge to do this!</span>")
-			return
-		R.cell.charge -= 1000
-		if(R.emagged)
-			safety = FALSE
-
-	if(safety)
-		user.visible_message("<span class='danger'>[user] blares out a near-deafening siren from its speakers!</span>")
-		for(var/mob/living/carbon/M in get_mobs_in_view(9, user))
-			if(!M.check_ear_prot())
-				M.AdjustConfused(6)
-				to_chat(M, "<span class='userdanger'>The siren pierces your hearing!</span>")
-		audible_message("<span class='biggerdanger'>HUMAN HARM</span>")
-		playsound(get_turf(src), 'sound/AI/harmalarm.ogg', 70, 3)
-		cooldown = world.time + 200
-		log_game("[key_name(user)] used a Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
-		if(isrobot(user))
-			var/mob/living/silicon/robot/R = user
-			if(R.connected_ai)
-				to_chat(R.connected_ai, "<br><span class='notice'>NOTICE - Peacekeeping 'HARM ALARM' used by: [user]</span><br>")
-
-		return
-
-	user.audible_message("<span class='biggerdanger'>BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT</span>")
-	for(var/mob/living/carbon/human/H in get_mobs_in_view(9, user))
-		if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf)
-			continue
-		var/earsafety = FALSE
-		if(H.check_ear_prot())
-			earsafety = TRUE
-
-		if(earsafety)
-			H.AdjustConfused(5)
-			H.AdjustStuttering(10)
-			H.Jitter(10)
-		else
-			H.Weaken(2)
-			H.AdjustConfused(10)
-			H.AdjustStuttering(15)
-			H.Jitter(25)
-
-	playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
-	cooldown = world.time + 600
-	log_game("[key_name(user)] used an emagged Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")

code/game/objects/items/weapons/RSF.dm

@@ -84,76 +84,3 @@ RSF
 	playsound(loc, 'sound/machines/click.ogg', 10, 1)
 	var/type_path = configured_items[mode][3]
 	new type_path(spawn_location)
-
-/obj/item/weapon/cookiesynth
-	name = "\improper Cookie Synthesizer"
-	desc = "A self-recharging device used to rapidly deploy cookies."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "rcd"
-	var/matter = 10
-	var/toxin = FALSE
-	var/cooldown = 0
-	var/cooldowndelay = 10
-	var/emagged = FALSE
-	w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/weapon/cookiesynth/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It currently holds [matter]/10 cookie-units.</span>")
-
-/obj/item/weapon/cookiesynth/attackby()
-	return
-
-/obj/item/weapon/cookiesynth/emag_act(mob/user)
-	emagged = !emagged
-	if(emagged)
-		to_chat(user, "<span class='warning'>You short out [src]'s reagent safety checker!</span>")
-	else
-		to_chat(user, "<span class='warning'>You reset [src]'s reagent safety checker!</span>")
-		toxin = FALSE
-
-/obj/item/weapon/cookiesynth/attack_self(mob/user)
-	var/mob/living/silicon/robot/P = null
-	if(isrobot(user))
-		P = user
-	if(emagged && !toxin)
-		toxin = TRUE
-		to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
-	else if(P.emagged && !toxin)
-		toxin = TRUE
-		to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
-	else
-		toxin = FALSE
-		to_chat(user, "<span class='notice'>Cookie Synthesizer Reset.</span>")
-
-/obj/item/weapon/cookiesynth/process()
-	if(matter < 10)
-		matter++
-
-/obj/item/weapon/cookiesynth/afterattack(atom/A, mob/user, proximity)
-	if(cooldown > world.time)
-		return
-	if(!proximity)
-		return
-	if(!(istype(A, /obj/structure/table) || isfloorturf(A)))
-		return
-	if(matter < 1)
-		to_chat(user, "<span class='warning'>[src] doesn't have enough matter left. Wait for it to recharge!</span>")
-		return
-	if(isrobot(user))
-		var/mob/living/silicon/robot/R = user
-		if(!R.cell || R.cell.charge < 400)
-			to_chat(user, "<span class='warning'>You do not have enough power to use [src].</span>")
-			return
-	var/turf/T = get_turf(A)
-	playsound(loc, 'sound/machines/click.ogg', 10, 1)
-	to_chat(user, "Fabricating Cookie..")
-	var/obj/item/weapon/reagent_containers/food/snacks/cookie/S = new /obj/item/weapon/reagent_containers/food/snacks/cookie(T)
-	if(toxin)
-		S.reagents.add_reagent("pancuronium", 2.4)
-	if(isrobot(user))
-		var/mob/living/silicon/robot/R = user
-		R.cell.charge -= 100
-	else
-		matter--
-	cooldown = world.time + cooldowndelay

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -37,7 +37,7 @@
 			var/mob/living/carbon/human/H = M
 			var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
 			if(E)
-				E.take_damage(8, 1)
+				E.receive_damage(8, 1)
 
 	if(M.flash_eyes(affect_silicon = 1))
 		M.Stun(max(10/distance, 3))

code/game/objects/items/weapons/lighters.dm

@@ -50,7 +50,7 @@
 					if(ishuman(M))
 						var/mob/living/carbon/human/H = M
 						var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
-						if(affecting.take_damage( 0, 5 ))		//INFERNO
+						if(affecting.receive_damage( 0, 5 ))		//INFERNO
 							H.UpdateDamageIcon()
 							H.updatehealth()
 					user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src], they however burn their finger in the process.</span>")

code/game/objects/items/weapons/shards.dm

@@ -47,7 +47,7 @@
 			if(affecting.status & ORGAN_ROBOT)
 				return
 			to_chat(H, "<span class='warning'>[src] cuts into your hand!</span>")
-			if(affecting.take_damage(force*0.5))
+			if(affecting.receive_damage(force*0.5))
 				H.UpdateDamageIcon()
 				H.updatehealth()
 
@@ -84,7 +84,7 @@
 				if(affecting.status & ORGAN_ROBOT)
 					return
 				H.Weaken(3)
-				if(affecting.take_damage(5, 0))
+				if(affecting.receive_damage(5, 0))
 					H.UpdateDamageIcon()
 				H.updatehealth()
 	..()

code/game/objects/items/weapons/storage/firstaid.dm

@@ -165,12 +165,12 @@
 /obj/item/weapon/storage/firstaid/tactical/New()
 	..()
 	if(empty) return
-	new /obj/item/clothing/accessory/stethoscope( src )
-	new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
 	new /obj/item/weapon/reagent_containers/hypospray/combat(src)
-	new /obj/item/weapon/reagent_containers/food/pill/patch/styptic(src)
-	new /obj/item/weapon/reagent_containers/food/pill/patch/silver_sulf(src)
-	new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src) // Because you ain't got no time to look at what damage dey taking yo
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src)
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src)
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src)
+	new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
 	new /obj/item/clothing/glasses/hud/health/night(src)
 	return
 

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -1,9 +1,7 @@
 /* Weapons
  * Contains:
  *		Banhammer
- *		Sword
  *		Classic Baton
- *		Energy Shield
  */
 
 /*