cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Huge commit! Standardizes var definitions in most places.

Browse Source 
Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2012-05-29 16:26:48 +01:00
parent 5f030b1117
commit fbb67b2e42
157 changed files with 1736 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/alien/facehugger.dm
+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 29/05/2012 15:03:05
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)
*/
*/
code/game/objects/devices/flashlight.dm
+7 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/item/device/flashlight
name = "flashlight"
desc = "A hand-held emergency light."
@@ -7,11 +9,10 @@
flags = FPRINT | ONBELT | TABLEPASS | CONDUCT
m_amt = 50
g_amt = 20
var
on = 0
brightness_on = 4 //luminosity when on
icon_on = "flight1"
icon_off = "flight0"
var/on = 0
var/brightness_on = 4 //luminosity when on
var/icon_on = "flight1"
var/icon_off = "flight0"
/obj/item/device/flashlight/initialize()
..()
@@ -196,4 +197,4 @@
set src in oview(1)
if(!usr.stat)
attack_self(usr)
attack_self(usr)
code/game/objects/grille.dm
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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)
code/game/objects/items/candle.dm
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
#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].")
code/game/objects/items/robot_items.dm
+6 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/**********************************************************************
Cyborg Spec Items
***********************************************************************/
@@ -90,8 +92,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
@@ -221,11 +222,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()
code/game/objects/items/tk_grab.dm
+5 -4
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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)
code/game/objects/items/weapons/RCD.dm
+8 -7
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/*
CONTAINS:
RCD
@@ -18,13 +20,12 @@ 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
max_matter = 30
var/datum/effect/effect/system/spark_spread/spark_system
var/matter = 0
var/working = 0
var/mode = 1
var/disabled = 0
var/max_matter = 30
New()
code/game/objects/items/weapons/cigs_lighters.dm
+17 -18
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/*
CONTAINS:
MATCHES
@@ -113,14 +115,13 @@ 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"
icon_butt = "cigbutt"
lastHolder = null
smoketime = 300
butt_count = 5 //count of butt sprite variations
var/lit = 0
var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
var/icon_off = "cigoff"
var/icon_butt = "cigbutt"
var/lastHolder = null
var/smoketime = 300
var/butt_count = 5 //count of butt sprite variations
proc
light(var/flavor_text = "[usr] lights the [name].")
@@ -244,13 +245,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].")
@@ -338,8 +338,7 @@ ZIPPO
w_class = 1
throwforce = 2
flags = ONBELT | TABLEPASS
var
cigcount = 6
var/cigcount = 6
update_icon()
@@ -472,4 +471,4 @@ ZIPPO
if(lit)
user.total_luminosity -= 2
src.sd_SetLuminosity(2)
return
return
code/game/objects/items/weapons/flamethrower.dm
+11 -10
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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()
@@ -245,4 +246,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
code/game/objects/items/weapons/grenades.dm
+7 -7
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/*
CONTAINS:
EMP GRENADE
@@ -16,9 +18,8 @@ FLASHBANG
throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
origin_tech = "materials=2;magnets=3"
var
active = 0
det_time = 50
var/active = 0
var/det_time = 50
proc
prime()
clown_check(var/mob/living/user)
@@ -90,10 +91,9 @@ FLASHBANG
throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
origin_tech = "materials=2;combat=1"
var
active = 0
det_time = 30
banglet = 0
var/active = 0
var/det_time = 30
var/banglet = 0
proc
bang(var/turf/T , var/mob/living/carbon/M)
prime()
code/game/objects/items/weapons/implants/implant.dm
+10 -11
View File
@@ -1,13 +1,14 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/item/weapon/implant
name = "implant"
desc = "An implant. Not usually seen outside a body."
icon = 'items.dmi'
icon_state = "implant"
var
implanted = null
mob/imp_in = null
color = "b"
allow_reagents = 0
var/implanted = null
var/mob/imp_in = null
var/color = "b"
var/allow_reagents = 0
proc
trigger(emote, source as mob)
activate()
@@ -48,9 +49,8 @@
/obj/item/weapon/implant/uplink
name = "uplink implant"
desc = "A micro-telecrystal implant which allows for instant transportation of equipment."
var
activation_emote = "chuckle"
obj/item/device/uplink/radio/uplink = null
var/activation_emote = "chuckle"
var/obj/item/device/uplink/radio/uplink = null
New()
@@ -77,8 +77,7 @@
/obj/item/weapon/implant/tracking
name = "tracking implant"
desc = "An implant which relays information to the appropriate tracking computer."
var
id = 1.0
var/id = 1.0
get_data()
@@ -450,4 +449,4 @@ the implant may become unstable and either pre-maturely inject the subject or si
usr << "You suddenly start seeing body temperatures of whoever is around you."
else
usr << "This implant is not compatible!"
return*/
return*/
code/game/objects/items/weapons/implants/implantcase.dm
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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()
@@ -125,4 +126,4 @@
New()
src.imp = new /obj/item/weapon/implant/death_alarm( src )
..()
return
return
code/game/objects/items/weapons/implants/implantchair.dm
+11 -10
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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()
code/game/objects/items/weapons/implants/implanter.dm
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/item/weapon/implanter
name = "implanter"
icon = 'items.dmi'
@@ -6,8 +8,7 @@
throw_speed = 1
throw_range = 5
w_class = 2.0
var
obj/item/weapon/implant/imp = null
var/obj/item/weapon/implant/imp = null
proc
update()
@@ -108,4 +109,4 @@
var/obj/item/weapon/implant/compressed/c = imp
c.scanned = A
A.loc.contents.Remove(A)
update()
update()
code/game/objects/items/weapons/implants/implantfreedom.dm
+4 -3
View File
@@ -1,10 +1,11 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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()
code/game/objects/items/weapons/implants/implantpad.dm
+5 -4
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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()
code/game/objects/items/weapons/mops_cleaners.dm
+8 -7
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/item/weapon/cleaner
desc = "A chemical that cleans messes."
icon = 'janitor.dmi'
@@ -451,13 +453,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))
code/game/objects/items/weapons/surgery_tools.dm
+5 -4
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/*
CONTAINS:
RETRACTOR
@@ -651,11 +653,10 @@ CIRCULAR SAW
/obj/item/weapon/autopsy_scanner/var/timeofdeath = null
/datum/autopsy_data_data
var
weapon = null // this is the DEFINITE weapon type that was used
list/organs_scanned = list() // this maps a number of scanned organs to
var/weapon = null // this is the DEFINITE weapon type that was used
var/list/organs_scanned = list() // this maps a number of scanned organs to
// the wounds to those organs with this data's weapon type
organ_names = ""
var/organ_names = ""
/obj/item/weapon/autopsy_scanner/proc/add_data(var/datum/organ/external/O)
if(!O.autopsy_data.len && !O.trace_chemicals.len) return
code/game/objects/items/weapons/tools.dm
+6 -5
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/*
CONTAINS:
@@ -53,10 +55,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)
@@ -334,4 +335,4 @@ WELDINGTOOOL
M.update_clothing()
return
else
..()
..()
code/game/objects/radio/headset.dm
+7 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/item/device/radio/headset
name = "radio headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
@@ -8,11 +10,10 @@
subspace_transmission = 1
protective_temperature = 0
canhear_range = 1 // can't hear headsets from very far away
var
translate_binary = 0
translate_hive = 0
obj/item/device/encryptionkey/keyslot1 = null
obj/item/device/encryptionkey/keyslot2 = null
var/translate_binary = 0
var/translate_hive = 0
var/obj/item/device/encryptionkey/keyslot1 = null
var/obj/item/device/encryptionkey/keyslot2 = null
/obj/item/device/radio/headset/New()
..()
@@ -245,4 +246,4 @@
src.name = "broken radio headset"
return
return
return
code/game/objects/radio/radio.dm
+23 -24
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
var/GLOBAL_RADIO_TYPE = 1 // radio type to use
// 0 = old radios
// 1 = new radios (subspace technology)
@@ -9,21 +11,20 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
suffix = "\[3\]"
icon_state = "walkietalkie"
item_state = "walkietalkie"
var
on = 1 // 0 for off
last_transmission
frequency = 1459 //common chat
traitor_frequency = 0 //tune to frequency to unlock traitor supplies
canhear_range = 3 // the range which mobs can hear this radio from
obj/item/device/radio/patch_link = null
obj/item/device/uplink/radio/traitorradio = null
wires = WIRE_SIGNAL | WIRE_RECEIVE | WIRE_TRANSMIT
b_stat = 0
broadcasting = 0
listening = 1
freerange = 0 // 0 - Sanitize frequencies, 1 - Full range
list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
subspace_transmission = 0
var/on = 1 // 0 for off
var/last_transmission
var/frequency = 1459 //common chat
var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
var/canhear_range = 3 // the range which mobs can hear this radio from
var/obj/item/device/radio/patch_link = null
var/obj/item/device/uplink/radio/traitorradio = null
var/wires = WIRE_SIGNAL | WIRE_RECEIVE | WIRE_TRANSMIT
var/b_stat = 0
var/broadcasting = 0
var/listening = 1
var/freerange = 0 // 0 - Sanitize frequencies, 1 - Full range
var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
var/subspace_transmission = 0
// "Example" = FREQ_LISTENING|FREQ_BROADCASTING
flags = 450 // hello i'm a fucking idiot why is this 450?? CODE GODS PLEASE EXPLAIN~
throw_speed = 2
@@ -31,19 +32,17 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
w_class = 2
g_amt = 25
m_amt = 75
var/const
WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
WIRE_RECEIVE = 2
WIRE_TRANSMIT = 4
TRANSMISSION_DELAY = 5 // only 2/second/radio
FREQ_LISTENING = 1
var/const/WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
var/const/WIRE_RECEIVE = 2
var/const/WIRE_TRANSMIT = 4
var/const/TRANSMISSION_DELAY = 5 // only 2/second/radio
var/const/FREQ_LISTENING = 1
//FREQ_BROADCASTING = 2
/obj/item/device/radio
var
datum/radio_frequency/radio_connection
list/datum/radio_frequency/secure_radio_connections = new
var/datum/radio_frequency/radio_connection
var/list/datum/radio_frequency/secure_radio_connections = new
proc
set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
code/game/objects/storage/lockbox.dm
+8 -7
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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)
@@ -90,4 +91,4 @@
New()
..()
new /obj/item/weapon/flashbang/clusterbang(src)
new /obj/item/weapon/flashbang/clusterbang(src)
code/game/objects/tanks/jetpack.dm
+7 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/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