for-if-I-stand-I-stand-by-his-will-alone

2026-07-15 00:53:23 +01:00 · 2019-10-03 19:52:03 -04:00
parent 99a6ee7827
commit 20c4cf0a08
123 changed files with 336 additions and 267 deletions
@@ -1,5 +1,7 @@
 /obj/item/clothing
 	name = "clothing"
+	max_integrity = 200
+	integrity_failure = 80
 	resistance_flags = FLAMMABLE
 	var/list/species_restricted = null //Only these species can wear this kit.
 	var/scan_reagents = 0 //Can the wearer see reagents while it's equipped?
@@ -4,6 +4,7 @@
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
 	icon_state = "hardsuit0-engineering"
 	item_state = "eng_helm"
+	max_integrity = 300
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75)
 	var/basestate = "hardsuit"
 	allowed = list(/obj/item/flashlight)
@@ -87,6 +88,7 @@
 	desc = "A special space suit for environments that might pose hazards beyond just the vacuum of space. Provides more protection than a standard space suit."
 	icon_state = "hardsuit-engineering"
 	item_state = "eng_hardsuit"
+	max_integrity = 300
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75)
 	allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
 	siemens_coefficient = 0
@@ -219,6 +219,7 @@
 	icon_state = "durathread"
 	item_state = "durathread"
 	strip_delay = 60
+	max_integrity = 200
 	resistance_flags = FLAMMABLE
 	armor = list("melee" = 20, "bullet" = 10, "laser" = 30, "energy" = 5, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 50)

@@ -10,6 +10,7 @@
 	lefthand_file = 'icons/goonstation/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/goonstation/mob/inhands/items_righthand.dmi'
 	materials = list(MAT_GLASS=500)
+	max_integrity = 20
 	resistance_flags = ACID_PROOF

 /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
@@ -8,6 +8,7 @@
 	icon = 'icons/obj/cooking_machines.dmi'
 	icon_state = "icecream_vat"
 	use_power = IDLE_POWER_USE
+	max_integrity = 300
 	idle_power_usage = 20
 	var/obj/item/reagent_containers/glass/beaker = null
 	var/useramount = 15	//Last used amount
