Merge branch 'master' into rcorp_buffs_reworks_part2

vlggms · Nov 30, 2024 · 1345aca · 1345aca
2 parents 14ad60f + 1ce1db5
commit 1345aca
Show file tree

Hide file tree

Showing 36 changed files with 10,295 additions and 9,344 deletions.
diff --git a/ModularTegustation/ego_weapons/ranged/waw.dm b/ModularTegustation/ego_weapons/ranged/waw.dm
@@ -185,8 +185,8 @@
 	for(var/obj/item/ego_weapon/ranged/pistol/solemnlament/Lament in user.held_items)
 		projectile_damage_multiplier = 1.5
 		break
+	. = ..()
 	projectile_damage_multiplier = 1
-	return ..()
 
 
 /obj/item/ego_weapon/ranged/loyalty

diff --git a/ModularTegustation/tegu_items/_belt.dm b/ModularTegustation/tegu_items/_belt.dm
@@ -41,3 +41,47 @@
 	new /obj/item/clerkbot_gadget(src)
 	new /obj/item/powered_gadget/vitals_projector(src)
 	new /obj/item/powered_gadget/handheld_taser(src)
+
+//So rhino can repair their shit and keep their weapons
+/obj/item/storage/belt/rhino
+	name = "rhino toolbelt"
+	desc = "Holds emergency repair tools"
+	icon_state = "security"
+	inhand_icon_state = "security"
+	worn_icon_state = "security"
+	drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
+	pickup_sound =  'sound/items/handling/toolbelt_pickup.ogg'
+
+/obj/item/storage/belt/rhino/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.max_combined_w_class = 15
+	STR.max_items = 6
+	STR.set_holdable(list(
+		/obj/item/crowbar,
+		/obj/item/screwdriver,
+		/obj/item/wrench,
+		/obj/item/weldingtool/experimental,
+		/obj/item/stack/cable_coil,
+		/obj/item/ego_weapon/city/rabbit_blade/raven,
+		/obj/item/gun/energy/e_gun/rabbitdash/small,
+		))
+
+//For the rhino small fries
+/obj/item/storage/belt/rhino/full/PopulateContents()
+	new /obj/item/crowbar(src)
+	new /obj/item/screwdriver(src)
+	new /obj/item/wrench(src)
+	new /obj/item/weldingtool/experimental(src)
+	new /obj/item/stack/cable_coil(src)
+	new /obj/item/ego_weapon/city/rabbit_blade/raven(src)
+
+//For the captain himself
+/obj/item/storage/belt/rhino/captain/PopulateContents()
+	new /obj/item/crowbar(src)
+	new /obj/item/screwdriver(src)
+	new /obj/item/wrench(src)
+	new /obj/item/weldingtool/experimental(src)
+	new /obj/item/stack/cable_coil(src)
+	new /obj/item/gun/energy/e_gun/rabbitdash/small(src)
diff --git a/ModularTegustation/tegu_items/rcorp/itemspawner.dm b/ModularTegustation/tegu_items/rcorp/itemspawner.dm
@@ -92,6 +92,26 @@
 		return
 	new spawning(get_turf(src))
 
+//Randomize the captain's rhino
+/obj/effect/landmark/rhinocaptainspawner
+	name = "rhino captain spawner"
+	desc = "It spawns an item. Notify a coder. Thanks!"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "x4"
+	var/list/possible_mecha = list(
+		/obj/vehicle/sealed/mecha/combat/rhino/captain,
+		/obj/vehicle/sealed/mecha/combat/rhinomelee/captain,
+		/obj/vehicle/sealed/mecha/combat/durand,
+	)
+
+/obj/effect/landmark/rhinocaptainspawner/Initialize()
+	. = ..()
+	var/spawning = pick(possible_mecha)
+	if(prob(1))
+		spawning = /obj/vehicle/sealed/mecha/combat/tank/captain
+	if(SSmaptype.jobtype)
+		return
+	new spawning(get_turf(src))
 
 //Split into weapons and not weapons.
 /obj/effect/landmark/wallspawner

diff --git a/ModularTegustation/tegu_traitor_code/objectives_tegu.dm b/ModularTegustation/tegu_traitor_code/objectives_tegu.dm
@@ -1,3 +1,4 @@
+/*
 /datum/objective_item/steal/iandog
 	name = "Ian, the Head of Personnel's pet corgi, alive."
 	targetitem = /obj/item/pet_carrier
@@ -59,6 +60,7 @@
 	targetitem = /obj/item/clothing/mask/facehugger/lamarr
 	difficulty = 40
 	excludefromjob = list("Research Director")
+*/
 
 /datum/objective/escape/escape_with_identity/infiltrator/New() //For infiltrators, so they get mulligan
 	var/list/spec_equipment = list()

diff --git a/_maps/map_files/Event/rcorp.dmm b/_maps/map_files/Event/rcorp.dmm
@@ -703,12 +703,7 @@
 	color = "#CC5500";
 	dir = 8
 	},
-/obj/vehicle/sealed/mecha/combat/rhino{
-	dir = 1;
-	max_integrity = 2000;
-	movedelay = 2;
-	name = "\improper Captain's Rhinoceros Unit"
-	},
+/obj/effect/landmark/rhinocaptainspawner,
 /turf/open/floor/pod/dark,
 /area/city/outskirts/rcorp_base)
 "GU" = (
@@ -748,8 +743,6 @@
 "IV" = (
 /obj/structure/table/abductor,
 /obj/item/clothing/under/suit/lobotomy/rabbit,
-/obj/item/ego_weapon/city/rabbit_blade/raven,
-/obj/item/weldingtool/experimental,
 /turf/open/floor/pod/dark,
 /area/city/outskirts/rcorp_base)
 "Jc" = (
@@ -1144,8 +1137,6 @@
 /obj/item/clothing/head/beret/tegu/captain{
 	armor = list()
 	},
-/obj/item/gun/energy/e_gun/rabbitdash/small,
-/obj/item/weldingtool/experimental,
 /turf/open/floor/pod,
 /area/city/outskirts/rcorp_base)
 "ZA" = (