diff --git a/code/game/dna.dm b/code/game/dna.dm index f450fcaed0..c652140d96 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -331,7 +331,7 @@ if(!M) return var/num var/newdna - num = rand(1,STRUCDNASIZE-1) + num = rand(1,UNIDNASIZE) M.dna.check_integrity() newdna = setblock(M.dna.uni_identity,num,add_zero2(num2hex(rand(1,4095),1),3),3) M.dna.uni_identity = newdna diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 50161ed7a7..682c80f174 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -4,8 +4,8 @@ var/title = "NOPE" //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access - var/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) - var/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) + var/list/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) + var/list/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) //Bitflags for the job var/flag = 0 @@ -46,12 +46,12 @@ /datum/job/proc/get_access() if(!config) //Needed for robots. - return src.minimal_access + return src.minimal_access.Copy() if(config.jobs_have_minimal_access) - return src.minimal_access + return src.minimal_access.Copy() else - return src.access + return src.access.Copy() //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/job/proc/player_old_enough(client/C) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 6640def45c..124239dc82 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -197,6 +197,7 @@ if(H.dna) H.dna.mutantrace = mrace H.update_mutantrace() + H.update_mutantrace_languages() H.suiciding = 0 src.attempting = 0 return 1 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index f8e24e1d85..24d622bff1 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -120,8 +120,8 @@ /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("\red You extend the baton.",\ - "\red With a flick of their wrist, [user] extends their telescopic baton.",\ + user.visible_message("\red With a flick of their wrist, [user] extends their telescopic baton.",\ + "\red You extend the baton.",\ "You hear an ominous click.") icon_state = "telebaton_1" item_state = "telebaton_1" @@ -129,8 +129,8 @@ force = 15//quite robust attack_verb = list("smacked", "struck", "slapped") else - user.visible_message("\blue You collapse the baton.",\ - "\blue [user] collapses their telescopic baton.",\ + user.visible_message("\blue [user] collapses their telescopic baton.",\ + "\blue You collapse the baton.",\ "You hear a click.") icon_state = "telebaton_0" item_state = "telebaton_0" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index ec94da4075..65e44caefe 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -48,9 +48,6 @@ /mob/living/carbon/human/death(gibbed) - if(halloss > 0 && !gibbed) - halloss = 0 - return if(stat == DEAD) return if(healths) healths.icon_state = "health5" stat = DEAD diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a388aaf0ec..09ef8072e7 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -823,6 +823,15 @@ else if(src.dna.mutantrace == "tajaran") return "Tajaran" +/mob/living/carbon/proc/update_mutantrace_languages() + if(src.dna) + if(src.dna.mutantrace == "lizard") + src.soghun_talk_understand = 1 + else if(src.dna.mutantrace == "skrell") + src.skrell_talk_understand = 1 + else if(src.dna.mutantrace == "tajaran") + src.tajaran_talk_understand = 1 + /mob/living/carbon/human/proc/play_xylophone() if(!src.xylophone) visible_message("\red [src] begins playing his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.") diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 84b62c7033..2a475b1dd3 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -402,7 +402,7 @@ var/list/department_radio_keys = list( var/deaf_message = "" var/deaf_type = 1 if(M != src) - deaf_message = "[name][alt_name] talks but you cannot hear them." + deaf_message = "[name][alt_name] talks but you cannot hear them." else deaf_message = "You cannot hear yourself!" deaf_type = 2 // Since you should be able to hear yourself without looking @@ -416,12 +416,12 @@ var/list/department_radio_keys = list( message_b = voice_message else message_b = stars(message) - message_b = say_quote(message_b) + message_b = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj) if (italics) message_b = "[message_b]" - rendered = "[voice_name] [message_b]" + rendered = "[name][alt_name] [message_b]" //Voice_name isn't too useful. You'd be able to tell who was talking presumably. for (var/M in heard_b) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 5415ba9900..0ac3e9eb05 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -210,14 +210,14 @@ /mob/living/silicon/robot/verb/Namepick() if(custom_name) return 0 + spawn(0) + var/newname + newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text + if (newname != "") + custom_name = newname - var/newname - newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text - if (newname != "") - custom_name = newname - - updatename("Default") - updateicon() + updatename("Default") + updateicon() /mob/living/silicon/robot/verb/cmd_robot_alerts() set category = "Robot Commands" diff --git a/code/setup.dm b/code/setup.dm index d4f4941d43..9f319d3c82 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -304,6 +304,7 @@ var/MAX_EXPLOSION_RANGE = 14 // mob/var/list/mutations #define STRUCDNASIZE 27 +#define UNIDNASIZE 13 // Generic mutations: #define TK 1 diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 772ca56b4d..9831f594c1 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -1,6 +1,567 @@ + +
+

