diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 4ec1b1587c8..d498109b2dd 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -83,7 +83,7 @@ icon = loc if(!in_range(src, user)) if(icon == src) - to_chat(user, "\blue It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer.") + to_chat(user, "It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer.") return var/celsius_temperature = air_contents.temperature-T0C diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index a3969f7c5eb..22fb9156004 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -406,8 +406,10 @@ /datum/seed/proc/randomize() roundstart = 0 - seed_name = "strange plant" // TODO: name generator. + // TODO: Better name generator + seed_name = "cultivar #[uid]" display_name = "strange plants" // TODO: name generator. + base_name = seed_name mysterious = 1 seed_noun = pick("spores","nodes","cuttings","seeds") modular_icon = 1 diff --git a/code/modules/hydroponics/seed_controller.dm b/code/modules/hydroponics/seed_controller.dm index aaa30c3275f..7e56c57a45f 100644 --- a/code/modules/hydroponics/seed_controller.dm +++ b/code/modules/hydroponics/seed_controller.dm @@ -96,9 +96,9 @@ var/global/datum/controller/plants/plant_controller // Set in New(). // Proc for creating a random seed type. /datum/controller/plants/proc/create_random_seed(var/survive_on_station) var/datum/seed/seed = new() - seed.randomize() seed.uid = plant_controller.seeds.len + 1 seed.name = "[seed.uid]" + seed.randomize() seeds[seed.name] = seed if(survive_on_station) @@ -106,8 +106,7 @@ var/global/datum/controller/plants/plant_controller // Set in New(). seed.consume_gasses["plasma"] = null seed.consume_gasses["carbon_dioxide"] = null if(seed.chems && !isnull(seed.chems["pacid"])) - seed.chems["pacid"] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous. - seed.chems -= null // Setting to null does not actually remove the entry, which is weird. + seed.chems -= "pacid" // Eating through the hull will make these plants completely inviable, albeit very dangerous. seed.set_trait(TRAIT_IDEAL_HEAT,293) seed.set_trait(TRAIT_HEAT_TOLERANCE,20) seed.set_trait(TRAIT_IDEAL_LIGHT,8) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 857ff6b2de2..981dad22bf5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -12,6 +12,7 @@ var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. /mob/living/carbon/human/New(var/new_loc, var/new_species = null, var/delay_ready_dna = 0) + if(!dna) dna = new /datum/dna(null) // Species name is handled by set_species() @@ -22,6 +23,8 @@ else set_species(delay_icon_update = 1) + ..() + if(species) real_name = species.get_random_name(gender) name = real_name @@ -32,8 +35,6 @@ reagents = R R.my_atom = src - ..() - prev_gender = gender // Debug for plural genders make_blood() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 0aa2daa0f4f..3f7a76c0470 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -201,7 +201,8 @@ update_hair(redraw_mob) //rebuild hair update_fhair(redraw_mob) update_head_accessory(redraw_mob) - sec_hud_set_ID() + if(hud_list.len) + sec_hud_set_ID() update_inv_wear_mask(redraw_mob) if(slot_handcuffed) handcuffed = W @@ -220,7 +221,8 @@ update_inv_belt(redraw_mob) if(slot_wear_id) wear_id = W - sec_hud_set_ID() + if(!hud_list.len) + sec_hud_set_ID() update_inv_wear_id(redraw_mob) if(slot_wear_pda) wear_pda = W diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 024172abe8b..1e255ea50cc 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -99,4 +99,4 @@ desc = "strong adamantine hands" icon_state = "golem" item_state = null - flags = ABSTRACT | NODROP \ No newline at end of file + flags = ABSTRACT | NODROP diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 39945505aed..85657dd2b5b 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -27,12 +27,10 @@ idle_power_usage = 100 // create a new disposal -// find the attached trunk (if present) and init gas resvr. +// find the attached trunk (if present) /obj/machinery/disposal/New() ..() trunk_check() - - air_contents = new/datum/gas_mixture() //gas.volume = 1.05 * CELLSTANDARD update() @@ -59,6 +57,7 @@ var/datum/gas_mixture/env = new env.copy_from(L.return_air()) var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1) + air_contents = new air_contents.merge(removed) trunk_check()