mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 11:05:03 +01:00
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:
@@ -84,6 +84,11 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/flashlight/extinguish_light()
|
||||
if(on)
|
||||
on = FALSE
|
||||
update_brightness()
|
||||
|
||||
/obj/item/flashlight/pen
|
||||
name = "penlight"
|
||||
desc = "A pen-sized light, used by medical staff."
|
||||
@@ -122,7 +127,7 @@
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
flags = CONDUCT
|
||||
materials = list()
|
||||
on = 1
|
||||
on = TRUE
|
||||
|
||||
|
||||
// green-shaded desk lamp
|
||||
@@ -292,6 +297,9 @@
|
||||
new T(loc)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/item/flashlight/flare/extinguish_light()
|
||||
visible_message("<span class='danger'>[src] dims slightly before scattering the shadows around it.</span>")
|
||||
|
||||
/obj/item/flashlight/flare/torch
|
||||
name = "torch"
|
||||
desc = "A torch fashioned from some leaves and a log."
|
||||
@@ -312,7 +320,7 @@
|
||||
brightness_on = 6
|
||||
light_color = "#FFBF00"
|
||||
materials = list()
|
||||
on = 1 //Bio-luminesence has one setting, on.
|
||||
on = TRUE //Bio-luminesence has one setting, on.
|
||||
|
||||
/obj/item/flashlight/slime/New()
|
||||
set_light(brightness_on)
|
||||
@@ -323,6 +331,9 @@
|
||||
/obj/item/flashlight/slime/attack_self(mob/user)
|
||||
return //Bio-luminescence does not toggle.
|
||||
|
||||
/obj/item/flashlight/slime/extinguish_light()
|
||||
visible_message("<span class='danger'>[src] dims slightly before scattering the shadows around it.</span>")
|
||||
|
||||
/obj/item/flashlight/emp
|
||||
origin_tech = "magnets=3;syndicate=1"
|
||||
|
||||
|
||||
@@ -339,3 +339,7 @@
|
||||
pai.ex_act(severity)
|
||||
else
|
||||
qdel(src)
|
||||
|
||||
/obj/item/paicard/extinguish_light()
|
||||
pai.extinguish_light()
|
||||
set_light(0)
|
||||
|
||||
Reference in New Issue
Block a user