From eae0178138e3ed35d930b9ed8be1d57ea6beba62 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Sun, 14 Oct 2012 03:24:05 +0000 Subject: [PATCH] Removed a stupid dumb wrong bad define from explosion_recursive.dm. It was a typo define for rwalls, but the proper define was right below it. Fixed a typo in bluespaceartillery.dm. Fixed invisible filing cabinets. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4872 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/explosion_recursive.dm | 3 --- code/modules/awaymissions/bluespaceartillery.dm | 2 +- code/modules/paperwork/filingcabinet.dm | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm index d5aea573bc..80b5281180 100644 --- a/code/game/objects/explosion_recursive.dm +++ b/code/game/objects/explosion_recursive.dm @@ -105,9 +105,6 @@ proc/explosion_rec(turf/epicenter, power) /turf/simulated/wall explosion_resistance = 5 -/turf/simulated/r_wall - explosion_resistance = 25 - /turf/simulated/wall/r_wall explosion_resistance = 25 diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index ab634df536..eb4a702b02 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -23,7 +23,7 @@ dat += "Locked on
" dat += "180 seconds are required to charge between shots:
" dat += "Open Fire
" - dat += "Deployment of weapon authorized by
Nanotrasen Naval Command

Rember, friendly fire is grounds for termination of your contract and life.
" + dat += "Deployment of weapon authorized by
Nanotrasen Naval Command

Remember, friendly fire is grounds for termination of your contract and life.
" user << browse(dat, "window=scroll") onclose(user, "scroll") return diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 0819b6e97a..c521f66782 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -2,7 +2,7 @@ name = "filing cabinet" desc = "A large cabinet with drawers." icon = 'icons/obj/bureaucracy.dmi' - icon_state = "filing_cabinet" + icon_state = "filingcabinet" density = 1 anchored = 1