enable greps properly (#10454)

2026-08-30 16:48:12 +01:00 · 2025-03-18 16:37:54 +01:00
parent 97f2dc3ce6
commit e174881f69
105 changed files with 108 additions and 111 deletions
@@ -2,4 +2,4 @@
 	for (var/arg in args)
 		if (arg)
 			return arg
-	return null
+	return null
@@ -1,3 +1,3 @@
 /datum/category_item/autolathe/general/radio_subspace
 	name = "subspace radio"
-	path =/obj/item/radio/subspace
+	path =/obj/item/radio/subspace
@@ -14,4 +14,4 @@
 			)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure/veymed
-	containername = "Surgery Kit Bag crate"
+	containername = "Surgery Kit Bag crate"
@@ -5,4 +5,4 @@
 			)
 	cost = 45
 	containertype = /obj/structure/closet/crate/ward
-	containername = "Borg-O's crate"
+	containername = "Borg-O's crate"
@@ -34,4 +34,4 @@
 			)
 	cost = 150
 	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Expirmental Capture crate"
+	containername = "Expirmental Capture crate"
@@ -27,4 +27,4 @@
 	data["recipes"] = recipes
 	data["categories"] = categories

-	return data
+	return data
@@ -172,7 +172,7 @@
 		icon_state = "destroyed"
 	if(panel_open)
 		add_overlay("panel_open")
-	if(stat & NOPOWER|EMPED)
+	if(stat & (NOPOWER|EMPED))
 		add_overlay("poweroff")
 	if(printing)
 		add_overlay("printing")
@@ -30,4 +30,4 @@

 	shock(L, 100, target_zone)

-	L.add_modifier(/datum/modifier/entangled, 3 SECONDS)
+	L.add_modifier(/datum/modifier/entangled, 3 SECONDS)
@@ -82,4 +82,4 @@
 	board_type = new /datum/frame/frame_types/machine
 	origin_tech = list(TECH_DATA = 8, TECH_ARCANE = 3)
 	req_components = list(
-							/obj/item/stack/cable_coil = 30)
+							/obj/item/stack/cable_coil = 30)
@@ -273,4 +273,4 @@
 /datum/construction/reversible/mecha/hades/spawn_result()
 	..()
 	feedback_inc("mecha_hades_created",1)
-	return
+	return
@@ -43,4 +43,4 @@
 	name = "stange peripheral circuit"

 /obj/item/circuitboard/mecha/hades/main
-	name = "stange control circuit"
+	name = "stange control circuit"
@@ -27,4 +27,4 @@
 /obj/effect/decal/mecha_wreckage/hades
 	name = "Hades Wreckage"
 	icon = 'modular_chomp/icons/mecha/mechas.dmi'
-	icon_state = "hades_broken" //to change
+	icon_state = "hades_broken" //to change
@@ -33,4 +33,4 @@
 	grow_as = list(/mob/living/simple_mob/animal/giant_spider/space, /mob/living/simple_mob/animal/giant_spider/nurse/space, /mob/living/simple_mob/animal/giant_spider/hunter/space,
 			/mob/living/simple_mob/animal/giant_spider/frost/space, /mob/living/simple_mob/animal/giant_spider/electric/space, /mob/living/simple_mob/animal/giant_spider/lurker/space,
 			/mob/living/simple_mob/animal/giant_spider/pepper/space, /mob/living/simple_mob/animal/giant_spider/thermic/space, /mob/living/simple_mob/animal/giant_spider/tunneler/space,
-			/mob/living/simple_mob/animal/giant_spider/webslinger/space)
+			/mob/living/simple_mob/animal/giant_spider/webslinger/space)
@@ -14,4 +14,3 @@
 	attack_verb = list("stabbed", "poked", "slashed")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	w_class = ITEMSIZE_HUGE
-
@@ -14,4 +14,4 @@
 	name = "Taur Duty Vest (Heavy)"
 	desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds more than its lighter cousin.."
 	max_storage_space = INVENTORY_DUFFLEBAG_SPACE
-	slowdown = 0.5
+	slowdown = 0.5
@@ -27,4 +27,4 @@
 	max_health = 250
 	pixel_x = -48
 	pixel_y = -12
-	shake_animation_degrees = 2
+	shake_animation_degrees = 2
@@ -299,4 +299,4 @@
 				prob(1);/obj/structure/outcrop/platinum/tyr,
 				prob(5);/obj/structure/outcrop/weathered_gate,
 				prob(3);/obj/structure/outcrop/hydrogen,
