From 5422e3e7c30250dbcc3cf72b5af79b35ac74d938 Mon Sep 17 00:00:00 2001 From: Neerti Date: Wed, 10 Dec 2014 07:12:30 -0500 Subject: [PATCH 1/8] Makes service drone sprite have consistent frames with the other drone sprites, which will make the eyes sync properly. --- icons/mob/robots.dmi | Bin 155563 -> 155561 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 04202fe3134ef304cf6dfa972d319d99df312195..f83d75f3f6430d8b2909e075e4d7ef524b3ce659 100644 GIT binary patch delta 846 zcmV-U1F`(8zX_?o36LZKmysnmFwvltqTs$Xd zE}oP#7taboE46i3DhR;efDXC_hWhBBYlwG6kJ^9_3a}iO+#^2hk&!yu|1?k%I) zp1@@zc(N*@X84#Pd4Nu_Dxgc2s*cyT{A*)L?y$Eo+Jf+vp0ZnR^1soH9q+^aK5v2rQG2;^phJc;37w{{a}(7FXDk Yph^G$AOJ~3gUkbm%mV?p%mV`7TZek1WB>pF delta 846 zcmV-U1F`(6zX_|q36LZKnUN(oFfpK%q<;H7#BH5SWYL+04}%Flk`ncc6hDfmmoKkh z#q;JhIRZJ2R;;w?Oh5T`4?S4tLmdsDcBP9B9dbRvhRP z2dWG!Tc0_Qfxy9EVv^b@_F@}t0Z7{>dg2>xfmqtuXbUv|&SJkoeIV_-e<=7wSfP(% zTZ2gPTyG5`#nrSmh!oe;)*w<`QCovZaZPOvBE?m;HHZ`!jPnHYM?52EE}oJz7thI= ziznsG#j`@tN^RYh3IgyqprfvVp*}k58sc5iqc-4!0xX9mw@9zc>O||+AM?LE#nb%; z6bExqS4i>8-pZf4)y8PFe^K@yX`j%?bBM~L<0{g795A)7EfBXW z@zTQ!3>~Q?HiQ8)he^jB*>Ya2>yXh9$ z9-Y2zRusWKj(uan+BOiYT-+6l6Wg`Y?O;$fLanfW3-QF)AJGUr%-$l+7lV`T-+jDD z-=)m6JN;1_o$zlj+Zl@tMlw8)D zfCEAkFN#cy8;x();t^V~{#HwZz0}0Hg8v(Nm6E{f6rqL8d1;lTKyn9rEz^gzOdsB! z>AReq?SI{mcP-+6CujSSp3PjrogU7{eYJkq0`B(FuYau6e{yqhua90y2Wo%l3bD~W@&`*iLGWjT8zCMfR&1>=>9TXN> Y?sW`v001BWgUADi$O8el$O8i5TX*%PP5=M^ From 8e5bc3a589cd2713b42f6772285394f9a62e58e5 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 10 Dec 2014 20:11:00 +0100 Subject: [PATCH 2/8] Fixes #7356. Clam now uses the proper arg name when trying to create borers. Fixes a minor issue in the event manager, where the wrong Topic arg was used. --- code/game/gamemodes/calamity/calamity.dm | 2 +- code/modules/events/event_manager.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm index 0d8b46b318e..a4e617aaf4a 100644 --- a/code/game/gamemodes/calamity/calamity.dm +++ b/code/game/gamemodes/calamity/calamity.dm @@ -91,7 +91,7 @@ // Add the cortical borer event var/list/moderate_event_list = EModerate.available_events - var/event = new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 400, one_shot = 1) + var/event = new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 400, is_one_shot = 1) moderate_event_list.Add(event) if(chosen_atypes) diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index bc42d7c19fb..22407ff2bd5 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -106,7 +106,7 @@ html += "[new_event.name ? new_event.name : "Enter Event"]" html += "[new_event.event_type ? new_event.event_type : "Select Type"]" html += "[new_event.weight ? new_event.weight : 0]" - html += "[new_event.one_shot]" + html += "[new_event.one_shot]" html += "" html += "" html += "Add
" From 9bd818e2a4cb1e12a568a8ba0e1e9497069b0c8f Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 04:52:35 +0300 Subject: [PATCH 3/8] Fix for #7351. --- code/game/machinery/computer/crew.dm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index d9b0bbc433f..b9b8d853938 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -75,6 +75,8 @@ if(istype(C.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C.loc + if(H.w_uniform != C) + continue var/list/crewmemberData = list() @@ -84,18 +86,18 @@ crewmemberData["tox"] = round(H.getToxLoss(), 1) crewmemberData["fire"] = round(H.getFireLoss(), 1) crewmemberData["brute"] = round(H.getBruteLoss(), 1) - + crewmemberData["name"] = "Unknown" - crewmemberData["rank"] = "Unknown" + crewmemberData["rank"] = "Unknown" if(H.wear_id && istype(H.wear_id, /obj/item/weapon/card/id) ) var/obj/item/weapon/card/id/I = H.wear_id - crewmemberData["name"] = I.name + crewmemberData["name"] = I.name crewmemberData["rank"] = I.rank else if(H.wear_id && istype(H.wear_id, /obj/item/device/pda) ) - var/obj/item/device/pda/P = H.wear_id - crewmemberData["name"] = (P.id ? P.id.name : "Unknown") + var/obj/item/device/pda/P = H.wear_id + crewmemberData["name"] = (P.id ? P.id.name : "Unknown") crewmemberData["rank"] = (P.id ? P.id.rank : "Unknown") - + var/area/A = get_area(H) crewmemberData["area"] = sanitize(A.name) crewmemberData["x"] = pos.x @@ -112,12 +114,12 @@ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if(!ui) ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800) - + // adding a template with the key "mapContent" enables the map ui functionality ui.add_template("mapContent", "crew_monitor_map_content.tmpl") // adding a template with the key "mapHeader" replaces the map header content ui.add_template("mapHeader", "crew_monitor_map_header.tmpl") - + ui.set_initial_data(data) ui.open() From 944800eee49b6ddf00dc2937004816ae55dd7041 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 04:53:24 +0300 Subject: [PATCH 4/8] Fix for #7352. --- code/game/machinery/atmoalter/canister.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index d8f67422a54..2e0c0e706b7 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -97,6 +97,7 @@ update_flag if (src.destroyed) src.overlays = 0 src.icon_state = text("[]-1", src.canister_color) + return if(icon_state != "[canister_color]") icon_state = "[canister_color]" From 2582ef02b85e714a52fd58a934b5232beaf849ba Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 05:00:31 +0300 Subject: [PATCH 5/8] Namefix. --- code/modules/clothing/spacesuits/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index ba037f20cbb..374f38be855 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -17,7 +17,7 @@ item_color = "skrell_helmet_black" /obj/item/clothing/suit/space/skrell - name = "Skrellian hardsuit" + name = "Skrellian voidsuit" desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) From 323cc56a89227743bf02e230d0168360f0488b66 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 05:01:06 +0300 Subject: [PATCH 6/8] Topic fix. --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2d6685d8b21..17dd5e4d793 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1031,10 +1031,10 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/Topic(href, href_list) - if(usr != src) - return if(..()) return + if(usr != src) + return if (href_list["showalerts"]) robot_alerts() From b1785edf33d954d855d1ca42ff1e5cc85108f0a6 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 05:01:47 +0300 Subject: [PATCH 7/8] Fix for #7365. --- code/game/mecha/mech_fabricator.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index ba4493522f6..e56dbe71e86 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -453,10 +453,10 @@ for(var/datum/design/D in files.known_designs) if(D.build_type&16) if(D.category in part_sets)//Checks if it's a valid category - if(add_part_to_set(D.category, text2path(D.build_path)))//Adds it to said category + if(add_part_to_set(D.category, D.build_path))//Adds it to said category i++ else - if(add_part_to_set("Misc", text2path(D.build_path)))//If in doubt, chunk it into the Misc + if(add_part_to_set("Misc", D.build_path))//If in doubt, chunk it into the Misc i++ return i From 0fc7177894dc89b5770e363eeb6bdfa03865d196 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 08:32:27 +0300 Subject: [PATCH 8/8] Fix for ghost hearing. --- code/modules/mob/hear_say.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 04fa4273a07..e25b25de689 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -8,30 +8,30 @@ //Does the speaker have a client? It's either random stuff that observers won't care about (Experiment 97B says, 'EHEHEHEHEHEHEHE') //Or someone snoring. So we make it where they won't hear it. return - + //make sure the air can transmit speech - hearer's side var/turf/T = get_turf(src) - if (T) + if ((T) && (!(istype(src, /mob/dead/observer)))) //Ghosts can hear even in vacuum. var/datum/gas_mixture/environment = T.return_air() var/pressure = (environment)? environment.return_pressure() : 0 if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1) return - + if (pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet italics = 1 sound_vol *= 0.5 //muffle the sound a bit, so it's like we're actually talking through contact - + if(sleeping || stat == 1) hear_sleep(message) return var/style = "body" - + //non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet. if (language && (language.flags & NONVERBAL)) if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src))) message = stars(message) - + if(!say_understands(speaker,language)) if(istype(speaker,/mob/living/simple_animal)) var/mob/living/simple_animal/S = speaker @@ -89,7 +89,7 @@ if (language && (language.flags & NONVERBAL)) if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src))) message = stars(message) - + if(!say_understands(speaker,language)) if(istype(speaker,/mob/living/simple_animal)) var/mob/living/simple_animal/S = speaker @@ -173,7 +173,7 @@ /mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null) if(!client) return - + if(say_understands(speaker, language)) message = "[src] [verb], \"[message]\"" else