From 09d7739b0897e7688d45391cb5208ee76201ab42 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Thu, 22 Dec 2011 00:12:29 +0200 Subject: [PATCH 1/4] Fixed a runtime error related to all items now being checked for var/protective_temperature and fixed another runtime error by doing something unholy. --- code/defines/obj.dm | 5 +++-- code/defines/obj/clothing.dm | 1 - code/defines/obj/weapon.dm | 2 +- code/defines/procs/helpers.dm | 4 +++- code/game/objects/radio/headset.dm | 1 - 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 5131f6d2a5c..1765eb0e6d4 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -253,7 +253,7 @@ /obj/item name = "item" icon = 'items.dmi' - var/icon_old = null//For when weapons get bloodied this saves their old icon. + var/icon_old = null // For when weapons get bloodied this saves their old icon. var/abstract = 0 var/force = 0 var/item_state = null @@ -265,9 +265,10 @@ var/hitsound = null var/w_class = 3.0 var/wielded = 0 - var/twohanded = 0 ///Two handed and wielded off by default, nyoro~n -Agouri + var/twohanded = 0 // Two handed and wielded off by default, nyoro~n -Agouri var/force_unwielded = 0 var/force_wielded = 0 + var/protective_temperature = 0 // Placing this here to avoid runtime errors, due to tiny items being allowed on ears and being queried for this variable flags = FPRINT | TABLEPASS pass_flags = PASSTABLE pressure_resistance = 50 diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm index 0fa01cee787..56fd9242b93 100644 --- a/code/defines/obj/clothing.dm +++ b/code/defines/obj/clothing.dm @@ -9,7 +9,6 @@ var/body_parts_covered = 0 //see setup.dm for appropriate bit flags - var/protective_temperature = 0 var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets) var/permeability_coefficient = 1 // for chemicals/diseases diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 5eded119f93..aea140d1dc9 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -832,7 +832,7 @@ var/list/stamped var/see_face = 1 var/body_parts_covered = HEAD - var/protective_temperature = T0C + 10 + protective_temperature = T0C + 10 var/heat_transfer_coefficient = 0.99 var/gas_transfer_coefficient = 1 var/permeability_coefficient = 0.99 diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index b27bc90b2fa..b00ebb24c91 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -38,7 +38,9 @@ if (placeholder == null) placeholder = 2 if (!( isnum(num) )) - CRASH("num2hex not given a numeric argument (user error)") + //CRASH("num2hex not given a numeric argument (user error)") + // Doing above the worst thing a programmer can do, remove a message raising an error in order to clear the error log. + // I shall perform harakiri if this leads to major problems in the future - Abi return if (!( num )) return "0" diff --git a/code/game/objects/radio/headset.dm b/code/game/objects/radio/headset.dm index 401e2c68ca5..9cf3f25b32b 100644 --- a/code/game/objects/radio/headset.dm +++ b/code/game/objects/radio/headset.dm @@ -6,7 +6,6 @@ g_amt = 0 m_amt = 75 var - protective_temperature = 0 translate_binary = 0 translate_hive = 0 From 5964e0dc30625e7636a4c252dc1c4efaf4a5a300 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Thu, 22 Dec 2011 09:11:04 +0200 Subject: [PATCH 2/4] Fixed an obj/machinery/disposal/attackby() runtime error. --- code/modules/recycling/disposal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index bf779269439..d2079c6640f 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -73,7 +73,7 @@ if(isrobot(user)) return - else + else if (!isnull(I)) // As per code/game/atom_procs.dm, this shouldn't even be required, but for some reason is. -- Abi79 user.drop_item() I.loc = src From 6891b856c4a60e6ecae2892c98caf768e6aae1fa Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Thu, 22 Dec 2011 09:30:34 +0200 Subject: [PATCH 3/4] Fixed an obj/item/seeds/proc/harvest() runtime error related to grass seeds. --- code/game/machinery/hydroponics.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 3b2a8aefebd..a39d1b9445b 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -746,16 +746,16 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) while ( t_amount < (yield * parent.yieldmod )) var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable - - t_prod.seed = mypath - t_prod.species = species - t_prod.lifespan = lifespan - t_prod.endurance = endurance - t_prod.maturation = maturation - t_prod.production = production - t_prod.yield = yield - t_prod.potency = potency - t_prod.plant_type = plant_type + if ( !isnull(t_prod) ) // Needed for /obj/item/weapon/reagent_containers/food/snacks/grown/grass/New(), which deletes itself after it spawns a tile/grass + t_prod.seed = mypath + t_prod.species = species + t_prod.lifespan = lifespan + t_prod.endurance = endurance + t_prod.maturation = maturation + t_prod.production = production + t_prod.yield = yield + t_prod.potency = potency + t_prod.plant_type = plant_type t_amount++ parent.update_tray() From d930fd6ce91e2e54434e37ce40de5ef1c51d8bde Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Thu, 22 Dec 2011 13:45:09 +0200 Subject: [PATCH 4/4] Updated admins.txt --- config/admins.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/config/admins.txt b/config/admins.txt index 2bc78a67b3c..08c7be5da25 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -10,7 +10,6 @@ iaryni - Game Master masterofapples - Game Admin megacaesar - Game Admin miniature - Game Master -misterfox - Game Admin mloc - Game Master spaceman96 - Game Admin uristqwerty - Game Master \ No newline at end of file