-				prob(1);/obj/structure/outcrop/lead/tyr)
+				prob(1);/obj/structure/outcrop/lead/tyr)
@@ -9,4 +9,4 @@
 	icon_state = "tile2"

 /turf/simulated/floor/blackhole/grate
-	icon_state = "tile3"
+	icon_state = "tile3"
@@ -149,4 +149,4 @@
 	return 0

 /turf/simulated/shuttlewalls/proc/can_join_with_low_wall(var/obj/structure/low_wall/WF)
-	return FALSE
+	return FALSE
@@ -23,4 +23,4 @@
 	"Pill Bottle (Bliss)" = /obj/item/storage/pill_bottle/happy,
 	"Pill Bottle (Aphrodisiac)" = /obj/item/storage/pill_bottle/aphrodisiac
 	)
-	gear_tweaks += new/datum/gear_tweak/path(medications)
+	gear_tweaks += new/datum/gear_tweak/path(medications)
@@ -11,4 +11,4 @@
 	"extra large jackboots" = /obj/item/clothing/shoes/mech_shoes/mister_x,
 	"visible extra large jackboots" = /obj/item/clothing/shoes/mech_shoes/mister_x/visible
 	)
-	gear_tweaks += new/datum/gear_tweak/path(mechshoes)
+	gear_tweaks += new/datum/gear_tweak/path(mechshoes)
@@ -5,4 +5,4 @@
 	icon = 'modular_chomp/icons/inventory/head/mob_angel_halo.dmi'
 	default_worn_icon = 'modular_chomp/icons/inventory/head/mob_angel_halo.dmi'
 	icon_state = "angel_halo"
-//Angel Halo End
+//Angel Halo End
@@ -5,4 +5,4 @@
 	usable = 0
 	interface_name = "mounted phase rifle"
 	interface_desc = "A forearm-mounted suit-powered phase rifle."
-	gun_type = /obj/item/gun/energy/locked/phasegun/rifle/unlocked/mounted
+	gun_type = /obj/item/gun/energy/locked/phasegun/rifle/unlocked/mounted
@@ -1,2 +1,2 @@
 /obj/item/rig/ert/janitor
-	req_access = null
+	req_access = null
@@ -3,4 +3,4 @@

 /obj/item/clothing/suit/space/void
 	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA, SPECIES_XENOMORPH_HYBRID)
-	sprite_sheets = CH_SPECIES_SPRITE_SHEETS_SUIT_MOB
+	sprite_sheets = CH_SPECIES_SPRITE_SHEETS_SUIT_MOB
@@ -23,4 +23,4 @@
 	icon_override = 'modular_chomp/icons/mob/viper_suit_ch.dmi'
 	icon_state = "viper_suit"
 	armor = list(melee = 35, bullet = 35, laser = 35, energy = 35, bomb = 25, bio = 20, rad = 20)
-	body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -20,4 +20,4 @@

 /obj/machinery/cash_register/civilian
 	req_access = list()
-	req_one_access = list(access_kitchen,access_bar,access_hydroponics,access_heads)
+	req_one_access = list(access_kitchen,access_bar,access_hydroponics,access_heads)
@@ -94,4 +94,4 @@

 #undef DANGER_CRAB
 #undef DANGER_ICE
-#undef DANGER_RAY
+#undef DANGER_RAY
@@ -121,4 +121,4 @@
 #undef DANGER_ICE
 #undef DANGER_RAY
 #undef DANGER_EEL
-#undef DANGER_TURTLE
+#undef DANGER_TURTLE
@@ -117,4 +117,4 @@
 		/obj/item/seeds/lustflower = 2,
 		/obj/item/seeds/pitcherseed = 3,
 		/obj/item/seeds/cinnamon = 3
-		) //CHOMPEdit - Seed list altered to include extra seeds available in seed_storage_vr.dm. Added cinnamon.
+		) //CHOMPEdit - Seed list altered to include extra seeds available in seed_storage_vr.dm. Added cinnamon.
@@ -4,4 +4,4 @@


 /datum/material/morphium //buffed protection
-	protectiveness = 65
+	protectiveness = 65
@@ -50,4 +50,4 @@
 /datum/material/osmium //Adjusted hardness, reflective, and protection
 	hardness = 65
 	protectiveness = 30
-	reflectivity = 0.1
+	reflectivity = 0.1
@@ -41,4 +41,4 @@
 	hardness = 40
 	protectiveness = 40
 	reflectivity = 0.6
