Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light

Conflicts: code/game/gamemodes/shadowling/shadowling_abilities.dm code/game/objects/items/devices/flashlight.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/living.dm code/modules/mob/living/silicon/robot/robot.dm Changes to be committed: modified: code/game/gamemodes/shadowling/shadowling_abilities.dm modified: code/game/machinery/computer/computer.dm modified: code/game/machinery/floodlight.dm modified: code/game/objects/items/devices/flashlight.dm modified: code/game/objects/items/devices/paicard.dm modified: code/modules/clothing/head/hardhat.dm modified: code/modules/clothing/spacesuits/hardsuit.dm modified: code/modules/clothing/spacesuits/plasmamen.dm modified: code/modules/lighting/lighting_atom.dm modified: code/modules/mob/living/carbon/human/human.dm modified: code/modules/mob/living/living.dm modified: code/modules/mob/living/silicon/pai/pai.dm modified: code/modules/mob/living/silicon/pai/software_modules.dm modified: code/modules/mob/living/silicon/robot/robot.dm modified: code/modules/pda/PDA.dm modified: code/modules/power/lighting.dm modified: code/modules/projectiles/gun.dm
2026-07-19 02:54:41 +01:00 · 2019-02-02 22:53:46 -06:00
parent b32fdb7c30 99b3783e3f
commit b7ce683ab1
17 changed files with 109 additions and 82 deletions
@@ -5,7 +5,7 @@
 	icon_state = "hardhat0_yellow"
 	item_state = "hardhat0_yellow"
 	var/brightness_on = 4 //luminosity when on
-	var/on = 0
+	var/on = FALSE
 	item_color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite)
 	armor = list(melee = 15, bullet = 5, laser = 20, energy = 10, bomb = 20, bio = 10, rad = 20)
 	flags_inv = 0
@@ -29,6 +29,13 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()

+/obj/item/clothing/head/hardhat/extinguish_light()
+	if(on)
+		on = FALSE
+		set_light(0)
+		icon_state = "hardhat0_[item_color]"
+		item_state = "hardhat0_[item_color]"
+		visible_message("<span class='danger'>[src]'s light fades and turns off.</span>")

 /obj/item/clothing/head/hardhat/orange
 	icon_state = "hardhat0_orange"
@@ -57,6 +57,11 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()

+/obj/item/clothing/head/helmet/space/hardsuit/extinguish_light()
+	if(on)
+		toggle_light()
+		visible_message("<span class='danger'>[src]'s light fades and turns off.</span>")
+
 /obj/item/clothing/head/helmet/space/hardsuit/item_action_slot_check(slot)
 	if(slot == slot_head)
 		return 1
@@ -102,6 +102,11 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()

+/obj/item/clothing/head/helmet/space/eva/plasmaman/extinguish_light()
+	if(on)
+		toggle_light()
+		visible_message("<span class='danger'>[src]'s light fades and turns off.</span>")
+
 // ENGINEERING
 /obj/item/clothing/suit/space/eva/plasmaman/atmostech
 	name = "plasmaman atmospheric suit"
@@ -40,6 +40,9 @@
 		else
 			light = new /datum/light_source(src, .)

+/atom/proc/extinguish_light()
+	return
+
 /atom/Destroy()
 	if(light)
 		light.destroy()
@@ -1992,3 +1992,12 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 		dna.SetSEState(block, FALSE, TRUE)
 		genemutcheck(src, block, null, MUTCHK_FORCED)
 	dna.UpdateSE()
+
+/mob/living/carbon/human/extinguish_light()
+	// Parent function handles stuff the human may be holding
+	..()
+
+	var/obj/item/organ/internal/lantern/O = get_int_organ(/obj/item/organ/internal/lantern)
+	if(O && O.glowing)
+		O.toggle_biolum(TRUE)
+		visible_message("<span class='danger'>[src] is engulfed in shadows and fades into the darkness.</span>", "<span class='danger'>A sense of dread washes over you as you suddenly dim dark.</span>")
@@ -987,3 +987,8 @@

 /mob/living/proc/fakefire()
 	return
+
+/mob/living/extinguish_light()
+	for(var/atom/A in src)
+		if(A.light_range > 0)
+			A.extinguish_light()
@@ -79,6 +79,7 @@
 	var/obj/item/integrated_radio/signal/sradio // AI's signaller

 	var/translator_on = 0 // keeps track of the translator module