@@ -53,6 +53,7 @@ var/list/ingredients_source = list(
 	icon_state = "icecream_vat"
 	density = 1
 	anchored = 0
+	max_integrity = 300
 	var/list/ingredients = list()
 	var/dispense_flavour = 1
 	var/obj/item/reagent_containers/glass/held_container
@@ -37,7 +37,6 @@
 	icon_state = "beebox"
 	anchored = TRUE
 	density = TRUE
-	max_integrity = 300
 	var/mob/living/simple_animal/hostile/poison/bees/queen/queen_bee = null
 	var/list/bees = list() //bees owned by the box, not those inside it
 	var/list/honeycombs = list()
@@ -136,6 +136,7 @@
 	bitesize_mod = 2
 	tastes = list("cherry" = 1, "explosion" = 1)
 	volume = 125 //Gives enough room for the black powder at max potency
+	max_integrity = 40
 	wine_power = 0.8

 /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
@@ -8,6 +8,7 @@
 	var/lastattempt = null
 	var/attempts = 10
 	var/codelen = 4
+	integrity_failure = 0 //no breaking open the crate

 /obj/structure/closet/crate/secure/loot/New()
 	..()
@@ -21,6 +21,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "marker"
 	armor = list("melee" = 50, "bullet" = 75, "laser" = 75, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 25, "acid" = 0)
+	max_integrity = 50
 	merge_type = /obj/item/stack/marker_beacon
 	max_amount = 100
 	var/picked_color = "random"
@@ -150,6 +150,7 @@
 	icon_state = "mushroom_shavings"
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
+	max_integrity = 100
 	seed = /obj/item/seeds/lavaland/polypore
 	wine_power = 0.2

@@ -102,7 +102,7 @@ I'm using this for Stat to give it a more nifty interface to work with
 			if(istype(src.loc, /obj/mecha))
 				var/obj/mecha/M = src.loc
 				stat("Exosuit Charge:", "[istype(M.cell) ? "[M.cell.charge] / [M.cell.maxcharge]" : "No cell detected"]")
-				stat("Exosuit Integrity", "[!M.health ? "0" : "[(M.health / initial(M.health)) * 100]"]%")
+				stat("Exosuit Integrity", "[!M.obj_integrity ? "0" : "[(M.obj_integrity / M.max_integrity) * 100]"]%")

 /mob/living/carbon/brain/can_safely_leave_loc()
 	return 0 //You're not supposed to be ethereal jaunting, brains
@@ -139,7 +139,7 @@
 	icon = 'icons/effects/effects.dmi'
 	anchored = 1 // prevents people dragging it
 	density = 0 // prevents it blocking all movement
-	health = 20 // two welders, or one laser shot (15 for the normal spider webs)
+	max_integrity = 20 // two welders, or one laser shot (15 for the normal spider webs)
 	icon_state = "stickyweb1"
 	var/creator_ckey = null

@@ -94,4 +94,4 @@
 	name = "thick web"
 	desc = "This web is so thick, most cannot see beyond it."
 	opacity = 1
-	health = 40
+	max_integrity = 40
@@ -62,6 +62,6 @@


 /obj/structure/spider/terrorweb/red
-	health = 30
+	max_integrity = 30
 	name = "reinforced web"
 	desc = "This web is reinforced with extra strands, for added strength."
@@ -9,7 +9,7 @@
 	icon_state = "spiderling"
 	anchored = 0
 	layer = 2.75
-	health = 3
+	max_integrity = 3
 	var/stillborn = FALSE
 	var/spider_myqueen = null
 	var/spider_mymother = null
@@ -39,10 +39,10 @@
 	. = ..()


-/obj/structure/spider/spiderling/terror_spiderling/die()
+/obj/structure/spider/spiderling/terror_spiderling/Destroy()
 	for(var/obj/structure/spider/spiderling/terror_spiderling/S in view(7, src))
 		S.immediate_ventcrawl = TRUE
-	. = ..()
+	return ..()

 /obj/structure/spider/spiderling/terror_spiderling/proc/score_surroundings(atom/A = src)
 	var/safety_score = 0
@@ -163,7 +163,7 @@
 			if(stillborn)
 				if(amount_grown >= 300)
 					// Fake spiderlings stick around for awhile, just to be spooky.
-					die()
+					qdel(src)
 			else
 				if(!grow_as)
 					grow_as = pick(/mob/living/simple_animal/hostile/poison/terror_spider/red, /mob/living/simple_animal/hostile/poison/terror_spider/gray, /mob/living/simple_animal/hostile/poison/terror_spider/green)
@@ -28,9 +28,6 @@ var/list/global_modular_computers = list()
 	var/base_active_power_usage = 100					// Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too.
 	var/base_idle_power_usage = 10						// Power usage when the computer is idle and screen is off (currently only applies to laptops)

-	integrity_failure = 150
-	max_integrity = 300
-
 	var/obj/item/modular_computer/processor/cpu = null				// CPU that handles most logic while this type only handles power and other specific things.

 /obj/machinery/modular_computer/New()
@@ -15,7 +15,6 @@
 	max_hardware_size = 4
 	steel_sheet_cost = 10
 	light_strength = 2
-	obj_integrity = 300
 	max_integrity = 300
 	integrity_failure = 150

@@ -11,6 +11,8 @@
 	idle_power_usage = 30
 	active_power_usage = 200
 	power_channel = EQUIP
+	max_integrity = 300
+	integrity_failure = 100
 	var/emag_cooldown
 	atom_say_verb = "bleeps"
 	var/obj/item/copyitem = null	//what's in the copier!
@@ -47,6 +47,8 @@
 	desc = "A control terminal for the area electrical systems."
 	icon_state = "apc0"
 	use_power = NO_POWER_USE
+	max_integrity = 200
+	integrity_failure = 50
 	resistance_flags = FIRE_PROOF
 	req_access = list(access_engine_equip)
 	siemens_strength = 1
@@ -16,6 +16,7 @@
 	icon_state = "tube-construct-stage1"
 	anchored = 1
 	layer = 5
+	max_integrity = 200
 	armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
 	var/stage = 1
 	var/fixture_type = "tube"
@@ -144,6 +145,7 @@
 	desc = "A lighting fixture."
 	anchored = 1
 	layer = 5  					// They were appearing under mobs which is a little weird - Ostaf
+	max_integrity = 100
 	use_power = ACTIVE_POWER_USE
 	idle_power_usage = 2
 	active_power_usage = 20
@@ -9,6 +9,8 @@ var/global/list/rad_collectors = list()
 	density = 1
 	req_access = list(access_engine_equip)
 //	use_power = NO_POWER_USE
+	max_integrity = 350
+	integrity_failure = 80
 	var/obj/item/tank/plasma/P = null
 	var/last_power = 0
 	var/active = 0
@@ -27,6 +27,8 @@ field_generator power level display
 	anchored = 0
 	density = 1
 	use_power = NO_POWER_USE
+	max_integrity = 500
+	//100% immune to lasers and energy projectiles since it absorbs their energy.
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
 	var/const/num_power_levels = 6	// Total number of power level icon has
 	var/power_level = 0
@@ -62,6 +62,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	icon_state = "none"
 	anchored = 0
 	density = 1
+	max_integrity = 500
 	armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 80)
 	var/obj/machinery/particle_accelerator/control_box/master = null
 	var/construction_state = 0
@@ -10,6 +10,8 @@
 	use_power = NO_POWER_USE
 	idle_power_usage = 0
 	active_power_usage = 0
