mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 23:29:10 +01:00
powder that makes you say yes
This commit is contained in:
@@ -130,8 +130,6 @@
|
||||
icon_state = "big_flamp-construct-stage2"
|
||||
if(3)
|
||||
icon_state = "big_flamp-empty"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
// Fairy lights
|
||||
|
||||
@@ -211,4 +209,3 @@
|
||||
if(3)
|
||||
icon_state = "big_flamp-empty"
|
||||
*/
|
||||
>>>>>>> 048fa34e2a... Merge pull request #13267 from Very-Soft/thatniceglow
|
||||
|
||||
Reference in New Issue
Block a user