cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-07b

Browse Source
This commit is contained in:
Waterpig
2024-07-08 12:30:21 +02:00
parent cd3bde379b 8f7483c420
commit 7cb3b3f472
1241 changed files with 54260 additions and 34784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob_spawn/corpses/nanotrasen_corpses.dm
+1 -1
View File
@@ -25,7 +25,7 @@
suit = /obj/item/clothing/suit/armor/bulletproof
ears = /obj/item/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/eyepatch
mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
mask = /obj/item/cigarette/cigar/cohiba
head = /obj/item/clothing/head/hats/centhat
gloves = /obj/item/clothing/gloves/tackler/combat
shoes = /obj/item/clothing/shoes/combat/swat
code/modules/mob_spawn/ghost_roles/space_roles.dm
+1 -1
View File
@@ -181,6 +181,6 @@
ears = /obj/item/radio/headset/syndicate/alt/leader
glasses = /obj/item/clothing/glasses/thermal/eyepatch
head = /obj/item/clothing/head/hats/hos/cap/syndicate
mask = /obj/item/clothing/mask/cigarette/cigar/havana
mask = /obj/item/cigarette/cigar/havana
l_pocket = /obj/item/melee/energy/sword/saber/red
r_pocket = /obj/item/melee/baton/telescopic
code/modules/mob_spawn/ghost_roles/unused_roles.dm
+1 -1
View File
@@ -308,7 +308,7 @@
/datum/outfit/syndicatespace/syndicrew
name = "Syndicate Ship Crew Member"
glasses = /obj/item/clothing/glasses/night
glasses = /obj/item/clothing/glasses/night/colorless
mask = /obj/item/clothing/mask/gas/syndicate
l_pocket = /obj/item/gun/ballistic/automatic/pistol
r_pocket = /obj/item/knife/combat/survival
code/modules/mob_spawn/mob_spawn.dm
+5 -16
View File
@@ -60,26 +60,15 @@
spawned_human.undershirt = "Nude"
spawned_human.socks = "Nude"
spawned_human.bra = "Nude" //SKYRAT EDIT ADDITION
randomize_human_normie(spawned_human)
if(hairstyle)
spawned_human.hairstyle = hairstyle
else
spawned_human.hairstyle = random_hairstyle(spawned_human.gender)
spawned_human.set_hairstyle(hairstyle, update = FALSE)
if(facial_hairstyle)
spawned_human.facial_hairstyle = facial_hairstyle
else
spawned_human.facial_hairstyle = random_facial_hairstyle(spawned_human.gender)
spawned_human.set_facial_hairstyle(facial_hairstyle, update = FALSE)
if(haircolor)
spawned_human.hair_color = haircolor
else
spawned_human.hair_color = "#[random_color()]"
spawned_human.set_haircolor(haircolor, update = FALSE)
if(facial_haircolor)
spawned_human.facial_hair_color = facial_haircolor
else
spawned_human.facial_hair_color = "#[random_color()]"
if(skin_tone)
spawned_human.skin_tone = skin_tone
else
spawned_human.skin_tone = pick(GLOB.skin_tones)
spawned_human.set_facial_haircolor(facial_haircolor, update = FALSE)
spawned_human.update_body(is_creating = TRUE)
/obj/effect/mob_spawn/proc/name_mob(mob/living/spawned_mob, forced_name)