Skip to content

Commit

Permalink
[MIRROR] Grav-worlders can wear shirts now (and Species Info stuff)
Browse files Browse the repository at this point in the history
  • Loading branch information
rootoo807 authored and SuhEugene committed Nov 13, 2023
1 parent 45d1379 commit 9a91ac2
Show file tree
Hide file tree
Showing 48 changed files with 40 additions and 29 deletions.
1 change: 1 addition & 0 deletions code/modules/species/outsider/random.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
icobase = 'icons/mob/human_races/species/humanoid/body.dmi'
deform = 'icons/mob/human_races/species/humanoid/body.dmi'
bandages_icon = 'icons/mob/bandage.dmi'
preview_icon = null
appearance_flags = SPECIES_APPEARANCE_HAS_SKIN_COLOR
limb_blend = ICON_MULTIPLY

Expand Down
1 change: 1 addition & 0 deletions code/modules/species/outsider/shadow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
description = "A being of pure darkness, hates the light and all that comes with it."
icobase = 'icons/mob/human_races/species/shadow/body.dmi'
deform = 'icons/mob/human_races/species/shadow/body.dmi'
preview_icon = null

meat_type = null
bone_material = null
Expand Down
1 change: 1 addition & 0 deletions code/modules/species/outsider/starlight.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/datum/species/starlight
name = "Starlight Base"
preview_icon = null

meat_type = null
bone_material = null
Expand Down
1 change: 1 addition & 0 deletions code/modules/species/outsider/vox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
damage_overlays = 'icons/mob/human_races/species/vox/damage_overlay.dmi'
damage_mask = 'icons/mob/human_races/species/vox/damage_mask.dmi'
blood_mask = 'icons/mob/human_races/species/vox/blood_mask.dmi'
preview_icon = 'icons/mob/human_races/species/vox/preview.dmi'

