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
This commit is contained in:
taukausanake
2019-02-02 22:53:46 -06:00
17 changed files with 109 additions and 82 deletions
@@ -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>")
+5
View File
@@ -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