Chair overhaul!

Shouldn't be any noticable difference ingame, but the chair path has changed from
/obj/structure/stool/chair
to
/obj/structure/stool/bed/chair
Electric chair path has also been changed as per the above.

New electric chair sprites! They ~won't~ make you want to cut out your eyes!


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3148 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-02-18 20:25:55 +00:00
parent f841d0eda6
commit f36295e16e
13 changed files with 374 additions and 468 deletions

View File

@@ -317,10 +317,10 @@
overlays = null
if(buckled)
if(istype(buckled, /obj/structure/stool/bed))
lying = 1
else
if(istype(buckled, /obj/structure/stool/bed/chair))
lying = 0
else
lying = 1
// Automatically drop anything in store / id / belt if you're not wearing a uniform.
if (zone_sel)

View File

@@ -792,10 +792,10 @@
update_body()
if(buckled)
if(istype(buckled, /obj/structure/stool/bed))
lying = 1
else
if(istype(buckled, /obj/structure/stool/bed/chair))
lying = 0
else
lying = 1
// Automatically drop anything in store / id / belt if you're not wearing a uniform.
if (!w_uniform)

View File

@@ -399,10 +399,10 @@
/mob/living/carbon/monkey/update_clothing()
if(buckled)
if(istype(buckled, /obj/structure/stool/bed))
lying = 1
else
if(istype(buckled, /obj/structure/stool/bed/chair))
lying = 0
else
lying = 1
if(update_icon) // Skie
..()

View File

@@ -130,7 +130,7 @@
var/m_intent = "run"//Living
var/lastDblClick = 0
var/lastKnownIP = null
var/obj/structure/stool/buckled = null//Living
var/obj/structure/stool/bed/buckled = null//Living
var/obj/item/weapon/handcuffs/handcuffed = null//Living
var/obj/item/l_hand = null//Living
var/obj/item/r_hand = null//Living

View File

@@ -487,7 +487,7 @@
for(var/mob/O in viewers(usr))
O.show_message(text("\red <B>[] manages to unbuckle themself!</B>", usr), 1)
usr << "\blue You successfully unbuckle yourself."
usr:buckled.manual_unbuckle_all(usr)
usr:buckled.manual_unbuckle(usr)
if("module")
if(issilicon(usr))
if(usr:module)