diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 4a4d49d25fb..baee59ea6a5 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -119,6 +119,7 @@ S["eyes_blue"] >> b_eyes S["underwear"] >> underwear S["backbag"] >> backbag + S["b_type"] >> b_type //Jobs S["userandomjob"] >> userandomjob @@ -170,6 +171,7 @@ b_eyes = sanitize_integer(b_eyes, 0, 255, initial(b_eyes)) underwear = sanitize_integer(underwear, 1, underwear_m.len, initial(underwear)) backbag = sanitize_integer(backbag, 1, backbaglist.len, initial(backbag)) + b_type = sanitize_text(b_type, initial(b_type)) userandomjob = sanitize_integer(userandomjob, 0, 1, initial(userandomjob)) job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high)) @@ -218,6 +220,7 @@ S["eyes_blue"] << b_eyes S["underwear"] << underwear S["backbag"] << backbag + S["b_type"] << b_type //Jobs S["userandomjob"] << userandomjob diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 3bba11e32d1..731f8ba3bf5 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -50,6 +50,7 @@ src.searching = 0 src.brainmob.mind = candidate.mind src.brainmob.key = candidate.key + src.brainmob.ckey = candidate.ckey src.name = "positronic brain ([src.brainmob.name])" src.brainmob << "You are a positronic brain, brought into existence on [station_name()]." diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 719c9764ce0..30bf04c7ada 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -150,6 +150,7 @@ src.mind = M.brainmob.mind src.mind.key = M.brainmob.key + src.ckey = M.brainmob.ckey src.name = "Spider-bot ([M.brainmob.name])" /mob/living/simple_animal/spiderbot/proc/explode() //When emagged. @@ -162,12 +163,13 @@ /mob/living/simple_animal/spiderbot/proc/update_icon() if(mmi) - if (istype(mmi,/obj/item/device/mmi)) + if(istype(mmi,/obj/item/device/mmi)) icon_state = "spiderbot-chassis-mmi" icon_living = "spiderbot-chassis-mmi" - else + if(istype(mmi, /obj/item/device/mmi/posibrain)) icon_state = "spiderbot-chassis-posi" icon_living = "spiderbot-chassis-posi" + else icon_state = "spiderbot-chassis" icon_living = "spiderbot-chassis" @@ -326,6 +328,7 @@ visible_message("\blue [src] scoops up \the [held_item]!", "\blue You grab \the [held_item]!", "You hear a skittering noise and a clink.") return held_item src << "\red \The [selection] is too far away." + return 0 src << "\red There is nothing of interest to take." return 0 diff --git a/html/changelog.html b/html/changelog.html index 414782d9774..8c476633f7d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -46,7 +46,7 @@ Header Section -Visit the bleeding-edge test server at byond://tekkit.fallemmc.com:8000 + +