-	conductivity = 0.5
+	conductivity = 0.5
@@ -20,4 +20,4 @@


 /obj/item/kinetic_crusher
-	requires_wield = FALSE
+	requires_wield = FALSE
@@ -2,11 +2,11 @@

 	say_list_type = /datum/say_list/cyber_horror/master
 	ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/horrormaster //The final boss of every Gradius game
-	
+
 /datum/say_list/cyber_horror/master
 	threaten_sound = 'modular_chomp/sound/mob/robots/MasterSee.ogg'

 /datum/ai_holder/simple_mob/ranged/kiting/horrormaster
 	threaten = TRUE
 	threaten_delay = 1 SECOND
-	threaten_timeout = 30 SECONDS
+	threaten_timeout = 30 SECONDS
@@ -150,4 +150,4 @@
 	contemparies, all the while wielding expirmental frost weaponry to deadly \
 	effecieny. Rare and vaulable pieces in the Eclipse's army, they are rarely seen \
 	but when utilized, that area is of high priority. "
-	value = CATALOGUER_REWARD_MEDIUM
+	value = CATALOGUER_REWARD_MEDIUM
@@ -1387,4 +1387,4 @@
 	uptwo_rightfour(target)
 	downtwo_leftfour(target)
 	downtwo_rightfour(target)
-	attackcycle = next_cycle
+	attackcycle = next_cycle
@@ -125,4 +125,4 @@
 		/obj/item/seeds/jurlmah = 125,
 		/obj/item/seeds/amauri = 125,
 		/obj/item/seeds/gelthi = 125,
-		/obj/item/seeds/vale = 125)
+		/obj/item/seeds/vale = 125)
@@ -9,4 +9,4 @@
 /datum/ai_holder/simple_mob/melee/disbot
 	threaten = TRUE
 	threaten_delay = 1 SECOND
-	threaten_timeout = 30 SECONDS
+	threaten_timeout = 30 SECONDS
@@ -1,4 +1,4 @@
 /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser
 	name = "laser hivebot"
 	desc = "A robot with a photonic weapon integrated into itself."
-	projectiletype = /obj/item/projectile/energy/mob/drone
+	projectiletype = /obj/item/projectile/energy/mob/drone
@@ -13,4 +13,4 @@
 	projectiletype = /obj/item/projectile/energy/declone

 /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege
-	projectiletype = /obj/item/projectile/arc //Polaris, don't make the same mob twice.
+	projectiletype = /obj/item/projectile/arc //Polaris, don't make the same mob twice.
@@ -2,4 +2,4 @@
 /mob/living/simple_mob/mechanical/hivebot/tank
 	icon = 'modular_chomp/icons/mob/hivebot.dmi'
 	icon_state = "blue"
-	icon_living = "blue"
+	icon_living = "blue"
@@ -26,4 +26,4 @@

 /datum/ai_holder/simple_mob/ranged/kiting/threatening/drone_aerostat
 	threaten_delay = 20 SECOND
-	threaten_timeout = 30 SECONDS
+	threaten_timeout = 30 SECONDS
@@ -11,4 +11,4 @@
 	see_in_dark = 8
 	minbodytemp = 0
 	maxbodytemp = 30000
-	min_oxy = 0
+	min_oxy = 0
@@ -14,4 +14,4 @@
 	melee_damage_lower = 5
 	melee_damage_upper = 5
 	vore_upper_transfer_chance = 75
-	ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive // Aggressive!
+	ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive // Aggressive!
@@ -50,4 +50,4 @@
 	light_color = "#1F000F"
 	glow_range = 5
 	glow_intensity = -1
-	ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run
+	ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run
@@ -27,4 +27,4 @@

 	if(!istype(M))
 		return
-	M.Weaken(stun_duration)
+	M.Weaken(stun_duration)
@@ -361,7 +361,7 @@
 	wind_low = 4
 	flight_failure_modifier = 100
 	effect_message = span_warning("Extreme rain is crushing you!")
-	
+
 	imminent_transition_message = "A fatal monsoon approaches."

 	var/next_lightning_strike = 0 // world.time when lightning will strike.
@@ -1,2 +1,2 @@
 /obj/item/gun/energy/zip/craftable
-	battery_lock = 1 //makeshift gun has flaws
+	battery_lock = 1 //makeshift gun has flaws
@@ -3,4 +3,4 @@
 	self_recharge = 1
 	use_external_power = 1
 	recharge_time = 10
