Skip to content

Commit

Permalink
Nations RP Cold War update
Browse files Browse the repository at this point in the history
  • Loading branch information
@savethetreez
savethetreez committed Oct 28, 2023
1 parent 7753b61 commit 17747ac
Show file tree
Hide file tree
Showing 4 changed files with 472 additions and 416 deletions.
10 changes: 8 additions & 2 deletions code/game/mob/living/carbon/human/human_life.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1592,9 +1592,15 @@
else if(nationality == "Ukrainian")
holder2.icon_state = "ukr_basic"
else if (original_job_title == "Civilization A Citizen")
holder2.icon_state = "civ1"
if (map.ID == MAP_NATIONSRP_COLDWAR)
holder2.icon_state = "us_basic"
else
holder2.icon_state = "civ1"
else if (original_job_title == "Civilization B Citizen")
holder2.icon_state = "civ2"
if (map.ID == MAP_NATIONSRP_COLDWAR)
holder2.icon_state = "sov_basic"
else
holder2.icon_state = "civ2"
else if (original_job_title == "Civilization C Citizen")
holder2.icon_state = "civ3"
else if (original_job_title == "Civilization D Citizen")
Expand Down
180 changes: 90 additions & 90 deletions code/game/mob/living/carbon/human/nomads_spawn.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1016,21 +1016,21 @@
possible_h_list = list("Orange","Light Brown","Red","Brown")
possible_e_list = list("Green","Blue")
possible_s_list = list(-15,-30)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[2],possible_s_list[1])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[2],possible_s_list[1])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)

else if (map.ID == MAP_NATIONSRP_TRIPLE)
var/new_hair = "Black"
Expand Down Expand Up @@ -1077,21 +1077,21 @@
possible_h_list = list("Light Brown","Blond","Dirty Blond")
possible_e_list = list("Blue","Green")
possible_s_list = list(-15,-30)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[2],possible_s_list[1])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[1],possible_s_list[2])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)

else if (map.ID == MAP_NATIONSRPMED)
var/new_hair = "Dark Brown"
Expand Down Expand Up @@ -1126,21 +1126,21 @@
possible_h_list = list("Dark Brown","Black")
possible_e_list = list("Black")
possible_s_list = list(-85,-110)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[2],possible_s_list[1])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[1],possible_s_list[2])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)

else if (map.ID == MAP_NATIONSRP_WW2)
var/new_hair = "Dark Brown"
Expand Down Expand Up @@ -1175,21 +1175,21 @@
possible_h_list = list("Light Brown","Blond","Dirty Blond")
possible_e_list = list("Blue","Green")
possible_s_list = list(-15,-30)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[2],possible_s_list[1])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[1],possible_s_list[2])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)

else if (map.ID == MAP_NATIONSRP_COLDWAR)
var/new_hair = "Black"
Expand Down Expand Up @@ -1224,21 +1224,21 @@
possible_h_list = list("Red","Orange","Light Blond","Blond","Dirty Blond")
possible_e_list = list("Blue","Green")
possible_s_list = list(-10,-28)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[2],possible_s_list[1])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[1],possible_s_list[2])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)

else if (map.ID == MAP_NOMADS_PERSISTENCE_BETA || map.ID == MAP_NATIONSRP_COLDWAR_CAMPAIGN)
var/new_hair = "Black"
Expand Down Expand Up @@ -1273,21 +1273,21 @@
possible_h_list = list("Red","Orange","Light Blond","Blond","Dirty Blond")
possible_e_list = list("Blue","Green")
possible_s_list = list(-10,-28)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[2],possible_s_list[1])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)
new_hair = pick(possible_h_list)
new_eyes = pick(possible_e_list)
s_tone = rand(possible_s_list[1],possible_s_list[2])
var/hex_hair = hair_colors[new_hair]
r_hair = hex2num(copytext(hex_hair, 2, 4))
g_hair = hex2num(copytext(hex_hair, 4, 6))
b_hair = hex2num(copytext(hex_hair, 6, 8))
r_facial = hex2num(copytext(hex_hair, 2, 4))
g_facial = hex2num(copytext(hex_hair, 4, 6))
b_facial = hex2num(copytext(hex_hair, 6, 8))
var/hex_eyes = eye_colors[new_eyes]
r_eyes = hex2num(copytext(hex_eyes, 2, 4))
g_eyes = hex2num(copytext(hex_eyes, 4, 6))
b_eyes = hex2num(copytext(hex_eyes, 6, 8))
change_eye_color(r_eyes, g_eyes, b_eyes)
else
if (faction_text == ARAB)
if (original_job.title == "Wagner Group PMC")
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/map_metadata/nationsrp.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@

/obj/map_metadata/nationsrp/coldwar/New()
..()
civname_a = "English Nation"
civname_b = "Russian Nation"
var/newnamea = list("English Nation" = list(default_research,default_research,default_research,null,0,"saltire","#C0C0C0","#006600"))
var/newnameb = list("Russian Nation" = list(default_research,default_research,default_research,null,0,"saltire","#D4AF37","#660000"))
civname_a = "United States of America"
civname_b = "Soviet Union"
var/newnamea = list("United States of America" = list(default_research,default_research,default_research,null,0,"saltire","#C0C0C0","#006600"))
var/newnameb = list("Soviet Union" = list(default_research,default_research,default_research,null,0,"saltire","#D4AF37","#660000"))
custom_civs += newnamea
custom_civs += newnameb
civa_research = list(default_research,default_research,default_research,null)
Expand Down
Loading

0 comments on commit 17747ac

Please sign in to comment.