Реверт нерф синглтанков

code/game/objects/items/tanks/tanks.dm

@@ -1,9 +1,11 @@
 /// How much time (in seconds) is assumed to pass while assuming air. Used to scale overpressure/overtemp damage when assuming air.
 #define ASSUME_AIR_DT_FACTOR 1
-/// Multiplies the pressure of assembly bomb explosions before it's put through THE LOGARITHM
-#define ASSEMBLY_BOMB_COEFFICIENT 0.5
-/// Base of the logarithmic function used to calculate assembly bomb explosion size
-#define ASSEMBLY_BOMB_BASE 2.7
+//MASSMETA EDIT REMOVAL BEGIN - STR
+	/*/// Multiplies the pressure of assembly bomb explosions before it's put through THE LOGARITHM
+	#define ASSEMBLY_BOMB_COEFFICIENT 0.5
+	/// Base of the logarithmic function used to calculate assembly bomb explosion size
+	#define ASSEMBLY_BOMB_BASE 2.7*/
+//MASSMETA EDIT REMOVAL END
 
 /**
  * # Gas Tank
@@ -52,10 +54,12 @@
 	var/list/reaction_info
 	/// Mob that is currently breathing from the tank.
 	var/mob/living/carbon/breathing_mob = null
-	/// Attached assembly, can either detonate the tank or release its contents when receiving a signal
+//MASSMETA EDIT REMOVAL BEGIN - STR
+	/*/// Attached assembly, can either detonate the tank or release its contents when receiving a signal
 	var/obj/item/assembly_holder/tank_assembly
 	/// Whether or not it will try to explode when it receives a signal
-	var/bomb_status = FALSE
+	var/bomb_status = FALSE*/
+//MASSMETA EDIT REMOVAL END
 
 /// Closes the tank if dropped while open.
 /datum/armor/item_tank
@@ -131,16 +135,20 @@
 /obj/item/tank/Destroy()
 	STOP_PROCESSING(SSobj, src)
 	air_contents = null
-	QDEL_NULL(tank_assembly)
+//MASSMETA EDIT REMOVAL BEGIN - STR
+	/*QDEL_NULL(tank_assembly)*/
+//MASSMETA EDIT REMOVAL END
 	return ..()
 
-/obj/item/tank/update_overlays()
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*/obj/item/tank/update_overlays()
 	. = ..()
 	if(tank_assembly)
 		. += tank_assembly.icon_state
 		. += tank_assembly.overlays
 		. += "bomb_assembly"
-
+*/
+//MASSMETA EDIT REMOVAL END
 /obj/item/tank/examine(mob/user)
 	var/obj/icon = src
 	. = ..()
@@ -171,8 +179,10 @@
 
 	. += span_notice("It feels [descriptive].")
 
-	if(tank_assembly)
-		. += span_warning("There is some kind of device [EXAMINE_HINT("rigged")] to the tank!")
+//MASSMETA EDIT REMOVAL BEGIN - STR
+	/*if(tank_assembly)
+		. += span_warning("There is some kind of device [EXAMINE_HINT("rigged")] to the tank!")*/
+//MASSMETA EDIT REMOVAL END
 
 /obj/item/tank/atom_deconstruct(disassembled = TRUE)
 	var/atom/location = loc
@@ -195,11 +205,15 @@
 /obj/item/tank/attackby(obj/item/attacking_item, mob/user, params)
 	add_fingerprint(user)
 	if(istype(attacking_item, /obj/item/assembly_holder))
-		if(tank_assembly)
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*	if(tank_assembly)
 			balloon_alert(user, "something already attached!")
-			return ITEM_INTERACT_BLOCKING
+			return ITEM_INTERACT_BLOCKING*/
+//MASSMETA EDIT REMOVAL END
 		bomb_assemble(attacking_item, user)
-		return ITEM_INTERACT_SUCCESS
+		return TRUE
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*		return ITEM_INTERACT_SUCCESS
 	return ..()
 
 /obj/item/tank/wrench_act(mob/living/user, obj/item/tool)
