cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
This commit is contained in:
PsiOmegaDelta
2015-08-27 08:53:22 +02:00
parent d567e775a8 9a23275755
commit d293b9ea25
11 changed files with 90 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/lighting.dm
+4
View File
@@ -166,6 +166,10 @@
desc = "A small lighting fixture."
light_type = /obj/item/weapon/light/bulb
/obj/machinery/light/small/emergency
brightness_range = 6
brightness_power = 2
brightness_color = "#da0205"
/obj/machinery/light/spot
name = "spotlight"