cruft

shiptest-ss13 · Apr 13, 2024 · 4a76632 · 4a76632
1 parent 4adba95
commit 4a76632
Show file tree

Hide file tree

Showing 25 changed files with 528 additions and 1,034 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_colony.dmm b/_maps/RandomRuins/BeachRuins/beach_colony.dmm
@@ -406,7 +406,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "Oa" = (
-/obj/item/melee/skateboard/pro,
+/obj/item/skateboard/pro,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "Om" = (
@@ -435,7 +435,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "RK" = (
 /obj/item/toy/beach_ball/holoball/dodgeball,
-/obj/item/melee/skateboard/hoverboard,
+/obj/item/skateboard/hoverboard,
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "RM" = (

diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -6796,7 +6796,7 @@
 	pixel_x = 4;
 	pixel_y = 9
 	},
-/obj/item/melee/skateboard/hoverboard{
+/obj/item/skateboard/hoverboard{
 	pixel_x = -4
 	},
 /turf/open/floor/eighties,

diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
@@ -634,15 +634,6 @@
 	result = /obj/structure/headpike
 	category = CAT_PRIMAL
 
-/datum/crafting_recipe/legionpike
-	name = "Legion on a Spear"
-	time = 55
-	reqs = list(/obj/item/spear = 1,
-				/obj/item/organ/regenerative_core = 1,
-				/obj/item/crusher_trophy/legion_skull = 2)
-	result = /obj/structure/legionpike
-	category = CAT_PRIMAL
-
 /datum/crafting_recipe/tribal_torch
 	name = "Tribal Torch"
 	result = /obj/item/candle/tribal_torch

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -1102,3 +1102,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
  */
 /obj/item/proc/get_writing_implement_details()
 	return null
+
+/obj/item/proc/can_trigger_gun(mob/living/user)
+	if(!user.can_use_guns(src))
+		return FALSE
+	return TRUE
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
@@ -47,8 +47,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 	I.add_fingerprint(M)
 
 /obj/item/a_gift/proc/get_gift_type()
-	var/gift_type_list = list(/obj/item/sord,
-		/obj/item/storage/wallet,
+	var/gift_type_list = list(/obj/item/storage/wallet,
 		/obj/item/storage/photo_album,
 		/obj/item/storage/box/snappops,
 		/obj/item/storage/crayons,
@@ -67,7 +66,6 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 		/obj/item/bikehorn,
 		/obj/item/toy/beach_ball,
 		/obj/item/toy/beach_ball/holoball,
-		/obj/item/banhammer,
 		/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
 		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
 		/obj/item/paicard,