Fixed issue 777.

Fixed issue 439.

Relating to the 439 fix, added a new define, TEMPERATURE_DAMAGE_COEFFICIENT. The name is slightly misleading, as it is used in reagents that affect body temperature. Leporazine now functions properly, and you can once again into space with a cup of coffee and a firesuit.

Also did a few grammar changes for newscasters.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4392 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-08-13 13:58:43 +00:00
parent bf9f922390
commit e4e7256d66
5 changed files with 43 additions and 47 deletions
+2 -2
View File
@@ -23,7 +23,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
/obj/machinery/newscaster
name = "Newscaster"
name = "newscaster"
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!"
icon = 'icons/obj/terminals.dmi'
icon_state = "newscaster_normal"
@@ -665,7 +665,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
//########################################################################################################################
/obj/item/weapon/newspaper
name = "Newspaper"
name = "newspaper"
desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations."
icon_state = "newspaper"
w_class = 2 //Let's make it fit in trashbags!
+5 -11
View File
@@ -235,19 +235,8 @@
/obj/structure/closet/crate/open()
playsound(src.loc, 'click.ogg', 15, 1, -3)
var/itemcount = 0
for(var/obj/O in src)
if(itemcount >= storage_capacity)
break
O.loc = get_turf(src)
itemcount++
for(var/mob/M in src)
if(itemcount >= storage_capacity)
break
M.loc = get_turf(src)
itemcount++
icon_state = icon_opened
src.opened = 1
@@ -255,9 +244,14 @@
/obj/structure/closet/crate/close()
playsound(src.loc, 'click.ogg', 15, 1, -3)
var/itemcount = 0
for(var/obj/O in get_turf(src))
if(itemcount >= storage_capacity)
break
if(O.density || O.anchored || O == src) continue
O.loc = src
itemcount++
icon_state = icon_closed
src.opened = 0