Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2

2026-08-28 06:28:01 +01:00 · 2014-11-19 13:15:40 +01:00
parent 835d04290c 31e6c4a207
commit 61990872d8
296 changed files with 3229 additions and 4082 deletions
@@ -40,54 +40,60 @@
 	var/item_path = /obj/item/bodybag
 	density = 0
 	storage_capacity = (mob_size * 2) - 1
+	var/contains_body = 0

-	attackby(W as obj, mob/user as mob)
-		if (istype(W, /obj/item/weapon/pen))
-			var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
-			if (user.get_active_hand() != W)
-				return
-			if (!in_range(src, user) && src.loc != user)
-				return
-			t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
-			if (t)
-				src.name = "body bag - "
-				src.name += t
-				src.overlays += image(src.icon, "bodybag_label")
-			else
-				src.name = "body bag"
-		//..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri
+/obj/structure/closet/body_bag/attackby(W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/pen))
+		var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
+		if (user.get_active_hand() != W)
 			return
-		else if(istype(W, /obj/item/weapon/wirecutters))
-			user << "You cut the tag off the bodybag"
+		if (!in_range(src, user) && src.loc != user)
+			return
+		t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+		if (t)
+			src.name = "body bag - "
+			src.name += t
+			src.overlays += image(src.icon, "bodybag_label")
+		else
 			src.name = "body bag"
-			src.overlays.Cut()
-			return
+	//..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri
+		return
+	else if(istype(W, /obj/item/weapon/wirecutters))
+		user << "You cut the tag off the bodybag"
+		src.name = "body bag"
+		src.overlays.Cut()
+		return

+/obj/structure/closet/body_bag/store_mobs(var/stored_units)
+	contains_body = ..()
+	return contains_body

-	close()
-		if(..())
-			density = 0
-			return 1
-		return 0
+/obj/structure/closet/body_bag/close()
+	if(..())
+		density = 0
+		return 1
+	return 0

+/obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location)
+	..()
+	if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
+		if(!ishuman(usr))	return
+		if(opened)	return 0
+		if(contents.len)	return 0
+		visible_message("[usr] folds up the [src.name]")
+		new item_path(get_turf(src))
+		spawn(0)
+			del(src)
+		return

-	MouseDrop(over_object, src_location, over_location)
-		..()
-		if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
-			if(!ishuman(usr))	return
-			if(opened)	return 0
-			if(contents.len)	return 0
-			visible_message("[usr] folds up the [src.name]")
-			new item_path(get_turf(src))
-			spawn(0)
-				del(src)
-			return
-
-/obj/structure/closet/bodybag/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-	else
+/obj/structure/closet/body_bag/update_icon()
+	if(opened)
 		icon_state = icon_opened
+	else
+		if(contains_body > 0)
+			icon_state = "bodybag_closed1"
+		else
+			icon_state = icon_closed


 /obj/item/bodybag/cryobag
@@ -144,6 +144,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	detonate = 0
 	//toff = 1

+/obj/item/device/pda/ert
+	default_cartridge = /obj/item/weapon/cartridge/captain
+	icon_state = "pda-h"
+	detonate = 0
+	hidden = 1
+
 /obj/item/device/pda/cargo
 	default_cartridge = /obj/item/weapon/cartridge/quartermaster
 	icon_state = "pda-cargo"
@@ -59,11 +59,6 @@
 		else
 			..()

-
-
-	attack_paw()
-		return
-
 	attack_ai()
 		return

@@ -24,10 +24,6 @@
 	spawn (0)
 		attack_self(user)

-/obj/item/device/radio/intercom/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
-
 /obj/item/device/radio/intercom/attack_hand(mob/user as mob)
 	src.add_fingerprint(user)
 	spawn (0)
@@ -64,7 +64,6 @@
 	if(!user || !src)	return 0
 	if(!istype(user.loc,/turf)) return 0
 	if(!user.IsAdvancedToolUser())
-		user << "\red You don't have the dexterity to do this!"
 		return 0
 	var/title = "Sheet-Glass"
 	title += " ([src.amount] sheet\s left)"
@@ -145,7 +144,6 @@
 	if(!user || !src)	return 0
 	if(!istype(user.loc,/turf)) return 0
 	if(!user.IsAdvancedToolUser())
-		user << "\red You don't have the dexterity to do this!"
 		return 0
 	var/title = "Sheet Reinf. Glass"
 	title += " ([src.amount] sheet\s left)"
@@ -28,9 +28,6 @@
 		SetValue(src.value)
 		//testing("[name]: DNA2 SE blocks after SetValue: [english_list(buf.dna.SE)]")

-/obj/item/weapon/dnainjector/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
 /obj/item/weapon/dnainjector/proc/GetRealBlock(var/selblock)
 	if(selblock==0)
 		return block
@@ -108,7 +108,4 @@
 /obj/item/weapon/grenade/attack_hand()
 	walk(src, null, null)
 	..()
-	return
-
-/obj/item/weapon/grenade/attack_paw(mob/user as mob)
-	return attack_hand(user)
+	return
@@ -24,7 +24,8 @@
 		"/obj/item/stack/cable_coil",
 		"/obj/item/device/t_scanner",
 		"/obj/item/device/analyzer",
-		"/obj/item/taperoll/engineering")
+		"/obj/item/taperoll/engineering",
+		"/obj/item/device/robotanalyzer")


 /obj/item/weapon/storage/belt/utility/full/New()
@@ -82,7 +83,7 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	can_hold = list(
-		"/obj/item/weapon/grenade/flashbang",
+		"/obj/item/weapon/grenade",
 		"/obj/item/weapon/reagent_containers/spray/pepper",
 		"/obj/item/weapon/handcuffs",
 		"/obj/item/device/flash",
@@ -140,4 +141,4 @@
 	item_state = "swatbelt"
 	storage_slots = 9
 	max_w_class = 3
-	max_combined_w_class = 21
+	max_combined_w_class = 21
@@ -31,9 +31,6 @@
 		if(..(user, 1))
 			user << text("The service panel is [src.open ? "open" : "closed"].")

-	attack_paw(mob/user as mob)
-		return attack_hand(user)
-
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(locked)
 			if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))