@@ -218,7 +232,8 @@
 		balloon_alert(user, "bomb armed")
 		log_bomber(user, "welded a single tank bomb,", src, "| Temp: [air_contents.temperature] Pressure: [air_contents.return_pressure()]")
 		add_fingerprint(user)
-		return ITEM_INTERACT_SUCCESS
+		return ITEM_INTERACT_SUCCESS*/
+//MASSMETA EDIT REMOVAL END
 	return ..()
 
 /obj/item/tank/ui_state(mob/user)
@@ -402,7 +417,9 @@
 /obj/item/tank/proc/explosion_information()
 	return list(TANK_RESULTS_REACTION = reaction_info, TANK_RESULTS_MISC = explosion_info)
 
-/obj/item/tank/on_found(mob/finder) //for mousetraps
+/obj/item/tank/proc/ignite() //This happens when a bomb is told to explode
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*/obj/item/tank/on_found(mob/finder) //for mousetraps
 	. = ..()
 	if(tank_assembly)
 		tank_assembly.on_found(finder)
@@ -483,12 +500,20 @@
 		release()
 		return
 
-	// check to make sure it's not already exploding before exploding it
+	// check to make sure it's not already exploding before exploding it */
+//MASSMETA EDIT REMOVAL END
 	if(igniting)
-		CRASH("ignite() called multiple times on [type]")
+		stack_trace("Attempted to ignite a /obj/item/tank multiple times")
+		return //no double ignite
+//MASSMETA EDIT REMOVAL BEGIN - STR
+		/*CRASH("ignite() called multiple times on [type]")*/
+//MASSMETA EDIT REMOVAL END
 	igniting = TRUE
-
+	// This is done in return_air call, but even then it actually makes zero sense, this tank is going to be deleted
+	// before ever getting a chance to process.
+	//START_PROCESSING(SSobj, src)
 	var/datum/gas_mixture/our_mix = return_air()
+
 	our_mix.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
 	var/fuel_moles = our_mix.gases[/datum/gas/plasma][MOLES] + our_mix.gases[/datum/gas/oxygen][MOLES]/6
 	our_mix.garbage_collect()
@@ -497,14 +522,16 @@
 
 	var/turf/ground_zero = get_turf(loc)
 
-	/// Used to determine what the temperature of the hotspot when it isn't able to explode
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*	/// Used to determine what the temperature of the hotspot when it isn't able to explode
 	var/igniter_temperature = 0
 	for(var/obj/item/assembly/igniter/firestarter in tank_assembly.assemblies)
 		igniter_temperature = max(igniter_temperature, firestarter.heat)
 
 	if(!igniter_temperature)
 		CRASH("[type] called ignite() without any igniters attached")
-
+*/
+//MASSMETA EDIT REMOVAL END
 	if(bomb_mixture.temperature > (T0C + 400))
 		strength = (fuel_moles/15)
 
@@ -518,7 +545,10 @@
 			explosion(ground_zero, devastation_range = -1, light_impact_range = 1, flash_range = 2, explosion_cause = src)
 		else
 			ground_zero.assume_air(bomb_mixture)
-			ground_zero.hotspot_expose(igniter_temperature, 125)
+			ground_zero.hotspot_expose(1000, 125)
+//MASSMETA EDIT REMOVAL BEGIN - STR
+			/*ground_zero.hotspot_expose(igniter_temperature, 125)*/
+//MASSMETA EDIT REMOVAL END
 
 	else if(bomb_mixture.temperature > (T0C + 250))
 		strength = (fuel_moles/20)
@@ -529,33 +559,44 @@
 			explosion(ground_zero, devastation_range = -1, light_impact_range = 1, flash_range = 2, explosion_cause = src)
 		else
 			ground_zero.assume_air(bomb_mixture)
-			ground_zero.hotspot_expose(igniter_temperature, 125)
+			ground_zero.hotspot_expose(1000, 125)
 