+	max_integrity = 150
+	integrity_failure = 50
 	var/id = 0
 	var/health = 10
 	var/obscured = 0
@@ -49,7 +51,8 @@
 		S.anchored = 1
 	S.loc = src
 	if(S.glass_type == /obj/item/stack/sheet/rglass) //if the panel is in reinforced glass
-		health *= 2 								 //this need to be placed here, because panels already on the map don't have an assembly linked to
+		max_integrity *= 2 								 //this need to be placed here, because panels already on the map don't have an assembly linked to
+		obj_integrity = max_integrity
 	update_icon()


@@ -263,6 +266,8 @@
 	density = 1
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 250
+	max_integrity = 200
+	integrity_failure = 100
 	var/icon_screen = "solar"
 	var/icon_keyboard = "power_key"
 	var/id = 0
@@ -10,6 +10,8 @@
 	icon_state = "tracker"
 	density = TRUE
 	use_power = NO_POWER_USE
+	max_integrity = 250
+	integrity_failure = 50

 	var/id = 0
 	var/sun_angle = 0		// sun angle as set by sun datum
@@ -7,7 +7,7 @@
 	anchored = 0
 	pressure_resistance = 2*ONE_ATMOSPHERE
 	container_type = DRAINABLE | AMOUNT_VISIBLE
-
+	max_integrity = 300
 	var/tank_volume = 1000 //In units, how much the dispenser can hold
 	var/reagent_id = "water" //The ID of the reagent that the dispenser uses
 	var/lastrigger = "" // The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation
@@ -11,6 +11,7 @@
 	density = 0
 	pressure_resistance = 5*ONE_ATMOSPHERE
 	level = 2
+	max_integrity = 200
 	var/ptype = PIPE_DISPOSALS_STRAIGHT //Use the defines
 	var/base_state
 	var/dpdir = 0	// directions as disposalpipe
@@ -187,7 +188,7 @@
 		update()
 		return

-	
+
 	if(ptype in list(PIPE_DISPOSALS_BIN, PIPE_DISPOSALS_OUTLET, PIPE_DISPOSALS_CHUTE)) // Disposal or outlet
 		var/obj/structure/disposalpipe/trunk/CP = locate() in T
 		if(!CP) // There's no trunk
@@ -16,6 +16,7 @@
 	density = 1
 	on_blueprints = TRUE
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
+	max_integrity = 200
 	resistance_flags = FIRE_PROOF
 	var/datum/gas_mixture/air_contents	// internal reservoir
 	var/mode = 1	// item mode 0=off 1=charging 2=charged
@@ -686,6 +687,7 @@
 	var/dpdir = 0		// bitmask of pipe directions
 	dir = 0				// dir will contain dominant direction for junction pipes
 	var/health = 10 	// health points 0-10
+	max_integrity = 200
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
 	damage_deflection = 10
 	layer = DISPOSAL_PIPE_LAYER				// slightly lower than wires and other pipes
@@ -3,8 +3,10 @@
 	desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
 	icon = 'icons/vehicles/4wheeler.dmi'
 	icon_state = "atv"
+	max_integrity = 150
 	armor = list("melee" = 50, "bullet" = 25, "laser" = 20, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
 	key_type = /obj/item/key
+	integrity_failure = 70
 	generic_pixel_x = 0
 	generic_pixel_y = 4
 	vehicle_move_delay = 1
@@ -2,8 +2,10 @@
 	name = "secway"
 	desc = "A brave security cyborg gave its life to help you look like a complete tool."
 	icon_state = "secway"
+	max_integrity = 100
 	armor = list("melee" = 20, "bullet" = 15, "laser" = 10, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
 	key_type = /obj/item/key/security
+	integrity_failure = 50
 	generic_pixel_x = 0
 	generic_pixel_y = 4
 	vehicle_move_delay = 1
@@ -8,6 +8,7 @@
 	anchored = 0
 	can_buckle = TRUE
 	buckle_lying = FALSE
+	max_integrity = 300
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
 	var/key_type
 	var/held_key_type //Similar to above, but the vehicle needs the key in hands as opposed to inserted into the ignition
@@ -39,6 +40,16 @@
 			. += "<span class='notice'>Put a key inside it by clicking it with the key.</span>"
 		else
 			. += "<span class='notice'>Alt-click [src] to remove the key.</span>"
+	if(resistance_flags & ON_FIRE)
+		. += "<span class='warning'>It's on fire!</span>"
+	var/healthpercent = obj_integrity/max_integrity * 100
+	switch(healthpercent)
+		if(50 to 99)
+			. += "It looks slightly damaged."
+		if(25 to 50)
+			. += "It appears heavily damaged."
+		if(0 to 25)
+			. += "<span class='warning'>It's falling apart!</span>"

 /obj/vehicle/attackby(obj/item/I, mob/user, params)
 	if(key_type && !is_key(inserted_key) && is_key(I))