Skip to content

Commit

Permalink
Merge pull request Civ13#2451 from savethetreez/branch
Browse files Browse the repository at this point in the history 
Nations RP Coldwar quickfix
  • Loading branch information
@savethetreez
savethetreez authored Oct 28, 2023
2 parents 62ec312 + a63e6f6 commit 278a73b
Showing 1 changed file with 51 additions and 51 deletions.
102 changes: 51 additions & 51 deletions code/modules/1713/jobs/nomads.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,63 +245,63 @@
else if (map.ID == MAP_NATIONSRP_COLDWAR)
if (gender == "male")
spawn(5)
if (original_job_title == "Civilization A Citizen")
var/rand_uni = rand(1,5)
switch(rand_uni)
if (1)
equip_to_slot_or_del(new /obj/item/clothing/under/modern2(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (2)
equip_to_slot_or_del(new /obj/item/clothing/under/modern3(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (3)
equip_to_slot_or_del(new /obj/item/clothing/under/expensive(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (4)
equip_to_slot_or_del(new /obj/item/clothing/under/detective2(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (5)
equip_to_slot_or_del(new /obj/item/clothing/under/industrial2(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/riding1/gator_cowboy(src), slot_shoes)
if (prob(70))
var/rand_hat = rand(1,2)
switch(rand_hat)
if (original_job_title == "Civilization A Citizen")
var/rand_uni = rand(1,5)
switch(rand_uni)
if (1)
equip_to_slot_or_del(new/obj/item/clothing/head/cowboyhat(src), slot_head)
equip_to_slot_or_del(new /obj/item/clothing/under/modern2(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (2)
equip_to_slot_or_del(new/obj/item/clothing/head/cowboyhat2(src), slot_head)
if (original_job_title == "Civilization B Citizen")
var/rand_uniform = rand(1,5)
switch(rand_uniform)
if (1)
equip_to_slot_or_del(new /obj/item/clothing/under/modern1(src), slot_w_uniform)
if (2)
equip_to_slot_or_del(new /obj/item/clothing/under/modern4(src), slot_w_uniform)
if (3)
equip_to_slot_or_del(new /obj/item/clothing/under/farmer_outfit(src), slot_w_uniform)
if (4)
equip_to_slot_or_del(new /obj/item/clothing/under/ww2/civ1(src), slot_w_uniform)
if (5)
equip_to_slot_or_del(new /obj/item/clothing/under/ww2/civ2(src), slot_w_uniform)
var/rand_shoes = rand(1,3)
switch(rand_shoes)
if (1)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(src), slot_shoes)
if (2)
equip_to_slot_or_del(new /obj/item/clothing/shoes/leatherboots(src), slot_shoes)
if (3)
equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/soviet(src), slot_shoes)
if (prob(70))
var/rand_hat = rand(1,4)
switch(rand_hat)
equip_to_slot_or_del(new /obj/item/clothing/under/modern3(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (3)
equip_to_slot_or_del(new /obj/item/clothing/under/expensive(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (4)
equip_to_slot_or_del(new /obj/item/clothing/under/detective2(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(src), slot_shoes)
if (5)
equip_to_slot_or_del(new /obj/item/clothing/under/industrial2(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/riding1/gator_cowboy(src), slot_shoes)
if (prob(70))
var/rand_hat = rand(1,2)
switch(rand_hat)
if (1)
equip_to_slot_or_del(new/obj/item/clothing/head/cowboyhat(src), slot_head)
if (2)
equip_to_slot_or_del(new/obj/item/clothing/head/cowboyhat2(src), slot_head)
else if (original_job_title == "Civilization B Citizen")
var/rand_uniform = rand(1,5)
switch(rand_uniform)
if (1)
equip_to_slot_or_del(new /obj/item/clothing/head/sov_ushanka_new(src), slot_head)
equip_to_slot_or_del(new /obj/item/clothing/under/modern1(src), slot_w_uniform)
if (2)
equip_to_slot_or_del(new /obj/item/clothing/head/ww2/sov_ushanka/nomads(src), slot_head)
equip_to_slot_or_del(new /obj/item/clothing/under/modern4(src), slot_w_uniform)
if (3)
equip_to_slot_or_del(new /obj/item/clothing/head/ww2/sov_ushanka(src), slot_head)
equip_to_slot_or_del(new /obj/item/clothing/under/farmer_outfit(src), slot_w_uniform)
if (4)
equip_to_slot_or_del(new /obj/item/clothing/head/flatcap1(src), slot_head)
equip_to_slot_or_del(new /obj/item/clothing/under/ww2/civ1(src), slot_w_uniform)
if (5)
equip_to_slot_or_del(new /obj/item/clothing/under/ww2/civ2(src), slot_w_uniform)
var/rand_shoes = rand(1,3)
switch(rand_shoes)
if (1)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(src), slot_shoes)
if (2)
equip_to_slot_or_del(new /obj/item/clothing/shoes/leatherboots(src), slot_shoes)
if (3)
equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/soviet(src), slot_shoes)
if (prob(70))
var/rand_hat = rand(1,4)
switch(rand_hat)
if (1)
equip_to_slot_or_del(new /obj/item/clothing/head/sov_ushanka_new(src), slot_head)
if (2)
equip_to_slot_or_del(new /obj/item/clothing/head/ww2/sov_ushanka/nomads(src), slot_head)
if (3)
equip_to_slot_or_del(new /obj/item/clothing/head/ww2/sov_ushanka(src), slot_head)
if (4)
equip_to_slot_or_del(new /obj/item/clothing/head/flatcap1(src), slot_head)
else
equip_to_slot_or_del(new /obj/item/clothing/under/civf1(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(src), slot_shoes)
Expand Down

0 comments on commit 278a73b

Please sign in to comment.