Merge branch 'pr/21'

2019-07-29 22:57:40 +01:00
parent 5e5f2fea54 3d597ea508
commit fbbc4d8589
56 changed files with 930 additions and 367 deletions
@@ -244,6 +244,7 @@
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
 	item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL | NOBLUDGEON
+	slot_flags = NONE
 	flags_1 = NONE
 	w_class = WEIGHT_CLASS_HUGE
 	ammo_type = /obj/item/ammo_casing/magic/tentacle
@@ -88,9 +88,9 @@ Shaft Miner
 	gloves = /obj/item/clothing/gloves/color/black
 	uniform = /obj/item/clothing/under/rank/miner/lavaland
 	l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
-	r_pocket = /obj/item/flashlight/seclite
+	r_pocket = /obj/item/storage/bag/ore	//causes issues if spawned in backpack
 	backpack_contents = list(
-		/obj/item/storage/bag/ore=1,\
+		/obj/item/flashlight/seclite=1,\
 		/obj/item/kitchen/knife/combat/survival=1,\
 		/obj/item/mining_voucher=1,\
 		/obj/item/suit_voucher=1,\
@@ -116,7 +116,7 @@ Shaft Miner
 	suit_store = /obj/item/tank/internals/oxygen
 	internals_slot = SLOT_S_STORE
 	backpack_contents = list(
-		/obj/item/storage/bag/ore=1,
+		/obj/item/flashlight/seclite=1,\
 		/obj/item/kitchen/knife/combat/survival=1,
 		/obj/item/mining_voucher=1,
 		/obj/item/t_scanner/adv_mining_scanner/lesser=1,
@@ -899,12 +899,9 @@
 		stop_pulling()

 /mob/living/carbon/human/proc/is_shove_knockdown_blocked() //If you want to add more things that block shove knockdown, extend this
-	var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, ears, wear_id) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor)
-	for(var/bp in body_parts)
-		if(istype(bp, /obj/item/clothing))
-			var/obj/item/clothing/C = bp
-			if(C.blocks_shove_knockdown)
-				return TRUE
+	for(var/obj/item/clothing/C in get_equipped_items()) //doesn't include pockets
+		if(C.blocks_shove_knockdown)
+			return TRUE
 	return FALSE

 /mob/living/carbon/human/proc/clear_shove_slowdown()
@@ -14,7 +14,8 @@
 	damage_overlay_type = ""
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs
 	var/datum/action/innate/slime_change/slime_change	//CIT CHANGE
-	liked_food = MEAT
+	liked_food = TOXIC | MEAT
+	toxic_food = null
 	coldmod = 6   // = 3x cold damage
 	heatmod = 0.5 // = 1/4x heat damage
 	burnmod = 0.5 // = 1/2x generic burn damage
@@ -102,12 +102,9 @@
 		updateUsrDialog()
 		update_icon()
 	else if(!condi && istype(I, /obj/item/storage/pill_bottle))
-		if(bottle)
-			to_chat(user, "<span class='warning'>A pill bottle is already loaded into [src]!</span>")
-			return
 		if(!user.transferItemToLoc(I, src))
 			return
-		bottle = I
+		replace_pillbottle(user, I)
 		to_chat(user, "<span class='notice'>You add [I] into the dispenser slot.</span>")
 		updateUsrDialog()
 	else
@@ -131,12 +128,23 @@
 	update_icon()
 	return TRUE

-/obj/machinery/chem_master/on_deconstruction()
-	replace_beaker(usr)
+/obj/machinery/chem_master/proc/replace_pillbottle(mob/living/user, obj/item/storage/pill_bottle/new_bottle)
 	if(bottle)
 		bottle.forceMove(drop_location())
-		adjust_item_drop_location(bottle)
+		if(user && Adjacent(user) && !issiliconoradminghost(user))
+			user.put_in_hands(beaker)
+		else
+			adjust_item_drop_location(bottle)
+	if(new_bottle)
+		bottle = new_bottle
+	else
 		bottle = null
+	update_icon()
+	return TRUE
+
+/obj/machinery/chem_master/on_deconstruction()
+	replace_beaker(usr)
+	replace_pillbottle(usr)
 	return ..()

 /obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
@@ -195,11 +203,8 @@
 			. = TRUE

 		if("ejectp")
-			if(bottle)
-				bottle.forceMove(drop_location())
-				adjust_item_drop_location(bottle)
-				bottle = null
-				. = TRUE
+			replace_pillbottle(usr)
+			. = TRUE

 		if("transferToBuffer")
 			if(beaker)
@@ -247,14 +252,14 @@
 				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 					return
 				var/obj/item/reagent_containers/pill/P
-				var/target_loc = drop_location()
+				var/target_loc = bottle ? bottle : drop_location()
 				var/drop_threshold = INFINITY
 				if(bottle)
 					GET_COMPONENT_FROM(STRB, /datum/component/storage, bottle)
 					if(STRB)
 						drop_threshold = STRB.max_items - bottle.contents.len

-				for(var/i = 0; i < amount; i++)
+				for(var/i in 1 to amount)
 					if(i < drop_threshold)
 						P = new(target_loc)
 					else
@@ -54,7 +54,7 @@

 /obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
 	. = ..()
-	if((!proximity) || !spillable || !check_allowed_items(target,target_self=1))
+	if((!proximity) || !check_allowed_items(target,target_self=1))
 		return

 	if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
@@ -54,7 +54,7 @@
 /obj/item/reagent_containers/rag/pre_altattackby(mob/living/M, mob/living/user, params)
 	if(istype(M) && user.a_intent == INTENT_HELP)
 		user.changeNext_move(CLICK_CD_MELEE)
-		if(user.on_fire)
+		if(M.on_fire)
 			user.visible_message("<span class='warning'>\The [user] uses \the [src] to pat out [M == user ? "[user.p_their()]" : "\the [M]'s"] flames!</span>")
 			if(hitsound)
 				playsound(M, hitsound, 25, 1)
@@ -9,6 +9,7 @@
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
 	item_flags = ABSTRACT | DROPDEL
 	w_class = WEIGHT_CLASS_HUGE
+	slot_flags = NONE
 	force = 5
 	max_charges = 1 //Recharging costs blood.
 	recharge_rate = 1
@@ -46,4 +47,4 @@
 /obj/item/projectile/magic/bloodchill/on_hit(mob/living/target)
 	. = ..()
 	if(isliving(target))
-		target.apply_status_effect(/datum/status_effect/bloodchill)
+		target.apply_status_effect(/datum/status_effect/bloodchill)
@@ -497,6 +497,6 @@

 /obj/item/organ/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
 	. = ..()
-	if (breath.gases[/datum/gas/plasma])
+	if (breath && breath.gases[/datum/gas/plasma])
 		var/plasma_pp = breath.get_breath_partial_pressure(breath.gases[/datum/gas/plasma])
 		owner.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.