Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733

[MIRROR] podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?)
This commit is contained in:
deathride58
2018-04-04 21:15:55 +00:00
committed by GitHub
5 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -172,7 +172,7 @@
occupant = H
if(!clonename) //to prevent null names
clonename = "clone ([rand(0,999)])"
clonename = "clone ([rand(1,999)])"
H.real_name = clonename
icon_state = "pod_1"
+2 -2
View File
@@ -36,7 +36,7 @@
occupant = H
if(!clonename) //to prevent null names
clonename = "clone ([rand(0,999)])"
clonename = "clone ([rand(1,999)])"
H.real_name = clonename
icon_state = "pod_1"
@@ -294,4 +294,4 @@
else
pod.growclone(mob_occupant.real_name, dna.uni_identity, dna.struc_enzymes, clone_species, dna.features, mob_occupant.faction)
temp = "[mob_occupant.real_name] => <font class='good'>Cloning data sent to pod.</font>"
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -91,7 +91,7 @@
return ..()
/obj/effect/mob_spawn/human/exile/special(mob/living/new_spawn)
new_spawn.real_name = "Wish Granter's Victim ([rand(0,999)])"
new_spawn.real_name = "Wish Granter's Victim ([rand(1,999)])"
var/wish = rand(1,4)
switch(wish)
if(1)