+//MASSMETA EDIT REMOVAL BEGIN - STR
+			/*ground_zero.hotspot_expose(igniter_temperature, 125)*/
+//MASSMETA EDIT REMOVAL END
 	else if(bomb_mixture.temperature > (T0C + 100))
 		strength = (fuel_moles/25)
 
 		if(strength >= 1)
 			explosion(ground_zero, devastation_range = -1, light_impact_range = round(strength,1), flash_range = round(strength*3,1), explosion_cause = src)
 		else
 			ground_zero.assume_air(bomb_mixture)
-			ground_zero.hotspot_expose(igniter_temperature, 125)
+			ground_zero.hotspot_expose(1000, 125)
 
 	else
 		ground_zero.assume_air(bomb_mixture)
-		ground_zero.hotspot_expose(igniter_temperature, 125)
+		ground_zero.hotspot_expose(1000, 125)
 
+	if(master)
+		qdel(master)
 	qdel(src)
 
-/// Releases air stored in the tank. Called when signaled without being welded, or when ignited without enough pressure to explode.
-/obj/item/tank/proc/release()
+/obj/item/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*/// Releases air stored in the tank. Called when signaled without being welded, or when ignited without enough pressure to explode.
+/obj/item/tank/proc/release()*/
+//MASSMETA EDIT REMOVAL END
 	var/datum/gas_mixture/our_mix = return_air()
 	var/datum/gas_mixture/removed = remove_air(our_mix.total_moles())
 	var/turf/T = get_turf(src)
 	if(!T)
 		return
-	log_atmos("[type] released its contents of ", removed)
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*	log_atmos("[type] released its contents of ", removed)*/
+//MASSMETA EDIT REMOVAL END
 	T.assume_air(removed)
-
-#undef ASSEMBLY_BOMB_BASE
-#undef ASSEMBLY_BOMB_COEFFICIENT
+//MASSMETA EDIT REMOVAL BEGIN - STR
+/*#undef ASSEMBLY_BOMB_BASE
+#undef ASSEMBLY_BOMB_COEFFICIENT*/
+//MASSMETA EDIT REMOVAL END
 #undef ASSUME_AIR_DT_FACTOR

code/modules/assembly/bomb.dm