+	var/flashlight_on = FALSE //keeps track of the flashlight module

 	var/current_pda_messaging = null
 	var/custom_sprite = 0
@@ -607,3 +608,8 @@
 	else //something went very wrong.
 		CRASH("pAI without card")
 	loc = card
+
+/mob/living/silicon/pai/extinguish_light()
+	flashlight_on = FALSE
+	set_light(0)
+	card.set_light(0)
@@ -609,3 +609,20 @@
 		data["holder"] = 0

 	return data
+
+/datum/pai_software/flashlight
+	name = "Flashlight"
+	ram_cost = 5
+	id = "flashlight"
+
+/datum/pai_software/flashlight/toggle(mob/living/silicon/pai/user)
+	user.flashlight_on = !user.flashlight_on
+	if(user.flashlight_on)
+		user.set_light(2)
+		user.card.set_light(2)
+		return
+	user.set_light(0)
+	user.card.set_light(0)
+
+/datum/pai_software/flashlight/is_active(mob/living/silicon/pai/user)
+	return user.flashlight_on
@@ -1382,6 +1382,9 @@ var/list/robot_verbs_default = list(
 		if(2)
 			disable_component("comms", 60)

+/mob/living/silicon/robot/extinguish_light()
+	update_headlamp(1, 150)
+
 /mob/living/silicon/robot/rejuvenate()
 	..()
 	var/brute = 1000
@@ -511,3 +511,8 @@ var/global/list/obj/item/pda/PDAs = list()
 /obj/item/pda/process()
 	if(current_app)
 		current_app.program_process()
+
+/obj/item/pda/extinguish_light()
+	var/datum/data/pda/utility/flashlight/FL = find_program(/datum/data/pda/utility/flashlight)
+	if(FL && FL.fon)
+		FL.start()
@@ -137,7 +137,7 @@
 	idle_power_usage = 2
 	active_power_usage = 20
 	power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
-	var/on = 0					// 1 if on, 0 if off
+	var/on = FALSE					// 1 if on, 0 if off
 	var/on_gs = 0
 	var/static_power_used = 0
 	var/brightness_range = 8	// luminosity when on, also used in power calculation
@@ -159,7 +159,6 @@
 	var/nightshift_light_power = 0.45
 	var/nightshift_light_color = "#FFDDCC"

-
 // the smaller bulb light fixture

 /obj/machinery/light/small
@@ -213,7 +212,7 @@
 /obj/machinery/light/Destroy()
 	var/area/A = get_area(src)
 	if(A)
-		on = 0
+		on = FALSE
 //		A.update_lights()
 	return ..()

@@ -224,13 +223,13 @@
 			icon_state = "[base_state][on]"
 		if(LIGHT_EMPTY)
 			icon_state = "[base_state]-empty"
-			on = 0
+			on = FALSE
 		if(LIGHT_BURNED)
 			icon_state = "[base_state]-burned"
-			on = 0
+			on = FALSE
 		if(LIGHT_BROKEN)
 			icon_state = "[base_state]-broken"
-			on = 0
+			on = FALSE
 	return

 // update the icon_state and luminosity of the light depending on its state
@@ -255,7 +254,7 @@
 				if(status == LIGHT_OK && trigger)
 					status = LIGHT_BURNED
 					icon_state = "[base_state]-burned"
-					on = 0
+					on = FALSE
 					set_light(0)
 			else
 				use_power = ACTIVE_POWER_USE
@@ -730,3 +729,8 @@
 		if(limb)
 			limb.droplimb(0, DROPLIMB_BURN)
 	return FIRELOSS
+
+/obj/machinery/light/extinguish_light()
+	on = FALSE
+	visible_message("<span class='danger'>[src] flickers and falls dark.</span>")
+	update(0)
@@ -305,6 +305,11 @@ obj/item/gun/proc/newshot()
 		var/datum/action/A = X
 		A.UpdateButtonIcon()

+/obj/item/gun/extinguish_light()
+	if(gun_light.on)
+		toggle_gunlight()
+		visible_message("<span class='danger'>[src]'s light fades and turns off.</span>")
+
 /obj/item/gun/pickup(mob/user)
 	..()
 	if(azoom)