Merge branch 'master' into cool-ipcs

2020-10-01 21:06:16 +01:00
parent 14e217082f 79b7ef0e62
commit 7726b0456c
522 changed files with 181605 additions and 92979 deletions
@@ -101,7 +101,7 @@
 	. = ..()
 	if(. & EMP_PROTECT_SELF)
 		return
-	var/wipe_chance = 60 / severity
+	var/wipe_chance = severity/1.5
 	if(prob(wipe_chance))
 		visible_message("<span class='warning'>[src] fizzles and disappears!</span>")
 		qdel(src) //rip cash
@@ -140,7 +140,7 @@
 /obj/item/defibrillator/emp_act(severity)
 	. = ..()
 	if(cell && !(. & EMP_PROTECT_CONTENTS))
-		deductcharge(1000 / severity)
+		deductcharge(severity*10)
 	if (. & EMP_PROTECT_SELF)
 		return
 	if(safety)
@@ -1206,7 +1206,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 			A.emp_act(severity)
 	if (!(. & EMP_PROTECT_SELF))
 		emped += 1
-		spawn(200 * severity)
+		spawn(2 * severity)
 			emped -= 1

 /proc/get_viewable_pdas()
@@ -225,7 +225,7 @@
 		if(C && istype(C) && C.bug == src)
 			if(!same_z_level(C))
 				return
-			C.emp_act(EMP_HEAVY)
+			C.emp_act(80)
 			C.bug = null
 			bugged_cameras -= C.c_tag
 		interact()
@@ -428,7 +428,7 @@
 		else
 			A.visible_message("<span class='danger'>[user] blinks \the [src] at \the [A].")
 		to_chat(user, "\The [src] now has [emp_cur_charges] charge\s.")
-		A.emp_act(EMP_HEAVY)
+		A.emp_act(80)
 	else
 		to_chat(user, "<span class='warning'>\The [src] needs time to recharge!</span>")
 	return
@@ -128,7 +128,7 @@
 	else if(istype(target, /obj/machinery/camera))
 		var/obj/machinery/camera/C = target
 		if(prob(effectchance * diode.rating))
-			C.emp_act(EMP_HEAVY)
+			C.emp_act(80)
 			outmsg = "<span class='notice'>You hit the lens of [C] with [src], temporarily disabling the camera!</span>"
 			log_combat(user, C, "EMPed", src)
 		else
@@ -113,8 +113,7 @@
 	if (loc != user)
 		return ..()
 	if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
-		ui_interact(user)
-		return
+		INVOKE_ASYNC(src, /datum.proc/ui_interact, user)

 /obj/item/storage/portable_chem_mixer/attack_self(mob/user)
 	if(loc == user)
@@ -718,8 +718,9 @@ GENETICS SCANNER
 			to_chat(user, "<span class='notice'>Pressure: [round(pressure,0.01)] kPa</span>")

 			for(var/id in air_contents.get_gases())
-				var/gas_concentration = air_contents.get_moles(id)/total_moles
-				to_chat(user, "<span class='notice'>[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 0.01)] mol)</span>")
+				if(air_contents.get_moles(id) >= 0.005)
+					var/gas_concentration = air_contents.get_moles(id)/total_moles
+					to_chat(user, "<span class='notice'>[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 0.01)] mol)</span>")
 			to_chat(user, "<span class='notice'>Temperature: [round(temperature - T0C,0.01)] &deg;C ([round(temperature, 0.01)] K)</span>")

 		else
@@ -261,4 +261,4 @@
 	if (!(. & EMP_PROTECT_SELF))
 		turn_off()
 		if(!iscyborg(loc))
-			deductcharge(1000 / severity, TRUE, FALSE)
+			deductcharge(severity*10, TRUE, FALSE)
@@ -351,7 +351,7 @@
 /obj/item/book/granter/spell/charge/recoil(mob/user)
 	..()
 	to_chat(user,"<span class='warning'>[src] suddenly feels very warm!</span>")
