Merge pull request #13081 from Putnam3145/ethereals

Ports ethereals from TG
2020-08-09 05:39:43 -07:00
parent 2bd75034c9 bdee7bdc63
commit d25daec117
37 changed files with 524 additions and 24 deletions
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -35,6 +35,10 @@
 	name = "syndi-cakes"
 	icon_state = "syndi_cakes"

+/obj/item/trash/energybar
+	name = "energybar wrapper"
+	icon_state = "energybar"
+
 /obj/item/trash/waffles
 	name = "waffles tray"
 	icon_state = "waffles"