Merge branch 'master' into toycuffs

maybe fixing things?

code/datums/weather/weather_types/radiation_storm.dm

@@ -15,7 +15,7 @@
 
 	end_duration = 100
 	end_message = "<span class='notice'>The air seems to be cooling off again.</span>"
-
+	var/pre_maint_all_access
 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/turret_protected/ai_upload, /area/turret_protected/ai_upload_foyer,
 	/area/turret_protected/ai, /area/storage/emergency, /area/storage/emergency2, /area/crew_quarters/sleep, /area/security/brig, /area/shuttle)
@@ -26,7 +26,9 @@
 /datum/weather/rad_storm/telegraph()
 	..()
 	status_alarm(TRUE)
-	make_maint_all_access()
+	pre_maint_all_access = maint_all_access
+	if(!maint_all_access)
+		make_maint_all_access()
 
 
 /datum/weather/rad_storm/weather_act(mob/living/L)
@@ -51,7 +53,8 @@
 		return
 	priority_announcement.Announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
 	status_alarm(FALSE)
-	revoke_maint_all_access()
+	if(!pre_maint_all_access)
+		revoke_maint_all_access()
 
 /datum/weather/rad_storm/proc/status_alarm(active)	//Makes the status displays show the radiation warning for those who missed the announcement.
 	if(active)

code/game/gamemodes/shadowling/shadowling_abilities.dm

@@ -64,6 +64,9 @@
 /obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishItem(var/obj/item/I) //WARNING NOT SUFFICIENT TO EXTINGUISH AN ITEM HELD BY A MOB
 	if(istype(I, /obj/item/flashlight))
 		var/obj/item/flashlight/F = I
+		if(istype(F, /obj/item/flashlight/glowstick))
+			var/obj/item/flashlight/glowstick/gstick = F
+			gstick.fuel = 0
 		if(F.on)
 			if(is_type_in_list(I, blacklisted_lights))
 				I.visible_message("<span class='danger'>[I] dims slightly before scattering the shadows around it.</span>")

code/game/objects/items/devices/flashlight.dm

@@ -11,6 +11,7 @@
 	actions_types = list(/datum/action/item_action/toggle_light)
 	var/on = FALSE
 	var/brightness_on = 4 //luminosity when on
+	var/togglesound = 'sound/weapons/empty.ogg'
 
 /obj/item/flashlight/Initialize()
 	. = ..()
@@ -35,7 +36,7 @@
 
 		return 0
 	on = !on
-	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+	playsound(user, togglesound, 100, 1)
 	update_brightness(user)
 	for(var/X in actions)
 		var/datum/action/A = X
@@ -158,6 +159,7 @@ obj/item/flashlight/lamp/bananalamp
 	light_color = "#ff0000" // changed colour to a more brighter red.
 	icon_state = "flare"
 	item_state = "flare"
+	togglesound = 'sound/goonstation/misc/matchstick_light.ogg'
 	var/fuel = 0
 	var/on_damage = 7
 	var/produce_heat = 1500
@@ -311,10 +313,13 @@ obj/item/flashlight/lamp/bananalamp
 	color = LIGHT_COLOR_GREEN
 	icon_state = "glowstick"
 	item_state = "glowstick"
+	togglesound = 'sound/effects/bone_break_1.ogg'
 	var/fuel = 0
+	var/fuel_lower = 1600
+	var/fuel_upp = 2000
 
 /obj/item/flashlight/glowstick/Initialize()
-	fuel = rand(1600, 2000)
+	fuel = rand(fuel_lower, fuel_upp)
 	light_color = color
 	. = ..()
 
@@ -389,6 +394,13 @@ obj/item/flashlight/lamp/bananalamp
 	name = "pink glowstick"
 	color = LIGHT_COLOR_PINK
 
+/obj/item/flashlight/glowstick/emergency
+	name = "emergency glowstick"
+	desc = "A cheap looking, mass produced glowstick. You can practically feel it was made on a tight budget."
+	color = LIGHT_COLOR_BLUE
+	fuel_lower = 30
+	fuel_upp = 90
+
 /obj/item/flashlight/glowstick/random
 	name = "random colored glowstick"
 	icon_state = "random_glowstick"

code/game/objects/items/weapons/storage/boxes.dm

@@ -72,6 +72,7 @@
 		new /obj/item/clothing/mask/breath( src )
 		new /obj/item/tank/emergency_oxygen( src )
 		new /obj/item/reagent_containers/hypospray/autoinjector( src )
+		new /obj/item/flashlight/glowstick/emergency( src )
 		return
 
 /obj/item/storage/box/survival_vox
@@ -83,6 +84,7 @@
 	new /obj/item/clothing/mask/breath/vox(src)
 	new /obj/item/tank/emergency_oxygen/nitrogen(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+	new /obj/item/flashlight/glowstick/emergency(src)
 
 /obj/item/storage/box/survival_plasmaman
 	icon_state = "box_plasma"
@@ -93,6 +95,7 @@
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/tank/emergency_oxygen/plasma(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+	new /obj/item/flashlight/glowstick/emergency(src)
 
 /obj/item/storage/box/engineer
 	icon_state = "box_eng"
@@ -102,6 +105,7 @@
 		new /obj/item/clothing/mask/breath( src )
 		new /obj/item/tank/emergency_oxygen/engi( src )
 		new /obj/item/reagent_containers/hypospray/autoinjector( src )
+		new /obj/item/flashlight/glowstick/emergency( src )
 		return
 
 /obj/item/storage/box/survival_mining
@@ -113,6 +117,7 @@
 		new /obj/item/tank/emergency_oxygen/engi(src)
 		new /obj/item/crowbar/red(src)
 		new /obj/item/reagent_containers/hypospray/autoinjector(src)
+		new /obj/item/flashlight/glowstick/emergency(src)
 
 /obj/item/storage/box/survival_syndi
 	icon_state = "box_syndi"

html/changelog.html

@@ -56,6 +56,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">29 December 2018</h2>
+			<h3 class="author">Alonefromhell updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Glowsticks are now compatible with shadowlings.</li>
+			</ul>
+			<h3 class="author">Spartan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds emergency glowsticks to emergency box. sound: Glowsticks and flares now make more relevant usage sounds.</li>
+			</ul>
+			<h3 class="author">farie82 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">at the end of a radiation storm the maint access doesn't get revoked if it was set to emergency before hand.</li>
+			</ul>
+
 			<h2 class="date">28 December 2018</h2>
 			<h3 class="author">AzuleUtama updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -8507,3 +8507,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   v0idp:
   - bugfix: missiles shot from missile racks in mechs will no longer spin in air
   - rscadd: banana cake and slice
+2018-12-29:
+  Alonefromhell:
+  - tweak: Glowsticks are now compatible with shadowlings.
+  Spartan:
+  - rscadd: 'Adds emergency glowsticks to emergency box. sound: Glowsticks and flares
+      now make more relevant usage sounds.'
+  farie82:
+  - bugfix: at the end of a radiation storm the maint access doesn't get revoked if
+      it was set to emergency before hand.