-	empulse(src, 1, 1)
+	empulse_using_range(src, 1)

 /obj/item/book/granter/spell/summonitem
 	spell = /obj/effect/proc_holder/spell/targeted/summonitem
@@ -7,5 +7,5 @@
 /obj/item/grenade/empgrenade/prime(mob/living/lanced_by)
 	. = ..()
 	update_mob()
-	empulse(src, 4, 10)
+	empulse_using_range(src, 14)
 	qdel(src)
@@ -7,7 +7,8 @@
 	activated = 1
 	var/toggled = FALSE
 	icon_state = "hijack"
-	var/eye_color
+	var/left_eye_color
+	var/right_eye_color
 	var/stealthmode = FALSE
 	var/stealthcooldown = 0
 	var/hijacking = FALSE
@@ -25,8 +26,10 @@
 		return
 	var/on = toggled && !stealthmode
 	var/mob/living/carbon/human/H = imp_in
-	H.eye_color = on ? "ff0" : eye_color
-	H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
+	H.left_eye_color = on ? "ff0" : left_eye_color
+	H.right_eye_color = on ? "ff0" : right_eye_color
+	H.dna.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK)
+	H.dna.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK)
 	H.update_body()

 /obj/item/implant/hijack/implant(mob/living/target, mob/user, silent = FALSE)
@@ -34,7 +37,8 @@
 		ADD_TRAIT(target, TRAIT_HIJACKER, "implant")
 		if (ishuman(target))
 			var/mob/living/carbon/human/H = target
-			eye_color = H.eye_color
+			left_eye_color = H.left_eye_color
+			right_eye_color = H.right_eye_color
 		return TRUE

 /obj/item/implant/hijack/removed(mob/living/source, silent = FALSE, special = 0)
@@ -49,7 +53,8 @@
 				apc.update_icon()
 		if (ishuman(source))
 			var/mob/living/carbon/human/H = source
-			H.eye_color = eye_color
+			H.left_eye_color = left_eye_color
+			H.right_eye_color = left_eye_color
 		return TRUE

 /obj/item/implant/hijack/proc/InterceptClickOn(mob/living/user,params,atom/object)
@@ -65,7 +65,7 @@
 /obj/item/implant/emp/activate()
 	. = ..()
 	uses--
-	empulse(imp_in, 3, 5)
+	empulse_using_range(imp_in, 7)
 	if(!uses)
 		qdel(src)

@@ -272,4 +272,3 @@
 	icon_state = "skub"
 	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("skubbed")
-
@@ -281,12 +281,12 @@
 			O.custom_name = created_name
 			O.locked = panel_locked
 			if(!aisync)
-				lawsync = 0
-				O.connected_ai = null
+				lawsync = FALSE
+				O.set_connected_ai(null)
 			else
 				O.notify_ai(NEW_BORG)
 				if(forced_ai)
-					O.connected_ai = forced_ai
+					O.set_connected_ai(forced_ai)
 			if(!lawsync)
 				O.lawupdate = 0
 				if(M.laws.id == DEFAULT_AI_LAWID)
@@ -337,10 +337,10 @@

 			if(!aisync)
 				lawsync = FALSE
-				O.connected_ai = null
+				O.set_connected_ai(null)
 			else
 				if(forced_ai)
-					O.connected_ai = forced_ai
+					O.set_connected_ai(forced_ai)
 				O.notify_ai(AI_SHELL)
 			if(!lawsync)
 				O.lawupdate = FALSE
@@ -269,8 +269,8 @@
 			to_chat(user, "<span class='notice'>[M] is at full health.</span>")
 			return FALSE
 		user.visible_message("<span class='green'>[user] applies \the [src] on [M].</span>", "<span class='green'>You apply \the [src] on [M].</span>")
-		return heal_carbon(M, user, heal_brute, heal_burn)
-
+		M.heal_bodypart_damage(heal_brute)
+		return TRUE
 	to_chat(user, "<span class='warning'>You can't heal [M] with \the [src]!</span>")

 /obj/item/stack/medical/ointment