@@ -0,0 +1,155 @@
+/obj/item/onetankbomb
+	name = "bomb"
+	icon = 'icons/obj/canisters.dmi'
+	inhand_icon_state = "assembly"
+	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
+	throwforce = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	throw_speed = 2
+	throw_range = 4
+	obj_flags = CONDUCTS_ELECTRICITY
+	var/status = FALSE   //0 - not readied //1 - bomb finished with welder
+	var/obj/item/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
+	var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
+
+/obj/item/onetankbomb/Destroy()
+	bombassembly = null
+	bombtank = null
+	return ..()
+
+/obj/item/onetankbomb/IsSpecialAssembly()
+	return TRUE
+
+/obj/item/onetankbomb/examine(mob/user)
+	return bombtank.examine(user)
+
+/obj/item/onetankbomb/update_icon(updates)
+	icon = bombtank?.icon || initial(icon)
+	return ..()
+
+/obj/item/onetankbomb/update_icon_state()
+	icon_state = bombtank?.icon_state || initial(icon_state)
+	return ..()
+
+/obj/item/onetankbomb/update_overlays()
+	. = ..()
+	if(bombassembly)
+		. += bombassembly.icon_state
+		. += bombassembly.overlays
+		. += "bomb_assembly"
+
+/obj/item/onetankbomb/wrench_act(mob/living/user, obj/item/I)
+	..()
+	to_chat(user, span_notice("You disassemble [src]!"))
+	if(bombassembly)
+		bombassembly.forceMove(drop_location())
+		bombassembly.master = null
+		bombassembly = null
+	if(bombtank)
+		bombtank.forceMove(drop_location())
+		bombtank.master = null
+		bombtank = null
+	qdel(src)
+	return TRUE
+
+/obj/item/onetankbomb/welder_act(mob/living/user, obj/item/I)
+	..()
+	. = FALSE
+	if(status)
+		to_chat(user, span_warning("[bombtank] already has a pressure hole!"))
+		return
+	if(!I.tool_start_check(user, amount=1))
+		return
+	if(I.use_tool(src, user, 0, volume=40))
+		status = TRUE
+		var/datum/gas_mixture/bomb_mix = bombtank.return_air()
+		log_bomber(user, "welded a single tank bomb,", src, "| Temp: [bomb_mix.temperature]")
+		to_chat(user, span_notice("A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited."))
+		add_fingerprint(user)
+		return TRUE
+
+/obj/item/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
+	bombassembly.attack_self(user, TRUE)
+	add_fingerprint(user)
+	return
+
+/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.
+	audible_message(span_warning("[icon2html(src, hearers(src))] *beep* *beep* *beep*"))
+	playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)
+	sleep(1 SECONDS)
+	if(QDELETED(src))
+		return
+	if(status)
+		bombtank.ignite() //if its not a dud, boom (or not boom if you made shitty mix) the ignite proc is below, in this file
+	else
+		bombtank.release()
+
+/obj/item/onetankbomb/on_found(mob/finder) //for mousetraps
+	if(bombassembly)
+		bombassembly.on_found(finder)
+
+/obj/item/onetankbomb/attack_hand(mob/user, list/modifiers) //also for mousetraps
+	. = ..()
+	if(.)
+		return
+	if(bombassembly)
+		bombassembly.attack_hand()
+
+/obj/item/onetankbomb/Move()
+	. = ..()
+	if(bombassembly)
+		bombassembly.setDir(dir)
+		bombassembly.Move()
+
+/obj/item/onetankbomb/dropped()
+	. = ..()
+	if(bombassembly)
+		bombassembly.dropped()
+
+
+
+
+// ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
+
+//Bomb assembly proc. This turns assembly+tank into a bomb
+/obj/item/tank/proc/bomb_assemble(obj/item/assembly_holder/assembly, mob/living/user)
+	//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
+	var/igniter_count = 0
+	for(var/obj/item/assembly/attached_assembly as anything in assembly.assemblies)
+		if(isigniter(attached_assembly))
+			igniter_count += 1
+	if(LAZYLEN(assembly.assemblies) == igniter_count)
+		return
+
+	if((src in user.get_equipped_items(include_pockets = TRUE, include_accessories = TRUE)) && !user.canUnEquip(src))
+		to_chat(user, span_warning("[src] is stuck to you!"))
+		return
+
+	if(!user.canUnEquip(assembly))
+		to_chat(user, span_warning("[assembly] is stuck to your hand!"))
+		return
+
+	var/obj/item/onetankbomb/bomb = new
+	user.transferItemToLoc(src, bomb)
+	user.transferItemToLoc(assembly, bomb)
+
+	bomb.bombassembly = assembly //Tell the bomb about its assembly part
+	assembly.master = bomb //Tell the assembly about its new owner
+	assembly.on_attach()
+
+	bomb.bombtank = src //Same for tank
+	master = bomb
+
+	forceMove(bomb)
+	bomb.update_appearance()
+
+	user.put_in_hands(bomb) //Equips the bomb if possible, or puts it on the floor.
+	to_chat(user, span_notice("You attach [assembly] to [src]."))
+	return
+
+/obj/item/onetankbomb/return_analyzable_air()
+	if(bombtank)
+		return bombtank.return_analyzable_air()
+	else
+		return null

massmeta/includes.dm

@@ -92,4 +92,7 @@
 #include "code\modules\clothing\under\accessories\badges.dm"
 #include "code\modules\clothing\shoes\sneakers.dm"
 #include "code\modules\client\preferences\pride_pin.dm"
-#include "code\datums\quirks\neutral_quirks\pride_pin.dm"
+#include "code\datums\quirks\neutral_quirks\pride_pin.dm"
+
+//singletank unshittification
+#include "code\modules\assembly\bomb.dm"