Merge remote-tracking branch 'upstream/master'

_maps/map_files/stations/deltastation.dmm

@@ -79593,19 +79593,6 @@
 	icon_state = "dark"
 	},
 /area/station/security/prison/cell_block)
-"mBa" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/plating,
-/area/station/engineering/smes)
 "mBy" = (
 /obj/structure/bed,
 /obj/item/bedsheet/green,
@@ -127352,7 +127339,7 @@ bwP
 fsO
 oNV
 ucB
-mBa
+fsO
 clv
 bQr
 bQr

code/datums/uplink_items/uplink_general.dm

@@ -388,7 +388,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 
 /datum/uplink_item/explosives/plastic_explosives
 	name = "Composition C-4"
-	desc = "C-4 is plastic explosive of the common variety Composition C. Reliably destroys the object it's placed on, assuming it isn't bomb resistant. Does not stick to crewmembers. Will only destroy station floors if placed directly on it. It has a modifiable timer with a minimum setting of 10 seconds."
+	desc = "C-4 is plastic explosive of the common variety Composition C. Reliably destroys the object it's placed on, assuming it isn't bomb resistant. Remarkably good for disposing bodies, or tired crewmates. Will only destroy station floors if placed directly on it. It has a modifiable timer with a minimum setting of 10 seconds."
 	reference = "C4"
 	item = /obj/item/grenade/plastic/c4
 	cost = 5

code/game/gamemodes/nuclear/pinpointer.dm

@@ -96,15 +96,15 @@
 
 /obj/item/pinpointer/proc/scandisk()
 	if(!the_disk)
-		the_disk = locate()
+		the_disk = locate() in GLOB.poi_list
 
 /obj/item/pinpointer/proc/scanbomb()
 	if(!syndicate)
 		if(!the_bomb)
-			the_bomb = locate()
+			the_bomb = locate() in GLOB.poi_list
 	else
 		if(!the_s_bomb)
-			the_s_bomb = locate()
+			the_s_bomb = locate() in GLOB.poi_list
 
 /obj/item/pinpointer/proc/point_at_target(atom/target)
 	if(!target)

code/game/gamemodes/wizard/spellbook.dm

@@ -65,8 +65,7 @@
 	return FALSE
 
 /datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user, obj/item/spellbook/book) //return point value or -1 for failure
-	var/area/wizard_station/A = locate()
-	if(!(user in A.contents))
+	if(!istype(get_area(user), /area/wizard_station))
 		to_chat(user, "<span class='warning'>You can only refund spells at the wizard lair.</span>")
 		return -1
 	if(!S) //This happens when the spell's source is from another spellbook, from loadouts, or adminery, this create a new template temporary spell

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

@@ -63,25 +63,25 @@
 		det_time = newtime
 		to_chat(user, "Timer set for [det_time] seconds.")
 
-/obj/item/grenade/plastic/afterattack(atom/movable/AM, mob/user, flag)
+/obj/item/grenade/plastic/afterattack(mob/AM, mob/user, flag)
 	if(!flag)
 		return
-	if(iscarbon(AM))
-		to_chat(user, "<span class='warning'>You can't get the [src] to stick to [AM]!</span>")
+	if(ismob(AM) && AM.stat == CONSCIOUS)
+		to_chat(user, "<span class='warning'>You can't get the [src] to stick to [AM]! Perhaps if [AM] was asleep or dead you could attach it?</span>")
 		return
 	if(isobserver(AM))
 		to_chat(user, "<span class='warning'>Your hand just phases through [AM]!</span>")
 		return
 	to_chat(user, "<span class='notice'>You start planting [src].[isnull(nadeassembly) ? " The timer is set to [det_time]..." : ""]</span>")
 
-	if(do_after(user, 50 * toolspeed, target = AM))
+	if(do_after(user, 5 SECONDS * toolspeed, target = AM))
 		if(!user.unEquip(src))
 			return
 		target = AM
 		loc = null
 
 		if(notify_admins)
-			message_admins("[ADMIN_LOOKUPFLW(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - <a href='byond://?_src_=holder;adminplayerobservecoodjump=1;X=[target.x];Y=[target.y];Z=[target.z]'>JMP</a>) with [det_time] second fuse", 0, 1)
+			message_admins("[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at ([target.x],[target.y],[target.z] - <a href='byond://?_src_=holder;adminplayerobservecoodjump=1;X=[target.x];Y=[target.y];Z=[target.z]'>JMP</a>) with [det_time] second fuse", 0, 1)
 			log_game("[key_name(user)] planted [name] on [target.name] at ([target.x],[target.y],[target.z]) with [det_time] second fuse")
 
 		AddComponent(/datum/component/persistent_overlay, image_overlay, target)

code/modules/antagonists/changeling/powers/summon_spiders.dm

@@ -51,6 +51,7 @@
 	venom_per_bite = 3
 	speak_chance = 0
 	wander = 0
+	gold_core_spawnable = NO_SPAWN
 	/// To check and gib the spider when dead, then remove only one of the counter for the changeling owner
 	var/gibbed = FALSE
 

code/modules/events/blob/overmind.dm

@@ -116,7 +116,7 @@
 		status_tab_data[++status_tab_data.len] = list("Power Stored:", "[blob_points]/[max_blob_points]")
 
 /mob/camera/blob/Move(NewLoc, Dir = 0)
-	var/obj/structure/blob/B = locate() in range("3x3", NewLoc)
+	var/obj/structure/blob/B = locate() in range(3, NewLoc)
 	if(B)
 		loc = NewLoc
 	else

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -1020,7 +1020,10 @@
 	if(ishuman(M) && prob(5))
 		var/mob/living/carbon/human/H = M
 		if(!H.get_int_organ(/obj/item/organ/internal/bone_tumor))
-			new/obj/item/organ/internal/bone_tumor(H)
+			if(isslimeperson(H))
+				new /obj/item/organ/internal/bone_tumor/slime_tumor(H)
+			else
+				new /obj/item/organ/internal/bone_tumor(H)
 
 	return ..()
 

code/modules/surgery/organs/bone_tumor.dm

@@ -27,3 +27,7 @@
 
 		for(var/obj/item/organ/internal/I in other_groin_organs)
 			I.receive_damage(rand(5, 15) + tumor_damage_modifier)
+
+/obj/item/organ/internal/bone_tumor/slime_tumor
+	name = "crystalized slime jelly"
+