@@ -2,6 +2,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("scooter frame", /obj/item/scooter_frame, 10, time = 25, one_per_turf = 0), \
+	new/datum/stack_recipe("railing", /obj/structure/railing, 3, time = 18, window_checks = TRUE), \
 	))

 /obj/item/stack/rods
@@ -179,6 +179,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 GLOBAL_LIST_INIT(plasteel_recipes, list ( \
 	new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = TRUE), \
 	new/datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 10, time = 50), \
+	new/datum/stack_recipe("micro powered fan assembly", /obj/machinery/fan_assembly, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
 	new /datum/stack_recipe_list("crates", list( \
 		new /datum/stack_recipe("gray crate", /obj/structure/closet/crate, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 		new /datum/stack_recipe("internals crate", /obj/structure/closet/crate/internals, 5, time = 50, one_per_turf = 1, on_floor = 1), \
@@ -232,9 +233,13 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
 GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
 	new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
-	new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
 	new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
 	null, \
+	new/datum/stack_recipe("wooden floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
+	new/datum/stack_recipe("large wooden floor tile", /obj/item/stack/tile/wood/wood_large, 1, 4, 20), \
+	new/datum/stack_recipe("tiled wooden floor tile", /obj/item/stack/tile/wood/wood_tiled, 1, 4, 20), \
+	new/datum/stack_recipe("diagonal wooden floor tile", /obj/item/stack/tile/wood/wood_diagonal, 1, 4, 20), \
+	null, \
 	new/datum/stack_recipe_list("pews", list(
 		new /datum/stack_recipe("pew (middle)", /obj/structure/chair/pew, 3, one_per_turf = TRUE, on_floor = TRUE),\
 		new /datum/stack_recipe("pew (left)", /obj/structure/chair/pew/left, 3, one_per_turf = TRUE, on_floor = TRUE),\
@@ -154,13 +154,31 @@

 //Wood
 /obj/item/stack/tile/wood
-	name = "wood floor tile"
+	name = "wooden plank floor tile"
 	singular_name = "wood floor tile"
 	desc = "An easy to fit wood floor tile."
 	icon_state = "tile-wood"
 	turf_type = /turf/open/floor/wood
 	resistance_flags = FLAMMABLE

+/obj/item/stack/tile/wood/wood_large
+	name = "large wooden plank floor tile"
+	singular_name = "large wooden plank floor tile"
+	icon_state = "tile-wood_large"
+	turf_type = /turf/open/floor/wood/wood_large
+
+/obj/item/stack/tile/wood/wood_tiled
+	name = "tiled wooden plank floor tile"
+	singular_name = "tiled wooden plank floor tile"
+	icon_state = "tile-wood_tile"
+	turf_type = /turf/open/floor/wood/wood_tiled
+
+/obj/item/stack/tile/wood/wood_diagonal
+	name = "diagonal wooden plank floor tile"
+	singular_name = "diagonal wooden plank floor tile"
+	icon_state = "tile-wood_diagonal"
+	turf_type = /turf/open/floor/wood/wood_diagonal
+
 //Cloth Floors

 /obj/item/stack/tile/padded
@@ -232,7 +232,7 @@
 	if (!(. & EMP_PROTECT_SELF))
 		switch_status(FALSE)
 		if(!iscyborg(loc))
-			deductcharge(1000 / severity, TRUE, FALSE)
+			deductcharge(severity*10, TRUE, FALSE)

 /obj/item/melee/baton/stunsword
 	name = "stunsword"
@@ -182,3 +182,20 @@

 /obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas()
 	return
+
+/*
+ * Methyl Bromide
+ */
+/obj/item/tank/internals/methyl_bromide
+	name = "mantid gas reactor"
+	desc = "A mantid gas processing plant that continuously synthesises 'breathable' atmosphere."
+	icon_state = "methyl_bromide"
+	slot_flags = ITEM_SLOT_BELT
+	w_class = WEIGHT_CLASS_SMALL
+	force = 6
+	distribute_pressure = 14
+	volume = 10
+
+/obj/item/tank/internals/methyl_bromide/populate_gas()
+	air_contents.set_moles(/datum/gas/methyl_bromide, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return