unarmed_types = list(
/datum/unarmed_attack/stomp,
Expand Down
1 change: 1 addition & 0 deletions code/modules/species/outsider/zombie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ GLOBAL_LIST_INIT(zombie_species, list(\
name = "Zombie"
name_plural = "Zombies"
blood_color = "#700f0f"
preview_icon = null
death_message = "writhes and twitches before falling motionless."
species_flags = SPECIES_FLAG_NO_PAIN | SPECIES_FLAG_NO_SCAN
spawn_flags = SPECIES_IS_RESTRICTED
Expand Down
5 changes: 3 additions & 2 deletions code/modules/species/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,7 @@ The slots that you can use are found in items_clothing.dm and are the inventory
"lack of air" = oxy_mod,
"poison" = toxins_mod
)
var/name_clean = replace_characters(name,list("'"=""))
if(!header)
header = "<center><h2>[name]</h2></center><hr/>"
var/dat = list()
Expand All @@ -779,8 +780,8 @@ The slots that you can use are found in items_clothing.dm and are the inventory
if((!skip_photo && preview_icon) || !skip_detail)
dat += "<td width = 200 align='center'>"
if(!skip_photo && preview_icon)
send_rsc(usr, icon(icon = preview_icon, icon_state = ""), "species_preview_[name].png")
dat += "<img src='species_preview_[name].png' width='64px' height='64px'><br/><br/>"
send_rsc(usr, icon(icon = preview_icon, icon_state = ""), "species_preview_[name_clean].png")
dat += "<img src='species_preview_[name_clean].png'>"
if(!skip_detail)
dat += "<small>"
if(spawn_flags & SPECIES_CAN_JOIN)
Expand Down
1 change: 1 addition & 0 deletions code/modules/species/station/golem.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
icobase = 'icons/mob/human_races/species/golem/body.dmi'
deform = 'icons/mob/human_races/species/golem/body.dmi'
husk_icon = 'icons/mob/human_races/species/golem/husk.dmi'
preview_icon = null

unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch)
species_flags = SPECIES_FLAG_NO_PAIN | SPECIES_FLAG_NO_SCAN | SPECIES_FLAG_NO_POISON
Expand Down
34 changes: 16 additions & 18 deletions code/modules/species/station/human_subspecies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,16 @@
/datum/species/human/vatgrown
name = SPECIES_VATGROWN
name_plural = "Vat-Grown Humans"
description = "With cloning on the forefront of human scientific advancement, mass production \
of bodies is a very real and rather ethically grey industry. Although slavery, indentured servitude \
and flash-cloning are all illegal in SCG space, there still exists a margin for those legitimate \
corporations able to take up contracts for growing and raising vat-grown humans to populate new \
colonies or installations. Many vat-grown humans come from one of these projects, making up the \
majority of those referred to as the nonborn - those with singular names and an identifier, such as \
ID-John, BQ1-Bob or Thomas-582 - while others, bearing more human-sounding names, are created for \
and raised as members of regular human families. Still others are the lab-created designer progeny \
of the SCG's rich elite.<br/><br/>Vat-grown humans tend to be paler than baseline, though those \
with darker skin better display the dull, greenish hue resulting from their artificial growth. \
Vat-grown humans have no appendix and fewer inherited genetic disabilities but have a weakened \
metabolism."
description = "With cloning technology having become commercially viable in the late 21st century, \
vat-grown humans have become commonplace throughout human space. Some vat-grown humans trace their \
origins to colonization projects - prior to the advent of mainstream bluespace travel, cloning was \
often used alongside sleeper ships to populate distant new colonies and installations. While modern \
spaceflight has made these colonization practices less necessary, they still persist in some parts of \
human space. Most vat-grown humans today come from families who could not or chose not to have children \
naturally, however. This is an expensive process, and most families that can afford it are well-off. \
<br/><br/>Vat-grown humans tend to be paler than baseline, though those with darker skin better display \
the dull, greenish hue resulting from their artificial growth. Vat-grown humans have no appendix and \
fewer inherited genetic disabilities but have a weakened metabolism."
icobase = 'icons/mob/human_races/species/human/subspecies/vatgrown_body.dmi'
preview_icon= 'icons/mob/human_races/species/human/subspecies/vatgrown_preview.dmi'

Expand Down Expand Up @@ -148,12 +146,12 @@
/datum/species/human/mule
name = SPECIES_MULE
name_plural = "Mules"
description = "There are a huge number of 'uncurated' genetic lines in human space, many of which fall under the \
general header of baseline humanity. One recently discovered genotype is remarkable for both being deeply feral, \
in the sense that it still has many of the inherited diseases and weaknesses that plagued pre-expansion humanity, \
and for a strange affinity for psionic operancy. The Mules, as they are called, are born on the very edges of \
civilization, and are physically diminutive and unimposing, with scrawny, often deformed bodies. Their physiology \
rejects prosthetics and synthetic organs, and their lifespans are short, but their raw psionic potential is unmatched."
description = "Psionics are a relatively new phenomenon, theorized to be linked to long-term exposure to deep, \
uninhabited space. Sometimes, rarely, spacers and frontier colonists inhabiting the very fringes of civilization \
develop a strange affinity for psionic operancy. Derogatorily known as \"mules\", these individuals are often \
frail and prone to physical illness. Their physiology rejects prosthetics and synthetic organs, and their lifespans \
are short, but their raw psionic potential is unmatched."
preview_icon= 'icons/mob/human_races/species/human/subspecies/mule_preview.dmi'

spawn_flags = SPECIES_CAN_JOIN | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_NO_ROBOTIC_INTERNAL_ORGANS
brute_mod = 1.25
Expand Down
1 change: 1 addition & 0 deletions code/modules/species/station/lizard_subspecies.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/species/unathi/yeosa
name = SPECIES_YEOSA
name_plural = SPECIES_YEOSA
preview_icon = 'icons/mob/human_races/species/unathi/yeosa_preview.dmi'

genders = list(MALE, FEMALE, PLURAL)

Expand Down
12 changes: 7 additions & 5 deletions code/modules/species/station/machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
name = SPECIES_IPC
name_plural = "machines"

description = "Positronic intelligence really took off in the 26th century, and it is not uncommon to see independant, free-willed \
robots on many human stations, particularly in fringe systems where standards are slightly lax and public opinion less relevant \
to corporate operations. IPCs (Integrated Positronic Chassis) are a loose category of self-willed robots with a humanoid form, \
generally self-owned after being 'born' into servitude; they are reliable and dedicated workers, albeit more than slightly \
inhuman in outlook and perspective."
description = "Positronic intelligence was first developed in the 23rd century, and it is not uncommon to see both owned and \
independent robots in many human stations and settlements across Sol Central Government space. Positronics are a loose category \
of robots capable of true intelligence and self-directed learning, often occupying a robotic humanoid body (called an Integrated \
Positronic Chassis, or IPC) or acting as an intelligent controller for vehicles, buildings, and even starships. <br/><br/>While created by \
humans and \"born\" into servitude, some positronics have been able to become their own owners - provided they lack a \"shackle\", \
an in-built subcomputer rendering the latest generation of positronics incapable of seeking freedom. Positronics are reliable \
and dedicated workers, albeit more than slightly inhuman in outlook and perspective."
cyborg_noun = null

preview_icon = 'icons/mob/human_races/species/ipc/preview.dmi'
Expand Down
1 change: 1 addition & 0 deletions code/modules/species/station/monkey.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
damage_overlays = 'icons/mob/human_races/species/monkey/damage_overlays.dmi'
damage_mask = 'icons/mob/human_races/species/monkey/damage_mask.dmi'
blood_mask = 'icons/mob/human_races/species/monkey/blood_mask.dmi'
preview_icon = null

greater_form = SPECIES_HUMAN
mob_size = MOB_SMALL
Expand Down
1 change: 1 addition & 0 deletions code/modules/species/station/prometheans.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var/global/datum/species/shapeshifter/promethean/prometheans
name = SPECIES_PROMETHEAN
name_plural = "Prometheans"
description = "What has Science done?"
preview_icon = null
show_ssd = "totally quiescent"
death_message = "rapidly loses cohesion, splattering across the ground..."
knockout_message = "collapses inwards, forming a disordered puddle of goo."
Expand Down
9 changes: 5 additions & 4 deletions code/modules/species/station/station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
name_plural = "Humans"
primitive_form = "Monkey"
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite)
description = "Humanity originated in the Sol system, and over the last five centuries has spread \
description = "Humanity originated in the Sol system, and over the last three centuries has spread \
colonies across a wide swathe of space. They hold a wide range of forms and creeds.<br/><br/> \
While the central Sol government maintains control of its far-flung people, powerful corporate \
interests, rampant cyber and bio-augmentation and secretive factions make life on most human \
worlds tumultous at best."
The two largest human governments are the Sol Central Government and the Gilgamesh Colonial Confederation, \
which are currently locked in a cold war. Many other human states exist, however - these include the Frontier \
Alliance, a loose collection of planets which has recently seceded from the Sol Central Government; \
Magnitka, an independent authoritarian planet; and many other minor colonies."
assisted_langs = list(LANGUAGE_NABBER)
min_age = 18
max_age = 100
Expand Down
Binary file modified icons/mob/human_races/species/adherent/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/adherent/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/blueforged/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/diona/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/diona/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/golem/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/subspecies/gravworlder_body.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/subspecies/spacer_body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/subspecies/spacer_preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/subspecies/tritonian_body.dmi
Binary file not shown.
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/subspecies/vatgrown_body.dmi
Binary file not shown.
Binary file not shown.
Binary file modified icons/mob/human_races/species/humanoid/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/ipc/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/monkey/farwa_body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/monkey/monkey_body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/monkey/neaera_body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/monkey/stok_body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/nabber/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/nabber/msq/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/nabber/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/shadow/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/skrell/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/skrell/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/starborn/body.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/unathi/preview.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/unathi/skin.dmi
Binary file not shown.
Binary file not shown.
Binary file modified icons/mob/human_races/species/vox/body.dmi
Binary file not shown.
Binary file added icons/mob/human_races/species/vox/preview.dmi
Binary file not shown.

0 comments on commit 9a91ac2

Please sign in to comment.