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:
@@ -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
|
||||
|
||||
@@ -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)]"
|
||||
|
||||
Reference in New Issue
Block a user