Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

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

@@ -105,7 +105,7 @@
 					user.visible_message("<span class='notice'>[user] shaves his facial hair clean with the [src].</span>", \
 					"<span class='notice'>You finish shaving with the [src]. Fast and clean!</span>")
 					H.f_style = "Shaved"
-					H.update_hair()
+					H.update_fhair()
 					playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
 			else
 				var/turf/user_loc = user.loc
@@ -117,7 +117,7 @@
 						user.visible_message("<span class='danger'>[user] shaves off [H]'s facial hair with \the [src].</span>", \
 						"<span class='notice'>You shave [H]'s facial hair clean off.</span>")
 						H.f_style = "Shaved"
-						H.update_hair()
+						H.update_fhair()
 						playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
 		if(user.zone_sel.selecting == "head")
 			if(!get_location_accessible(H, "head"))

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

@@ -81,7 +81,7 @@
 		/obj/item/toy/balloon,
 		/obj/item/toy/blink,
 		/obj/item/toy/crossbow,
-		/obj/item/toy/gun,
+		/obj/item/weapon/gun/projectile/revolver/capgun,
 		/obj/item/toy/katana,
 		/obj/random/prize,
 		/obj/item/toy/spinningtoy,
@@ -116,6 +116,7 @@
 		/obj/item/clothing/under/syndicate/tacticool,
 		/obj/item/weapon/storage/box/fakesyndiesuit,
 		/obj/item/toy/crossbow/tommygun,
+		/obj/item/stack/tile/fakespace/loaded,
 		)
 
 	if(!ispath(gift_type,/obj/item))	return

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

@@ -40,18 +40,23 @@
 		if(crit_fail)
 			user << "\red The Bluespace generator isn't working."
 			return
-		if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
-			investigate_log("has become a singularity. Caused by [user.key]","singulo")
-			user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!"
-			qdel(W)
-			var/obj/singularity/singulo = new /obj/singularity (get_turf(src))
-			singulo.energy = 300 //should make it a bit bigger~
-			message_admins("[key_name_admin(user)] detonated a bag of holding")
-			log_game("[key_name(user)] detonated a bag of holding")
-			qdel(src)
-			return
-
-		..()
+		else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
+			var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No")
+			if(response == "Yes")
+				user.visible_message("<span class='warning'>[user] grins as he begins to put a Bag of Holding into a Bag of Holding!</span>", "<span class='warning'>You begin to put the Bag of Holding into the Bag of Holding!</span>")
+				if(do_after(user,30,target=src))
+					investigate_log("has become a singularity. Caused by [user.key]","singulo")
+					user.visible_message("<span class='warning'>[user] erupts in evil laughter as he puts the Bag of Holding into another Bag of Holding!</span>", "<span class='warning'>You can't help yourself from laughing as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you</span>","<span class='warning'> You hear the sound of scientific evil brewing! </span>")
+					qdel(W)
+					var/obj/singularity/singulo = new /obj/singularity(get_turf(user))
+					singulo.energy = 300 //To give it a small boost
+					message_admins("[key_name_admin(user)] detonated a bag of holding <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
+					log_game("[key_name(user)] detonated a bag of holding")
+					qdel(src)
+				else
+					user.visible_message("After careful consideration, [user] has decided that putting a Bag of Holding inside another Bag of Holding would not yield the ideal outcome","You come to the realization that this might not be the greatest idea")
+		else
+			. = ..()
 
 	proc/failcheck(mob/user as mob)
 		if (prob(src.reliability)) return 1 //No failure

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

@@ -105,6 +105,7 @@
 /obj/item/weapon/storage/belt/medical/response_team
 
 /obj/item/weapon/storage/belt/medical/response_team/New()
+	..()
 	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
 	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
 	new /obj/item/weapon/reagent_containers/pill/charcoal(src)

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

@@ -51,17 +51,11 @@
 				return
 
 			if("implant")
-				var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
-				O.imp = new /obj/item/weapon/implant/freedom(O)
-				var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src)
-				U.imp = new /obj/item/weapon/implant/uplink(U)
-				var/obj/item/weapon/implanter/C = new /obj/item/weapon/implanter(src)
-				C.imp = new /obj/item/weapon/implant/emp(C)
-				var/obj/item/weapon/implanter/K = new /obj/item/weapon/implanter(src)
-				K.imp = new /obj/item/weapon/implant/adrenalin(K)
-				var/obj/item/weapon/implanter/S = new /obj/item/weapon/implanter(src)
-				S.imp = new /obj/item/weapon/implant/explosive(S)
-				S.name += " (explosive)"
+				new /obj/item/weapon/implanter/freedom(src)
+				new /obj/item/weapon/implanter/uplink(src)
+				new /obj/item/weapon/implanter/emp(src)
+				new /obj/item/weapon/implanter/adrenalin(src)
+				new /obj/item/weapon/implanter/explosive(src)
 				return
 
 			if("hacker")

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

@@ -172,7 +172,7 @@
 	return
 
 /obj/item/weapon/weldingtool/examine(mob/user)
-	if(!..(user, 0))
+	if(..(user, 0))
 		user << "It contains [get_fuel()] unit\s of fuel out of [max_fuel]."
 
 /obj/item/weapon/weldingtool/suicide_act(mob/user)