December 28nd

+

Cael_Aislinn updated:

+ +
+ +
+

November 2012 - January 2013

+

chinsky updated:

+ +

CIB updated:

+ +

CaelAislinn updated:

+ +

Ravensdale updated:

+ +
+ +
+

December 3rd

+

Cael_Aislinn updated:

+ +
+ +
+

23.11.12

+

CIB updated:

+ +
+ +
+

14.11.12

+

Chinsky updated:

+ +

CIB updated:

+ +
+ +
+

November 12th

+

CIB updated:

+ +
+ +
+

November 11th

+

CIB updated:

+ +
+ +
+

November 9th

+

AterIgnis updated:

+ +
+ +
+

6.11.2012

+

Chinsky updated:

+ +
+ +
+

November 4th

+

SkyMarshal updated:

+ +
+ +
+

October 24th

+

Mij updated:

+ +
+ +
+

October 22nd

+

Cael_Aislinn updated:

+ +
+ +
+

October 18th

+

CIB updated:

+ +

Chinsky updated:

+ +
+ +
+

17.10.2012

+

CIB updated:

+ +

Chinsky updated:

+ +
+ +
+

October 13th, 2012

+

Cael_Aislinn updated:

+ +

CIB updated:

+ +
+ +
+

October 12th, 2012

+

Cael_Aislinn updated:

+ +
+ +
+

October 9th, 2012

+

Cael_Aislinn updated:

+ +
+ +
+

September 26th, 2012

+

Cael_Aislinn updated:

+ +
+ +
+

September 24th, 2012

+

Cael_Aislinn updated:

+ +
+ +
+

September 23nd, 2012

+

Cael_Aislinn updated:

+ +
+ +
+

August 22, 2012

+

Cael_Aislinn updated:

+ +
+ +
+

15th August 2012

+

Cael_Aislinn updated:

+ +
+ +
+

7th August 2012

+

CIB updated:

+ +
+ +
+

4 August 2012

+

Cael_Aislinn updated:

+ + +

FireFishie updated:

+ +
+ +
+

2 August 2012

+

Cael_Aislinn updated:

+ +
+ +
+

10 July 2012

+

Abi79 updated:

+ + +

CIB updated:

+ +
+ +
+

9 July 2012

+

CIB updated:

+ +
+ +
+

5 July 2012

+

Cael_Aislinn updated:

+ +
+ +
+

3 July 2012

+

CIB updated:

+ +
+ +
+

29 June 2012

+

Erthilo updated:

+ +
+
+

28 June 2012

+

Chinsky updated:

+ +
+
+

27 June 2012

+

Erthilo updated:

+ +
+
+

26 June 2012

+

TG updated:

+ +
+ +
+

25 June 2012

+

Erthilo updated:

+ +

Watermelon Storm updated:

+ +

Drieden updated:

+ +
+ +
+

23 June 2012

+

SkyMarshal updated:

+ +

TG updated:

+ +
+ +
+

22 June 2012

+

Cael_Aislinn updated:

+ +
+ +
+

18 June 2012

+

Cael_Aislinn updated:

+ +
+ +
+

16 June 2012

+

Cael_Aislinn updated:

+ +
+ +
+

09 June 2012

+

Erthilo updated:

+ +
+ +
+

07 June 2012

+

SkyMarshal updated:

+ +
+ +
+

06 June 2012

+

Erthilo updated:

+ +
+ +
+

04 June 2012

+

TG updated:

+ +

SkyMarshal updated:

+ +

Erthilo updated:

+ +
+ +
+

01 June 2012

+

Erthilo updated:

+ +
+ +
+

29 May 2012

+

Aryn updated:

+ +
+ +
+

28 May 2012

+

Erthilo updated:

+ +
+ +
+

27 May 2012