-	one_handed_penalty = 0
+	one_handed_penalty = 0
@@ -10,4 +10,4 @@
 	combustion = FALSE

 	modifier_type_to_apply = /datum/modifier/entangled
-	modifier_duration = 0.5 MINUTE
+	modifier_duration = 0.5 MINUTE
@@ -38,4 +38,4 @@
 /obj/item/gun/magic/firestaff/vrwizard/nuclear
 	description_info = "A high powered staff that burns through energy quickly but unleashes high energy bolts."
 	projectile_type = /obj/item/projectile/energy/nuclearblast
-	color = "#660066"
+	color = "#660066"
@@ -166,4 +166,4 @@
 	if(isliving(hit_atom))
 		var/mob/living/L = hit_atom
 		L.add_modifier(/datum/modifier/mend_occult, 150)	//No need to change this, it does the job
-	qdel(src)
+	qdel(src)
@@ -571,7 +571,7 @@ GLOBAL_DATUM_INIT(tickets, /datum/tickets, new)
 		return

 	if(handler == key_name(usr, FALSE, TRUE))
-		to_chat(span_red("You are already handling this ticket."))
+		to_chat(usr, span_red("You are already handling this ticket."))
 		return

 	var/msg = span_red("Your AdminHelp is being handled by [key_name(usr,FALSE,FALSE)] please be patient.")
@@ -9,4 +9,4 @@
 	force = 35
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	can_cleave = TRUE
-	icon_state = "scythe0"
+	icon_state = "scythe0"
@@ -50,4 +50,4 @@
 	charge_tick = 0
 	can_charge = TRUE

-	projectile_type = /obj/item/projectile/beam/inversion
+	projectile_type = /obj/item/projectile/beam/inversion
@@ -46,4 +46,4 @@
 		if(H.stat != DEAD)
 			return FALSE
 		return TRUE
-	return FALSE
+	return FALSE
@@ -66,5 +66,3 @@ VBOanim_gullet2
 VBOanim_intestine1
 VBOanim_belly3
 VBO_anim_intestine2
-
-
@@ -3,4 +3,4 @@
 	desc = "A metallic overhang that supports an elevated platform."
 	icon = 'modular_chomp/maps/overmap/aegis_carrier/aegis_icons/greyledge.dmi'
 	icon_modifier = "grey_"
-	icon_state = "grey_railing0"
+	icon_state = "grey_railing0"
@@ -11,4 +11,4 @@
 	icon_state = "pilot_webbing2"
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi'
-	)
+	)
@@ -10,4 +10,4 @@
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_suit.dmi'
 	)
-	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
@@ -31,4 +31,4 @@
 /datum/gear/accessory/holster
 	display_name = "holster selection (Security, CD, HoP)"
 	path = /obj/item/clothing/accessory/holster
-	allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer")
+	allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer")
@@ -1,4 +1,4 @@
 /datum/gear/head/pilot
 	display_name = "helmet, pilot (Pilot)"
 	path = /obj/item/clothing/head/ompilot/alt //VOREStation Edit
-	allowed_roles = list("Pilot")
+	allowed_roles = list("Pilot")
@@ -16,4 +16,4 @@
 /datum/gear/head/pilot/mbill
 	display_name = "helmet, major bill's (Pilot)"
 	path = /obj/item/clothing/head/pilot_vr/mbill
-	allowed_roles = list("Pilot")
+	allowed_roles = list("Pilot")
@@ -11,4 +11,4 @@
 	areas_to_use = list(
 		/area/turbolift/port_deck_one,
 		/area/turbolift/port_deck_two
-		)
+		)
@@ -20,4 +20,4 @@
 		/area/rnd/xenobiology/xenoflora_storage,
 		/area/rnd/xenobiology/xenoflora_isolation
 	)
-	ignore_blast_doors = TRUE // Needed to avoid a breach.
+	ignore_blast_doors = TRUE // Needed to avoid a breach.
@@ -98,4 +98,4 @@ var/const/access_explorer = 43
 	economic_modifier = 4
 	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer)
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer)
-	outfit_type = /decl/hierarchy/outfit/job/medical/sar
+	outfit_type = /decl/hierarchy/outfit/job/medical/sar
@@ -27,4 +27,4 @@
 		"d3_near_w",
 		"outpost_nw",
 		"outpost_s"
-	)
+	)
@@ -28,4 +28,4 @@
 		"d2_near_se",
 		"d2_near_sw",
 		"d3_near_w"
