From fc9607d17b3bb79f2c85d0600ddcfeb8b867d246 Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 29 Apr 2015 07:38:26 -0400 Subject: [PATCH 1/6] Fixes Portable Chem Dispenser recharge delay Now calculates properly, and matches up with the recently-reduced recharge delay of the full-size dispensers --- code/modules/reagents/Chemistry-Machinery.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 897ecad30b2..6e8dc205921 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -293,7 +293,7 @@ energy = 5 max_energy = 5 amount = 5 - recharge_delay = 30 + recharge_delay = 10 dispensable_reagents = list() var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen"), list("lithium", "sugar", "water", "copper", "mercury", "sodium"), @@ -323,7 +323,7 @@ time += C.rating for(var/obj/item/weapon/stock_parts/cell/P in component_parts) time += round(P.maxcharge, 10000) / 10000 - recharge_delay /= time/2 //delay between recharges, double the usual time on lowest 50% less than usual on highest + recharge_delay = 10 / (time/2) //delay between recharges, double the usual time on lowest 33% less than usual on highest for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) for(i=1, i<=M.rating, i++) dispensable_reagents = sortList(dispensable_reagents | special_reagents[i]) From 57cd8f69c7175a9a91745149440934cee06975b4 Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 29 Apr 2015 07:52:56 -0400 Subject: [PATCH 2/6] Fixes Colorful Reagent coloring non-simple mobs --- code/modules/reagents/newchem/other.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm index 7e8b2b195bf..6012f1a4bbb 100644 --- a/code/modules/reagents/newchem/other.dm +++ b/code/modules/reagents/newchem/other.dm @@ -120,7 +120,7 @@ datum/reagent/colorful_reagent mix_message = "The substance flashes multiple colors and emits the smell of a pocket protector." datum/reagent/colorful_reagent/reaction_mob(var/mob/living/simple_animal/M, var/method=TOUCH, var/volume) - if(M) + if(M && istype(M)) M.color = pick(random_color_list) ..() return From e9e4cda99177d2630239d754d1807bd0180a74ea Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 29 Apr 2015 07:59:17 -0400 Subject: [PATCH 3/6] Fixes "An Unknown Servent" Typo --- code/modules/mob/spirit/viewpoint.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/spirit/viewpoint.dm b/code/modules/mob/spirit/viewpoint.dm index 0cd54451361..15c4937b43d 100644 --- a/code/modules/mob/spirit/viewpoint.dm +++ b/code/modules/mob/spirit/viewpoint.dm @@ -113,7 +113,7 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() /obj/cult_viewpoint/proc/get_cult_name() if (cult_name) return cult_name - return "An Unknown Servent" + return "An Unknown Servant" /obj/cult_viewpoint/proc/set_cult_name(var/newName) From 5e9e2cbd16d14482492491a1f00417c1168bb92a Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 29 Apr 2015 08:09:30 -0400 Subject: [PATCH 4/6] Fixes Cyborg Analyzer not showing destroyed components --- code/modules/mob/living/silicon/robot/robot_damage.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 81df60fa1e5..f01b7abbd7c 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -32,11 +32,11 @@ else heal_overall_damage(0, -amount) -/mob/living/silicon/robot/proc/get_damaged_components(var/brute, var/burn) +/mob/living/silicon/robot/proc/get_damaged_components(var/brute, var/burn, var/get_all) var/list/datum/robot_component/parts = list() for(var/V in components) var/datum/robot_component/C = components[V] - if(C.installed == 1) if((brute && C.brute_damage) || (burn && C.electronics_damage)) + if(C.installed == 1 || get_all) if((brute && C.brute_damage) || (burn && C.electronics_damage)) parts += C return parts From 4915d7067ebc77f6f7651b3cb08c6b8d9507e1fe Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 29 Apr 2015 09:01:44 -0400 Subject: [PATCH 5/6] Fixes setting default language through Check Known Languages Also removes some non-functional code from the previous "fix". --- code/modules/mob/language.dm | 2 +- code/modules/mob/living/default_language.dm | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index fa5725faf19..80761679cba 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -505,7 +505,7 @@ if(L == default_language) dat += "[L.name] (:[L.key]) - default - reset
[L.desc]

" else - dat += "[L.name] (:[L.key]) - set default
[L.desc]

" + dat += "[L.name] (:[L.key]) - set default
[L.desc]

" src << browse(dat, "window=checklanguage") diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index 74cd2d97917..b0de6465aff 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -5,11 +5,7 @@ set name = "Set Default Language" set category = "IC" - if(default_language == "unathi") - src << "You will now speak Sinta'unathi if you do not specify a language when speaking." - else if(default_language == "tajaran") - src << "You will now speak Siik'tajr if you do not specify a language when speaking." - else if(language) + if(language) src << "You will now speak [language] if you do not specify a language when speaking." else src << "You will now speak whatever your standard default language is if you do not specify one when speaking." From c1826deeda381d17cd6345beeca6a1b5ef095bbe Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 29 Apr 2015 18:12:24 -0400 Subject: [PATCH 6/6] Various Fixes --- code/modules/assembly/igniter.dm | 2 +- code/modules/reagents/Chemistry-Machinery.dm | 6 +++--- .../modules/reagents/reagent_containers/glass_containers.dm | 2 +- maps/cyberiad.dmm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 49cfe687eb1..d91eac4a391 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -22,7 +22,7 @@ if (istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/)) var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc if(beakerbomb) - beakerbomb.ignite() + beakerbomb.heat_beaker() var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 6e8dc205921..289c388b17b 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -295,9 +295,9 @@ amount = 5 recharge_delay = 10 dispensable_reagents = list() - var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen"), - list("lithium", "sugar", "water", "copper", "mercury", "sodium"), - list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron")) + var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "tungsten", "water"), + list("lithium", "sugar", "copper", "mercury", "sodium","iodine","bromine"), + list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron", "silver")) /obj/machinery/chem_dispenser/constructable/New() ..() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 04c9f14e092..a469be34254 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -246,7 +246,7 @@ else usr << "There is no assembly to remove." -/obj/item/weapon/reagent_containers/glass/beaker/ignite() +/obj/item/weapon/reagent_containers/glass/beaker/proc/heat_beaker() if(reagents) reagents.chem_temp += 30 reagents.handle_reactions() diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 280d0a865eb..155349b3186 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -2865,7 +2865,7 @@ "bde" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/storage/tools) "bdf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/hallway/primary/central/nw) "bdg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 5; icon_state = "blue"},/area/hallway/primary/central/nw) -"bdh" = (/obj/machinery/lapvend,/turf/simulated/floor,/area/quartermaster/office) +"bdh" = (/obj/machinery/vending/cart,/turf/simulated/floor,/area/quartermaster/office) "bdi" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/sign/securearea{pixel_x = 32; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/bridge) "bdj" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/bridge) "bdk" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/bridge)