cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	html/changelogs/.all_changelog.yml
This commit is contained in:
skull132
2017-12-23 21:37:36 +02:00
parent 38a3dc55aa c7a979398f
commit 9faccd5e61
18 changed files with 225 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/signs.dm
+1 -1
View File
@@ -236,7 +236,7 @@
desc = "Flashy."
icon = 'icons/obj/christmas.dmi'
icon_state = "xmaslights"
layer = 5
layer = 4.9
/obj/structure/sign/christmas/wreath
name = "wreath"