cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-09 17:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
CaelAislinn
2012-02-15 07:04:43 +10:00
parent 43ead88027 9d12cf6c12
commit 95b521dede
36 changed files with 202 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/defines/obj.dm
View File

@@ -663,6 +663,25 @@
anchored = 1.0
var/list/buckled_mobs = list( )
/obj/stool/chair/comfy
name = "comfy chair"
desc = "It looks comfy."
/obj/stool/chair/comfy/brown
icon_state = "comfychair_brown"
/obj/stool/chair/comfy/beige
icon_state = "comfychair_beige"
/obj/stool/chair/comfy/teal
icon_state = "comfychair_teal"
/obj/stool/chair/comfy/black
icon_state = "comfychair_black"
/obj/stool/chair/comfy/lime
icon_state = "comfychair_lime"
/obj/structure/stool/chair/e_chair
name = "electrified chair"
desc = "Looks absolutely terrifying!"