Merge branch 'master' of https://github.com/tgstation/-tg-station int…

…o crafting-tgui

Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js

code/datums/material_container.dm

@@ -219,62 +219,47 @@
 
 
 /datum/material
+	var/name
 	var/amount = 0
 	var/material_type = null
 	var/sheet_type = null
 
 /datum/material/metal
-
-/datum/material/metal/New()
-	..()
+	name = "Metal"
 	material_type = MAT_METAL
 	sheet_type = /obj/item/stack/sheet/metal
 
 /datum/material/glass
-
-/datum/material/glass/New()
-	..()
+	name = "Glass"
 	material_type = MAT_GLASS
 	sheet_type = /obj/item/stack/sheet/glass
 
 /datum/material/silver
-
-/datum/material/silver/New()
-	..()
+	name = "Silver"
 	material_type = MAT_SILVER
 	sheet_type = /obj/item/stack/sheet/mineral/silver
 
 /datum/material/gold
-
-/datum/material/gold/New()
-	..()
+	name = "Gold"
 	material_type = MAT_GOLD
 	sheet_type = /obj/item/stack/sheet/mineral/gold
 
 /datum/material/diamond
-
-/datum/material/diamond/New()
-	..()
+	name = "Diamond"
 	material_type = MAT_DIAMOND
 	sheet_type = /obj/item/stack/sheet/mineral/diamond
 
 /datum/material/uranium
-
-/datum/material/uranium/New()
-	..()
+	name = "Uranium"
 	material_type = MAT_URANIUM
 	sheet_type = /obj/item/stack/sheet/mineral/uranium
 
 /datum/material/plasma
-
-/datum/material/plasma/New()
-	..()
+	name = "Solid Plasma"
 	material_type = MAT_PLASMA
 	sheet_type = /obj/item/stack/sheet/mineral/plasma
 
 /datum/material/bananium
-
-/datum/material/bananium/New()
-	..()
+	name = "Bananium"
 	material_type = MAT_BANANIUM
 	sheet_type = /obj/item/stack/sheet/mineral/bananium

code/game/gamemodes/demon/true_demon/_true_demon.dm

@@ -99,10 +99,9 @@
 	return 666
 
 /mob/living/carbon/true_devil/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
-	if(mind && mind.devilinfo.bane == BANE_LIGHT)
-		if(has_bane(BANE_LIGHT))
-			mind.disrupt_spells(-500)
-			return ..() //flashes don't stop devils UNLESS it's their bane.
+	if(mind && has_bane(BANE_LIGHT))
+		mind.disrupt_spells(-500)
+		return ..() //flashes don't stop devils UNLESS it's their bane.
 
 
 /mob/living/carbon/true_devil/attacked_by(obj/item/I, mob/living/user, def_zone)
@@ -129,11 +128,6 @@
 /mob/living/carbon/true_devil/Process_Spacemove(movement_dir = 0)
 	return 1
 
-/mob/living/carbon/true_devil/ex_act(severity)
-	if(ascended)
-		return 0
-	return ..()
-
 /mob/living/carbon/true_devil/singularity_act()
 	if(ascended)
 		return 0
@@ -194,3 +188,18 @@
 
 /mob/living/carbon/true_devil/is_literate()
 	return 1
+
+/mob/living/carbon/true_devil/ex_act(severity, ex_target)
+	if(!ascended)
+		var/b_loss
+		switch (severity)
+			if (1)
+				b_loss = 500
+			if (2)
+				b_loss = 150
+			if(3)
+				b_loss = 30
+		if(has_bane(BANE_LIGHT))
+			b_loss *=2
+		adjustBruteLoss(b_loss)
+	return ..()

code/game/machinery/vending.dm

@@ -84,7 +84,8 @@
 							/obj/machinery/vending/snack = "Getmore Chocolate Corp",
 							/obj/machinery/vending/cola = "Robust Softdrinks",
 							/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
-							/obj/machinery/vending/autodrobe = "AutoDrobe")
+							/obj/machinery/vending/autodrobe = "AutoDrobe",
+							/obj/machinery/vending/clothing = "ClothesMate")
 
 /obj/item/weapon/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/screwdriver))

code/game/objects/items/crayons.dm

@@ -494,6 +494,7 @@
 	icon_capped = "spraycan_cap"
 	icon_uncapped = "spraycan"
 	use_overlays = TRUE
+	paint_color = null
 
 	item_state = "spraycan"
 	desc = "A metallic container containing tasty paint."
@@ -540,7 +541,7 @@
 /obj/item/toy/crayon/spraycan/New()
 	..()
 	// If default crayon red colour, pick a more fun spraycan colour
-	if(paint_color == "#FF0000")
+	if(!paint_color)
 		paint_color = pick("#DA0000","#FF9300","#FFF200","#A8E61D","#00B7EF",
 		"#DA00FF")
 	refill()

code/modules/mob/living/carbon/human/blood.dm

@@ -227,7 +227,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 	if (!injected || !our || !dna)
 		return
 
-	if (!(injected.data["blood_type"] in get_safe_blood(dna.blood_type)) || injected.data["species"] != dna.species.id)
+	if (!(injected.data["blood_type"] in get_safe_blood(dna.blood_type)) || (injected.data["species"] && injected.data["species"] != dna.species.id))
 		reagents.add_reagent("toxin",amount * 0.5)
 		our.on_merge(injected.data) //still transfer viruses and such, even if incompatibles bloods
 		reagents.update_total()
