shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[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
parent 63ed2b0069 95df3010ba
commit 5f215ff2b4
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cloning.dm
+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"
code/game/machinery/exp_cloner.dm
+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)
code/game/objects/structures/ghost_role_spawners.dm
+1 -1
View File
@@ -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)
code/modules/hydroponics/grown/replicapod.dm
+1 -1
View File
@@ -91,7 +91,7 @@
if(realName)
podman.real_name = realName
else
podman.real_name = "Pod Person [rand(0,999)]"
podman.real_name = "Pod Person ([rand(1,999)])"
mind.transfer_to(podman)
if(ckey)
podman.ckey = ckey
code/modules/stock_market/industries.dm
+2 -2
View File
@@ -159,7 +159,7 @@
var/list/products = list("generator", "laptop", "keyboard", "memory card", "display", "operating system", "processor", "graphics card", "nanobots", "power supply", "pAI", "mech", "capacitor", "cell")
var/list/prefix = list("the [company_name] ", "the high performance ", "the mobile ", "the portable ", "the professional ", "the extreme ", "the incredible ", "the blazing fast ", "the bleeding edge ", "the bluespace-powered ", null)
var/L = pick(consonant(), "Seed ", "Radiant ", "Robust ", "Pentathon ", "Athlete ", "Phantom ", "Semper Fi ")
var/N = rand(0,99)
var/N = rand(1, 99)
var/prefix2 = "[L][N][prob(5) ? " " + latin_number(N) : null]"
return "[pick(prefix)][prefix2] [pick(products)]"
@@ -230,4 +230,4 @@
/datum/industry/defense/generateProductName(var/company)
var/list/equipment = list("energy gun", "laser gun", "machine gun", "grenade", "stun baton", "artillery", "bomb", "attack drone", "missile", "chem sprayer")
var/list/material = list("bluespace", "stealth", "heat-seeking", "crime-seeking", "wide-range", "bioterror", "auto-reloading", "smart", "sentient", "rapid-fire", "species-targeting", "gibtonite", "mass-market", "perpetual-motion", "nuclear", "fission", "fusion")
return "the [pick(material)] [pick(equipment)]"
return "the [pick(material)] [pick(equipment)]"