From 37db1d679d22db316ae9f1849ea5d9e79ec93f8f Mon Sep 17 00:00:00 2001 From: Duck- Date: Sun, 4 Jan 2015 18:51:57 -0500 Subject: [PATCH 1/2] Removes the ridiculous autoheal. you aren't going to heal from being clubbed with a wrench in 30 seconds in real life really also, now you won't regenerate all your hp from bullets or whatever. it was really ridiculous before. --- code/controllers/configuration.dm | 2 +- data/investigate/gravity.html | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 598d1eb4..81e0ac62 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -104,7 +104,7 @@ var/health_threshold_dead = -100 var/organ_health_multiplier = 1 - var/organ_regeneration_multiplier = 1 + var/organ_regeneration_multiplier = 0 var/bones_can_break = 0 var/limbs_can_break = 0 diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html index 359e2093..fb0f61b0 100644 --- a/data/investigate/gravity.html +++ b/data/investigate/gravity.html @@ -1,6 +1,6 @@ -04:09 [0x20078fb] (92,152,1) || the gravitational generator has regained power.
-04:09 [0x20078fb] (92,152,1) || the gravitational generator is now charging.
-04:10 [0x20078fb] (92,152,1) || the gravitational generator has regained power.
-04:10 [0x20078fb] (92,152,1) || the gravitational generator is now charging.
-04:10 [0x20078fb] (92,152,1) || the gravitational generator has regained power.
-04:10 [0x20078fb] (92,152,1) || the gravitational generator is now charging.
+18:41 [0x200791e] (92,152,1) || the gravitational generator has regained power.
+18:41 [0x200791e] (92,152,1) || the gravitational generator is now charging.
+18:42 [0x200791e] (92,152,1) || the gravitational generator has regained power.
+18:42 [0x200791e] (92,152,1) || the gravitational generator is now charging.
+18:42 [0x200791e] (92,152,1) || the gravitational generator has regained power.
+18:42 [0x200791e] (92,152,1) || the gravitational generator is now charging.
From 5392bfc362883fc1a18c10740c3314b4c311443d Mon Sep 17 00:00:00 2001 From: Duck- Date: Sat, 10 Jan 2015 04:43:44 -0500 Subject: [PATCH 2/2] Fixes tcomm broadcast still unknown source of runtimes + $source cannot be edited but does not cause runtimes --- .../machinery/telecomms/traffic_control.dm | 2 +- code/modules/mob/hear_say.dm | 14 ++++++---- data/investigate/gravity.html | 28 +++++++++++++++---- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 226c4722..5c5a038b 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -15,7 +15,7 @@ var/list/viewingcode = list() var/obj/machinery/telecomms/server/SelectedServer - var/network = "NULL" // the network to probe + var/network = "tcommsat" // the network to probe var/temp = "" // temporary feedback messages var/storedcode = "" // code stored diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 3f8899ac..05ebce9a 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -70,9 +70,13 @@ return var/track = null - + var/speaker_name var/style = "body" + if(!language) + language = new /datum/language/common +// if(!speaker) + //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))) @@ -93,13 +97,13 @@ if(hard_to_hear) message = stars(message) - - var/speaker_name = speaker.name + if(speaker) + speaker_name = speaker.name if(vname) speaker_name = vname - if(istype(speaker, /mob/living/carbon/human)) + if(speaker && (istype(speaker, /mob/living/carbon/human))) var/mob/living/carbon/human/H = speaker if(H.voice) speaker_name = H.voice @@ -113,7 +117,7 @@ var/jobname // the mob's "job" var/mob/living/carbon/human/impersonating //The crewmember being impersonated, if any. - if (ishuman(speaker)) + if (speaker && (ishuman(speaker))) var/mob/living/carbon/human/H = speaker if((H.wear_id && istype(H.wear_id,/obj/item/weapon/card/id/syndicate)) && (H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/gas/voice))) diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html index fb0f61b0..4daa1c89 100644 --- a/data/investigate/gravity.html +++ b/data/investigate/gravity.html @@ -1,6 +1,22 @@ -18:41 [0x200791e] (92,152,1) || the gravitational generator has regained power.
-18:41 [0x200791e] (92,152,1) || the gravitational generator is now charging.
-18:42 [0x200791e] (92,152,1) || the gravitational generator has regained power.
-18:42 [0x200791e] (92,152,1) || the gravitational generator is now charging.
-18:42 [0x200791e] (92,152,1) || the gravitational generator has regained power.
-18:42 [0x200791e] (92,152,1) || the gravitational generator is now charging.
+03:56 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+03:56 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+03:56 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+03:56 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+03:56 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+03:56 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:01 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:01 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:06 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:06 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:11 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:11 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:16 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:16 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:21 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:21 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:26 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:26 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:31 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:31 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+04:36 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
+04:36 [0x20078f6] (92,152,1) || the gravitational generator is now charging.