@@ -255,7 +255,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 		if("A-")
 			return list("A-", "O-")
 		if("A+")
-			return list("A", "A+", "O-", "O+")
+			return list("A-", "A+", "O-", "O+")
 		if("B-")
 			return list("B-", "O-")
 		if("B+")

code/modules/mob/living/simple_animal/guardian/types/ranged.dm

@@ -73,7 +73,7 @@
 	set desc = "Set an invisible snare that will alert you when living creatures walk over it. Max of 5"
 	if(src.snares.len <6)
 		var/turf/snare_loc = get_turf(src.loc)
-		var/obj/item/effect/snare/S = new /obj/item/effect/snare(snare_loc)
+		var/obj/effect/snare/S = new /obj/effect/snare(snare_loc)
 		S.spawner = src
 		S.name = "[get_area(snare_loc)] snare ([rand(1, 1000)])"
 		src.snares |= S
@@ -91,14 +91,14 @@
 		qdel(picked_snare)
 		src << "<span class='danger'><B>Snare disarmed.</span></B>"
 
-/obj/item/effect/snare
+/obj/effect/snare
 	name = "snare"
 	desc = "You shouldn't be seeing this!"
 	var/mob/living/simple_animal/hostile/guardian/spawner
 	invisibility = INVISIBILITY_ABSTRACT
 
 
-/obj/item/effect/snare/Crossed(AM as mob|obj)
+/obj/effect/snare/Crossed(AM as mob|obj)
 	if(isliving(AM) && spawner && spawner.summoner && AM != spawner && !spawner.hasmatchingsummoner(AM))
 		spawner.summoner << "<span class='danger'><B>[AM] has crossed surveillance snare, [name].</span></B>"
 		var/list/guardians = spawner.summoner.hasparasites()

code/modules/projectiles/guns/energy/special.dm

@@ -229,6 +229,8 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/plasma)
 	flags = CONDUCT | OPENCONTAINER
 	attack_verb = list("attacked", "slashed", "cut", "sliced")
+	force = 12
+	sharpness = IS_SHARP
 	can_charge = 0
 	heat = 3800
 
@@ -257,6 +259,7 @@
 	name = "advanced plasma cutter"
 	icon_state = "adv_plasmacutter"
 	origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2"
+	force = 15
 	ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
 
 /obj/item/weapon/gun/energy/wormhole_projector

code/modules/projectiles/projectile.dm

@@ -8,6 +8,7 @@
 	mouse_opacity = 0
 	hitsound = 'sound/weapons/pierce.ogg'
 	pressure_resistance = INFINITY
+	burn_state = LAVA_PROOF
 	var/def_zone = ""	//Aiming at
 	var/mob/firer = null//Who shot it
 	var/obj/item/ammo_casing/ammo_casing = null

code/modules/projectiles/projectile/special.dm

@@ -141,7 +141,7 @@
 	..()
 
 /obj/item/projectile/kinetic/on_range()
-	new /obj/item/effect/kinetic_blast(src.loc)
+	new /obj/effect/kinetic_blast(src.loc)
 	..()
 
 /obj/item/projectile/kinetic/on_hit(atom/target)
@@ -150,21 +150,21 @@
 	if(istype(target_turf, /turf/closed/mineral))
 		var/turf/closed/mineral/M = target_turf
 		M.gets_drilled(firer)
-	new /obj/item/effect/kinetic_blast(target_turf)
+	new /obj/effect/kinetic_blast(target_turf)
 	if(src.splash)
 		for(var/turf/T in range(splash, target_turf))
 			if(istype(T, /turf/closed/mineral))
 				var/turf/closed/mineral/M = T
 				M.gets_drilled(firer)
 
 
-/obj/item/effect/kinetic_blast
+/obj/effect/kinetic_blast
 	name = "kinetic explosion"
 	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "kinetic_blast"
 	layer = 4.1
 
-/obj/item/effect/kinetic_blast/New()
+/obj/effect/kinetic_blast/New()
 	spawn(4)
 		qdel(src)
 
@@ -218,7 +218,7 @@
 	icon_state = "plasmacutter"
 	damage_type = BRUTE
 	damage = 5
-	range = 3
+	range = 5
 
 /obj/item/projectile/plasma/New()
 	var/turf/proj_turf = get_turf(src)
@@ -227,22 +227,24 @@
 	var/datum/gas_mixture/environment = proj_turf.return_air()
 	if(environment)
 		var/pressure = environment.return_pressure()
-		if(pressure < 30)
+		if(pressure < 60)
 			name = "full strength plasma blast"
-			damage *= 3
+			damage *= 4
 	..()
 
 /obj/item/projectile/plasma/on_hit(atom/target)
 	. = ..()
 	if(istype(target, /turf/closed/mineral))
 		var/turf/closed/mineral/M = target
 		M.gets_drilled(firer)
-		range = max(range - 1, 1)
-		return -1
+		Range()
+		if(range > 0)
+			return -1
 
 /obj/item/projectile/plasma/adv
-	range = 5
+	damage = 7
+	range = 7
 
 /obj/item/projectile/plasma/adv/mech
 	damage = 10
-	range = 6
+	range = 8