+

Abi79 updated:

+ +

Erthilo updated:

+ +
+ +
+

26 May 2012

+

Erthilo updated:

+ + +

Abi79 updated:

+ +
+

25 May 2012

Erthilo updated:

diff --git a/html/changelog.html b/html/changelog.html index 30d9f62c64..9937308eea 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -85,8 +85,18 @@ should be listed in the changelog upon commit though. Thanks. -->
-
-

April 24, 2013

+
+

25th May 2013

+

Erthilo updated:

+ +
+ +
+

April 24, 2013

Jediluke69 updated:

-
-

December 28nd

-

Cael_Aislinn updated:

- -
- -
-

November 2012 - January 2013

-

chinsky updated:

- -

CIB updated:

- -

CaelAislinn updated:

- -

Ravensdale updated:

- -
- -
-

December 3rd

-

Cael_Aislinn updated:

- -
- -
-

23.11.12

-

CIB updated:

- -
- -
-

14.11.12

-

Chinsky updated:

- -

CIB updated:

- -
- -
-

November 12th

-

CIB updated:

- -
- -
-

November 11th

-

CIB updated:

- -
- -
-

November 9th

-

AterIgnis updated:

- -
- -
-

6.11.2012

-

Chinsky updated:

- -
- -
-

November 4th

-

SkyMarshal updated:

- -
- -
-

October 24th

-

Mij updated:

- -
- -
-

October 22nd

-

Cael_Aislinn updated:

- -
- -
-

October 18th

-

CIB updated:

- -

Chinsky updated:

- -
- -
-

17.10.2012

-

CIB updated:

- -

Chinsky updated:

- -
- -
-

October 13th, 2012

-

Cael_Aislinn updated:

- -

CIB updated:

- -
- -
-

October 12th, 2012

-

Cael_Aislinn updated:

- -
- -
-

October 9th, 2012

-

Cael_Aislinn updated:

- -
- -
-

September 26th, 2012

-

Cael_Aislinn updated:

- -
- -
-

September 24th, 2012

-

Cael_Aislinn updated:

- -
- -
-

September 23nd, 2012

-

Cael_Aislinn updated:

- -
- -
-

August 22, 2012

-

Cael_Aislinn updated:

- -
- -
-

15th August 2012

-

Cael_Aislinn updated:

- -
- -
-

7th August 2012

-

CIB updated:

- -
- -
-

4 August 2012

-

Cael_Aislinn updated:

- - -

FireFishie updated:

- -
- -
-

2 August 2012

-

Cael_Aislinn updated:

- -
- -
-

10 July 2012

-

Abi79 updated:

- - -

CIB updated:

- -
- -
-

9 July 2012

-

CIB updated:

- -
- -
-

5 July 2012

-

Cael_Aislinn updated:

- -
- -
-

3 July 2012

-

CIB updated:

- -
- -
-

29 June 2012

-

Erthilo updated:

- -
-
-

28 June 2012

-

Chinsky updated:

- -
-
-

27 June 2012

-

Erthilo updated:

- -
-
-

26 June 2012

-

TG updated:

- -
- -
-

25 June 2012

-

Erthilo updated:

- -

Watermelon Storm updated:

- -

Drieden updated:

- -
- -
-

23 June 2012

-

SkyMarshal updated:

- -

TG updated:

- -
- -
-

22 June 2012

-

Cael_Aislinn updated:

- -
- -
-

18 June 2012

-

Cael_Aislinn updated:

- -
- -
-

16 June 2012

-

Cael_Aislinn updated:

- -
- -
-

09 June 2012

-

Erthilo updated:

- -
- -
-

07 June 2012

-

SkyMarshal updated:

- -
- -
-

06 June 2012

-

Erthilo updated:

- -
- -
-

04 June 2012

-

TG updated:

- -

SkyMarshal updated:

- -

Erthilo updated:

- -
- -
-

01 June 2012

-

Erthilo updated:

- -
- -
-

29 May 2012

-

Aryn updated:

- -
- -
-

28 May 2012

-

Erthilo updated:

- -
- -
-

27 May 2012

-

Abi79 updated:

- -

Erthilo updated:

- -
- -
-

26 May 2012

-

Erthilo updated:

- - -

Abi79 updated:

- -
- -