- Variable declaration standardization. Big commit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3671 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz@gmail.com
2012-05-25 19:26:36 +00:00
parent cfd59cf0a2
commit c2c7a3bcda
131 changed files with 1493 additions and 1402 deletions
+7 -6
View File
@@ -1,9 +1,10 @@
var/const
MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
MAX_IMPREGNATION_TIME = 150
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
MIN_ACTIVE_TIME = 300 //time between being dropped and going idle
MAX_ACTIVE_TIME = 600
var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
var/const/MAX_IMPREGNATION_TIME = 150
var/const/MIN_ACTIVE_TIME = 300 //time between being dropped and going idle
var/const/MAX_ACTIVE_TIME = 600
/obj/item/clothing/mask/facehugger
name = "alien"
@@ -267,4 +268,4 @@ var/const
..(M)
processing_objects.Remove(src)
*/
*/
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/structure/closet/crate
desc = "A crate."
name = "Crate"
@@ -75,9 +77,8 @@
density = 1
icon_opened = "freezeropen"
icon_closed = "freezer"
var
target_temp = T0C - 40
cooling_power = 40
var/target_temp = T0C - 40
var/cooling_power = 40
return_air()
var/datum/gas_mixture/gas = (..())
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/structure/grille
desc = "A piece of metal with evenly spaced gridlike holes in it. Blocks large object but lets small items, gas, or energy beams through. Strangely enough these grilles also lets meteors pass through them, whether they be small or huge station breaking death stones."
name = "grille"
@@ -8,9 +10,8 @@
flags = FPRINT | CONDUCT
pressure_resistance = 5*ONE_ATMOSPHERE
layer = 2.9
var
health = 10
destroyed = 0
var/health = 10
var/destroyed = 0
proc
healthcheck()
shock(mob/user, prb)
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
#define CANDLE_LUM 3
/obj/item/candle
@@ -7,9 +9,8 @@
icon_state = "candle1"
item_state = "candle1"
var
wax = 200
lit = 0
var/wax = 200
var/lit = 0
proc
light(var/flavor_text = "\red [usr] lights the [name].")
+6 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/**********************************************************************
Cyborg Spec Items
***********************************************************************/
@@ -88,8 +90,7 @@
possible_transfer_amounts = list(5,10,15,25,30,50,100)
flags = FPRINT | TABLEPASS | OPENCONTAINER
volume = 60
var
reagent = ""
var/reagent = ""
/obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline
@@ -219,11 +220,10 @@
flags = FPRINT | TABLEPASS| CONDUCT
force = 5.0
w_class = 3.0
var
// datum/effect/effect/system/spark_spread/spark_system
working = 0
mode = 1
disabled = 0
var/working = 0
var/mode = 1
var/disabled = 0
/*
New()
+5 -4
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/tk_grab
name = "Telekinetic Grab"
desc = "Magic"
@@ -8,10 +10,9 @@
w_class = 10.0
layer = 20
var
last_throw = 0
obj/focus = null
mob/living/host = null
var/last_throw = 0
var/obj/focus = null
var/mob/living/host = null
dropped(mob/user as mob)
+7 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/*
CONTAINS:
RCD
@@ -18,12 +20,11 @@ RCD
w_class = 3.0
m_amt = 50000
origin_tech = "engineering=4;materials=2"
var
datum/effect/effect/system/spark_spread/spark_system
matter = 0
working = 0
mode = 1
disabled = 0
var/datum/effect/effect/system/spark_spread/spark_system
var/matter = 0
var/working = 0
var/mode = 1
var/disabled = 0
New()
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/*
CONTAINS:
MATCHES
@@ -111,13 +113,12 @@ ZIPPO
item_state = "cigoff"
w_class = 1
body_parts_covered = null
var
lit = 0
icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
icon_off = "cigoff"
type_butt = /obj/item/weapon/cigbutt
lastHolder = null
smoketime = 300
var/lit = 0
var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
var/icon_off = "cigoff"
var/type_butt = /obj/item/weapon/cigbutt
var/lastHolder = null
var/smoketime = 300
proc
light(var/flavor_text = "[usr] lights the [name].")
@@ -237,13 +238,12 @@ ZIPPO
item_state = "cobpipeoff"
w_class = 1
body_parts_covered = null
var
lit = 0
icon_on = "cobpipeon" //Note - these are in masks.dmi
icon_off = "cobpipeoff"
lastHolder = null
smoketime = 100
maxsmoketime = 100 //make sure this is equal to your smoketime
var/lit = 0
var/icon_on = "cobpipeon" //Note - these are in masks.dmi
var/icon_off = "cobpipeoff"
var/lastHolder = null
var/smoketime = 100
var/maxsmoketime = 100 //make sure this is equal to your smoketime
proc
light(var/flavor_text = "[usr] lights the [name].")
@@ -469,4 +469,4 @@ ZIPPO
if(lit)
user.total_luminosity -= 2
src.sd_SetLuminosity(2)
return
return
+11 -10
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/flamethrower/full/New(var/loc)
..()
weldtool = new/obj/item/weapon/weldingtool(src)
@@ -24,15 +26,14 @@
w_class = 3.0
m_amt = 500
origin_tech = "combat=1;plasmatech=1"
var
status = 0
throw_amount = 100
lit = 0 //on or off
operating = 0//cooldown
turf/previousturf = null
obj/item/weapon/weldingtool/weldtool = null
obj/item/device/assembly/igniter/igniter = null
obj/item/weapon/tank/plasma/ptank = null
var/status = 0
var/throw_amount = 100
var/lit = 0 //on or off
var/operating = 0//cooldown
var/turf/previousturf = null
var/obj/item/weapon/weldingtool/weldtool = null
var/obj/item/device/assembly/igniter/igniter = null
var/obj/item/weapon/tank/plasma/ptank = null
Del()
@@ -243,4 +244,4 @@
//target.hotspot_expose(part4.air_contents.temperature*2,300)
target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500) // -- More of my "how do I shot fire?" dickery. -- TLE
//location.hotspot_expose(1000,500,1)
return
return
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/implantcase
name = "Glass Case"
desc = "A case containing an implant."
@@ -6,8 +8,7 @@
throw_speed = 1
throw_range = 5
w_class = 1.0
var
obj/item/weapon/implant/imp = null
var/obj/item/weapon/implant/imp = null
proc
update()
@@ -114,4 +115,4 @@
New()
src.imp = new /obj/item/weapon/implant/loyalty( src )
..()
return
return
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/machinery/implantchair
name = "Loyalty Implanter"
desc = "Used to implant occupants with loyalty implants."
@@ -7,16 +9,15 @@
opacity = 0
anchored = 1
var
ready = 1
malfunction = 0
list/obj/item/weapon/implant/loyalty/implant_list = list()
max_implants = 5
injection_cooldown = 600
replenish_cooldown = 6000
replenishing = 0
mob/living/carbon/occupant = null
injecting = 0
var/ready = 1
var/malfunction = 0
var/list/obj/item/weapon/implant/loyalty/implant_list = list()
var/max_implants = 5
var/injection_cooldown = 600
var/replenish_cooldown = 6000
var/replenishing = 0
var/mob/living/carbon/occupant = null
var/injecting = 0
proc
go_out()
@@ -1,10 +1,11 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/implant/freedom
name = "freedom"
desc = "Use this to escape from those evil Red Shirts."
color = "r"
var
activation_emote = "chuckle"
uses = 1.0
var/activation_emote = "chuckle"
var/uses = 1.0
New()
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/implantpad
name = "implantpad"
desc = "Used to modify implants."
@@ -7,10 +9,9 @@
throw_speed = 1
throw_range = 5
w_class = 2.0
var
obj/item/weapon/implantcase/case = null
broadcasting = null
listening = 1.0
var/obj/item/weapon/implantcase/case = null
var/broadcasting = null
var/listening = 1.0
proc
update()
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/cleaner
desc = "Space Cleaner!"
icon = 'janitor.dmi'
@@ -408,13 +410,12 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
/proc/GetColors(hex)
hex = uppertext(hex)
var
hi1 = text2ascii(hex, 2)
lo1 = text2ascii(hex, 3)
hi2 = text2ascii(hex, 4)
lo2 = text2ascii(hex, 5)
hi3 = text2ascii(hex, 6)
lo3 = text2ascii(hex, 7)
var/hi1 = text2ascii(hex, 2)
var/lo1 = text2ascii(hex, 3)
var/hi2 = text2ascii(hex, 4)
var/lo2 = text2ascii(hex, 5)
var/hi3 = text2ascii(hex, 6)
var/lo3 = text2ascii(hex, 7)
return list(((hi1>= 65 ? hi1-55 : hi1-48)<<4) | (lo1 >= 65 ? lo1-55 : lo1-48),
((hi2 >= 65 ? hi2-55 : hi2-48)<<4) | (lo2 >= 65 ? lo2-55 : lo2-48),
((hi3 >= 65 ? hi3-55 : hi3-48)<<4) | (lo3 >= 65 ? lo3-55 : lo3-48))
+6 -5
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/*
CONTAINS:
@@ -55,10 +57,9 @@ WELDINGTOOOL
m_amt = 70
g_amt = 30
origin_tech = "engineering=1"
var
welding = 0
status = 1
max_fuel = 20
var/welding = 0
var/status = 1
var/max_fuel = 20
proc
get_fuel()
remove_fuel(var/amount = 1, var/mob/M = null)
@@ -301,4 +302,4 @@ WELDINGTOOOL
New()
if(prob(50))
icon_state = "cutters-y"
icon_state = "cutters-y"
+8 -7
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/storage/lockbox
name = "lockbox"
desc = "A locked box."
@@ -8,12 +10,11 @@
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 4
req_access = list(access_armory)
var
locked = 1
broken = 0
icon_locked = "lockbox+l"
icon_closed = "lockbox"
icon_broken = "lockbox+b"
var/locked = 1
var/broken = 0
var/icon_locked = "lockbox+l"
var/icon_closed = "lockbox"
var/icon_broken = "lockbox+b"
attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -84,4 +85,4 @@
New()
..()
new /obj/item/weapon/flashbang/clusterbang(src)
new /obj/item/weapon/flashbang/clusterbang(src)
+7 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/tank/jetpack
name = "Jetpack (Empty)"
desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
@@ -5,11 +7,10 @@
w_class = 4.0
item_state = "jetpack"
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
var
datum/effect/effect/system/ion_trail_follow/ion_trail
on = 0.0
stabilization_on = 0
volume_rate = 500 //Needed for borg jetpack transfer
var/datum/effect/effect/system/ion_trail_follow/ion_trail
var/on = 0.0
var/stabilization_on = 0
var/volume_rate = 500 //Needed for borg jetpack transfer
New()
..()
@@ -108,4 +109,4 @@
if(air_contents.carbon_dioxide < 10)
usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
playsound(usr, 'alert.ogg', 50, 1)
return
return