-	)
+	)
@@ -53,4 +53,4 @@
 		"d2_near_se",
 		"d2_near_sw",
 		"d3_near_w"
-	)
+	)
@@ -27,4 +27,4 @@
 		"d2_near_sw",
 		"d3_near_w",
 		"d3_near_se",
-	)
+	)
@@ -33,4 +33,4 @@
 	requires_power = 0

 //Because dumb Vr errors
-/area/vr
+/area/vr
@@ -63,4 +63,4 @@

 /area/awaymission/hiddeneclipse/theabyss
 	name = "Strange Void"
-	requires_power = 0
+	requires_power = 0
@@ -145,4 +145,4 @@
 		So locked it behind a buttons in our research wings<BR>
 		And hey if you're hearing this, take care of my drake please.<BR>
 		Ashy is a good one.<BR>
-	"}
+	"}
@@ -11,4 +11,4 @@
 	icon_state = "pilot_webbing2"
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi'
-	)
+	)
@@ -283,4 +283,4 @@
 	return "Attention, [master.my_shuttle.visible_name] has departed the Wilderness Area."
 */

-End Chompstation Edit */
+End Chompstation Edit */
@@ -27,4 +27,4 @@
 		"d3_near_w",
 		"outpost_nw",
 		"outpost_s"
-	)
+	)
@@ -28,4 +28,4 @@
 		"d2_near_se",
 		"d2_near_sw",
 		"d3_near_w"
-	)
+	)
@@ -53,4 +53,4 @@
 		"d2_near_se",
 		"d2_near_sw",
 		"d3_near_w"
-	)
+	)
@@ -27,4 +27,4 @@
 		"d2_near_sw",
 		"d3_near_w",
 		"d3_near_se",
-	)
+	)
@@ -20,4 +20,4 @@
 		/area/rnd/xenobiology/xenoflora_storage,
 		/area/rnd/xenobiology/xenoflora_isolation
 	)
-	ignore_blast_doors = TRUE // Needed to avoid a breach.
+	ignore_blast_doors = TRUE // Needed to avoid a breach.
@@ -33,4 +33,4 @@
 	requires_power = 0

 //Because dumb Vr errors
-/area/vr
+/area/vr
@@ -22,4 +22,4 @@
 			carp attracted to vibrations. killed dimitri. yuri thought good idea to jury-rig hoverpods with lasers. not good idea. \
 			very bad idea. only pissed them off. giant white carp appeared. killed ivan. then giant carp cracked yuri pod like \
 			eggshell and swallowed yuri.<br><br>no food. can't call help. carp chewed comms relay. 2 weeks since then. \
-			can't eat carp. is poison.<br><br>avenge comrades. avenge me. i die in glory.<br><br>-markov"
+			can't eat carp. is poison.<br><br>avenge comrades. avenge me. i die in glory.<br><br>-markov"
@@ -63,4 +63,4 @@

 /area/awaymission/hiddeneclipse/theabyss
 	name = "Strange Void"
-	requires_power = 0
+	requires_power = 0
@@ -145,4 +145,4 @@
 		So locked it behind a buttons in our research wings<BR>
 		And hey if you're hearing this, take care of my drake please.<BR>
 		Ashy is a good one.<BR>
-	"}
+	"}
@@ -175,4 +175,4 @@

 /area/submap/cave/oregrubdeposit
 	name = "POI Caves - Oregrub Deposit"
-	ambience = AMBIENCE_SPACE
+	ambience = AMBIENCE_SPACE
@@ -143,4 +143,4 @@
 	name = "POI Plains - Rocky Crevice"

 /area/submap/peninsula
-	name = "POI Plains - Peninsula"
+	name = "POI Plains - Peninsula"
@@ -225,4 +225,4 @@

 /area/submap/terraforming
 	name = "Poi Valley - Terraforming"
-	ambience = AMBIENCE_RUINS
+	ambience = AMBIENCE_RUINS
@@ -13,4 +13,4 @@

 /area/submap/thehive
 	name = "Poi Valley End - The Hive"
-	ambience = AMBIENCE_RUINS
+	ambience = AMBIENCE_RUINS
@@ -237,4 +237,4 @@

 /area/submap/VolcanicFissure
 	name = "POI Wilderness - Volcanic Fissure"
-	ambience = AMBIENCE_RUINS
+	ambience = AMBIENCE_RUINS
--- a/Show More
+++ b/Show More