PLASE

2019-11-24 02:41:21 +00:00
parent b756f37ff6
commit 8af225e6e3
2145 changed files with 5258 additions and 1387322 deletions
@@ -1,89 +0,0 @@
-/datum/component/storage/concrete/pockets
-	max_items = 2
-	max_w_class = WEIGHT_CLASS_SMALL
-	max_combined_w_class = 50
-	rustle_sound = FALSE
-
-/datum/component/storage/concrete/pockets/handle_item_insertion(obj/item/I, prevent_warning, mob/user)
-	. = ..()
-	if(. && silent && !prevent_warning)
-		if(quickdraw)
-			to_chat(user, "<span class='notice'>You discreetly slip [I] into [parent]. Alt-click [parent] to remove it.</span>")
-		else
-			to_chat(user, "<span class='notice'>You discreetly slip [I] into [parent].</span>")
-
-/datum/component/storage/concrete/pockets
-	max_w_class = WEIGHT_CLASS_NORMAL
-
-/datum/component/storage/concrete/pockets/small
-	max_items = 1
-	attack_hand_interact = FALSE
-
-/datum/component/storage/concrete/pockets/small/collar
-	max_items = 1
-
-/datum/component/storage/concrete/pockets/small/collar/Initialize()
-	. = ..()
-	can_hold = typecacheof(list(
-	/obj/item/reagent_containers/food/snacks/cookie,
-	/obj/item/reagent_containers/food/snacks/sugarcookie))
-
-/datum/component/storage/concrete/pockets/small/collar/locked/Initialize()
-	. = ..()
-	can_hold = typecacheof(list(
-	/obj/item/reagent_containers/food/snacks/cookie,
-	/obj/item/reagent_containers/food/snacks/sugarcookie,
-	/obj/item/key/collar))
-
-/datum/component/storage/concrete/pockets/tiny
-	max_items = 1
-	max_w_class = WEIGHT_CLASS_TINY
-	attack_hand_interact = FALSE
-
-/datum/component/storage/concrete/pockets/small/detective
-	attack_hand_interact = TRUE // so the detectives would discover pockets in their hats
-
-/datum/component/storage/concrete/pockets/shoes
-	attack_hand_interact = FALSE
-	quickdraw = TRUE
-	silent = TRUE
-
-/datum/component/storage/concrete/pockets/shoes/Initialize()
-	. = ..()
-	cant_hold = typecacheof(list(/obj/item/screwdriver/power))
-	can_hold = typecacheof(list(
-		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen, /obj/item/melee/cultblade/dagger,
-		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
-		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
-		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol
-		))
-
-/datum/component/storage/concrete/pockets/shoes/clown/Initialize()
-	. = ..()
-	cant_hold = typecacheof(list(/obj/item/screwdriver/power))
-	can_hold = typecacheof(list(
-		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen, /obj/item/melee/cultblade/dagger,
-		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
-		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
-		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/firing_pin, /obj/item/bikehorn, /obj/item/gun/ballistic/automatic/pistol))
-
-/datum/component/storage/concrete/pockets/pocketprotector
-	max_items = 3
-	max_w_class = WEIGHT_CLASS_TINY
-	var/atom/original_parent
-
-/datum/component/storage/concrete/pockets/pocketprotector/Initialize()
-	original_parent = parent
-	. = ..()
-	can_hold = typecacheof(list( //Same items as a PDA
-		/obj/item/pen,
-		/obj/item/toy/crayon,
-		/obj/item/lipstick,
-		/obj/item/flashlight/pen,
-		/obj/item/clothing/mask/cigarette))
-
-/datum/component/storage/concrete/pockets/pocketprotector/real_location()
-	// if the component is reparented to a jumpsuit, the items still go in the protector
-	return original_parent
@@ -1,5 +0,0 @@
-/datum/component/storage/concrete/secret_satchel/can_be_inserted(obj/item/I, stop_messages = FALSE, mob/M)
-	if(SSpersistence.spawned_objects[I])
-		to_chat(M, "<span class='warning'>[I] is unstable after its journey through space and time, it wouldn't survive another trip.</span>")
-		return FALSE
-	return ..()
@@ -309,6 +309,7 @@
 		else
 			var/datum/numbered_display/ND = .[I.type]
 			ND.number++
+	. = sortTim(., /proc/cmp_numbered_displays_name_asc, associative = TRUE)

 //This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing.
 /datum/component/storage/proc/orient2hud(mob/user, maxcolumns)