Merge pull request #125 from Mirag1993/Мердж-с-оффами

[Подтягивание с оффов] You can no longer respawn as a character with a name that matches an …
CeladonSS13 · Nov 9, 2023 · ffcb3eb · ffcb3eb
2 parents 6aa28d8 + 89925fc
commit ffcb3eb
Show file tree

Hide file tree

Showing 25 changed files with 85 additions and 50 deletions.
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
@@ -647,6 +647,7 @@
 /obj/item/clothing/head/hopcap,
 /obj/item/gun/energy/e_gun/mini,
 /obj/item/clothing/head/HoS/cowboy,
+/obj/item/clothing/suit/jacket/leather/duster/command,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ge" = (
@@ -3504,10 +3505,9 @@
 	pixel_x = -28
 	},
 /obj/item/clothing/under/rank/command/captain,
-/obj/item/clothing/under/rank/command/lieutenant,
+/obj/item/clothing/under/rank/command,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/suit/armor/vest/capcarapace/alt,
 /obj/item/clothing/suit/armor/vest/capcarapace/duster,
 /obj/item/clothing/head/beret/captain,
 /obj/item/clothing/head/caphat,
@@ -3521,6 +3521,7 @@
 /obj/item/areaeditor/shuttle,
 /obj/effect/turf_decal/spline/fancy/opaque/bottlegreen,
 /obj/item/clothing/head/caphat/cowboy,
+/obj/item/clothing/suit/armor/vest/capcarapace/captunic,
 /turf/open/floor/wood/walnut,
 /area/ship/bridge)
 "Hv" = (

diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -1552,8 +1552,9 @@
 /obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
-/obj/item/clothing/head/caphat/cowboy,
 /obj/item/radio/intercom/wideband/directional/east,
+/obj/item/clothing/suit/armor/vest/capcarapace/duster,
+/obj/item/clothing/head/caphat/cowboy,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ka" = (

diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
@@ -646,6 +646,7 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
+/obj/item/clothing/suit/armor/vest/capcarapace/duster,
 /turf/open/floor/carpet,
 /area/ship/crew)
 "da" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -1105,6 +1105,8 @@
 /obj/item/gun/energy/laser,
 /obj/item/megaphone/command,
 /obj/machinery/light/small/directional/east,
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/suit/armor/vest/capcarapace,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "fy" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -1934,7 +1934,7 @@
 /obj/structure/railing,
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 4;
-	sensors = list("gecko_burn_sensor"="Combustion Chamber")
+	sensors = list("gecko_burn_sensor"="Combustion    Chamber")
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
@@ -3399,6 +3399,8 @@
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/suit/armor/vest/capcarapace,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ij" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -773,7 +773,7 @@
 	dir = 5
 	},
 /obj/machinery/computer/atmos_control/tank/air_tank{
-	sensors = list("hairon"="Heron Air Mix Tank")
+	sensors = list("hairon"="Heron  Air  Mix  Tank")
 	},
 /obj/machinery/light_switch{
 	pixel_y = 23
@@ -6617,8 +6617,6 @@
 	req_access_txt = "20"
 	},
 /obj/item/clothing/neck/cloak/cap,
-/obj/item/clothing/gloves/color/captain,
-/obj/item/clothing/head/caphat,
 /obj/item/radio/headset/heads/captain/alt,
 /obj/item/storage/backpack/captain,
 /obj/item/clothing/under/rank/centcom/officer,
@@ -6640,6 +6638,8 @@
 /obj/item/clothing/suit/hooded/wintercoat/centcom,
 /obj/item/clothing/head/beret/centcom_formal,
 /obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/clothing/head/centcom_cap,
+/obj/item/clothing/gloves/combat,
 /turf/open/floor/carpet/green,
 /area/ship/crew/dorm/dormtwo)
 "yc" = (
@@ -9267,6 +9267,10 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
+"HR" = (
+/obj/item/clothing/gloves/color/captain/nt,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/law_office)
 "HT" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -9707,7 +9711,7 @@
 	dir = 9
 	},
 /obj/machinery/computer/atmos_control/tank/toxin_tank{
-	sensors = list("heron_plasm"="Heron Plasma Tank")
+	sensors = list("heron_plasm"="Heron  Plasma  Tank")
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -15962,7 +15966,7 @@ oz
 Oa
 QG
 QG
-QG
+HR
 QG
 QG
 Ge

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -1035,7 +1035,6 @@
 /obj/item/clothing/under/rank/command/captain/nt/skirt,
 /obj/item/clothing/under/rank/command/captain/nt,
 /obj/item/clothing/suit/armor/vest/capcarapace/alt,
-/obj/item/clothing/gloves/color/captain,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/head/caphat/nt,
 /obj/item/storage/belt/sabre,
@@ -1044,6 +1043,9 @@
 	desc = "An ICW-era self-destruct authorization disk. The codes on this are long past obsolete, but it's still a flagrant violation of company policy.";
 	name = "outdated nuclear authentication disk"
 	},
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/suit/armor/vest/capcarapace,
+/obj/item/clothing/gloves/color/captain/nt,
 /turf/open/floor/carpet/royalblue,
 /area/ship/bridge)
 "hv" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -1508,10 +1508,7 @@
 /obj/item/storage/backpack/satchel/leather,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/suit/armor/vest/hop,
-/obj/item/clothing/head/hopcap,
 /obj/item/clothing/head/hopcap/nt,
-/obj/item/clothing/under/rank/command/head_of_personnel,
-/obj/item/clothing/under/rank/command/head_of_personnel/skirt,
 /obj/item/storage/box/ids,
 /obj/item/storage/box/PDAs,
 /obj/item/assembly/flash/handheld,
@@ -1521,6 +1518,8 @@
 	pixel_y = 32
 	},
 /obj/effect/turf_decal/siding/wood,
+/obj/item/clothing/under/rank/command/head_of_personnel/nt,
+/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
 /turf/open/floor/wood,
 /area/ship/crew/crewthree)
 "lg" = (
@@ -1833,7 +1832,7 @@
 "nu" = (
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 4;
-	sensors = list("nemo_incinerator_sensor"="Incinerator Chamber")
+	sensors = list("nemo_incinerator_sensor"="Incinerator  Chamber")
 	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5527,15 +5526,16 @@
 /obj/item/storage/backpack/captain,
 /obj/item/storage/belt/sabre,
 /obj/item/clothing/glasses/sunglasses,
-/obj/item/clothing/head/caphat,
-/obj/item/clothing/head/beret/captain,
 /obj/item/clothing/suit/armor/vest/capcarapace,
-/obj/item/clothing/under/rank/command/captain/skirt,
-/obj/item/clothing/under/rank/command/captain/suit,
 /obj/item/clothing/under/rank/command/captain/parade,
 /obj/item/clothing/shoes/laceup,
 /obj/item/door_remote/captain,
 /obj/item/clothing/suit/armor/vest/capcarapace/alt,
+/obj/item/clothing/gloves/color/captain/nt,
+/obj/item/clothing/under/rank/command/captain/nt/skirt,
+/obj/item/clothing/under/rank/command/captain/nt,
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/head/caphat/nt,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "UN" = (

diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm
@@ -15,9 +15,12 @@
 #error Please consider upgrading to 514.1577 or above.
 #endif
 
+
+
 #if (DM_VERSION == 514 && DM_BUILD == 1590)
 #error Warning! Byond 514.1590 has been known to be unstable. Use at your own risk.
 #error Please consider using 514.1589.
+
 #endif
 
 // Keep savefile compatibilty at minimum supported level

diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
@@ -35,6 +35,8 @@ GLOBAL_LIST_EMPTY(aiEyes)
 ///underages who have been reported to security for trying to buy things they shouldn't, so they can't spam
 GLOBAL_LIST_EMPTY(narcd_underages)
 
+GLOBAL_LIST_EMPTY(real_names_joined)
+
 GLOBAL_LIST_EMPTY(language_datum_instances)
 GLOBAL_LIST_EMPTY(all_languages)
 

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -26,7 +26,7 @@
 	new /obj/item/clothing/under/rank/command/captain/parade(src)
 	new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
 	new /obj/item/clothing/head/caphat/parade(src)
-	new /obj/item/clothing/suit/captunic(src)
+	new /obj/item/clothing/suit/armor/vest/capcarapace/captunic(src)
 	new /obj/item/clothing/head/crown/fancy(src)
 	new /obj/item/cartridge/captain(src)
 	new /obj/item/storage/box/silver_ids(src)
@@ -414,7 +414,7 @@
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/head/beret/lt(src)
 	new /obj/item/clothing/head/beret/black(src)
-	new /obj/item/clothing/under/rank/command/lieutenant(src)
-	new /obj/item/clothing/under/rank/command/lieutenant/skirt(src)
-	new /obj/item/clothing/under/rank/command/lieutenant/nt(src)
-	new /obj/item/clothing/under/rank/command/lieutenant/nt/skirt(src)
+	new /obj/item/clothing/under/rank/command(src)
+	new /obj/item/clothing/under/rank/command/skirt(src)
+	new /obj/item/clothing/under/rank/command/nt(src)
+	new /obj/item/clothing/under/rank/command/nt/skirt(src)
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
@@ -202,6 +202,12 @@
 	strip_delay = 60
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50)
 
+/obj/item/clothing/gloves/color/captain/nt
+	desc = "Regal blue gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
+	name = "captain's gloves"
+	icon_state = "captainnt"
+	item_state = "egloves"
+
 /obj/item/clothing/gloves/color/latex
 	name = "latex gloves"
 	desc = "Cheap sterile gloves made from latex. Transfers minor paramedic knowledge to the user via budget nanochips."

diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
@@ -389,7 +389,7 @@
 
 	id = /obj/item/card/id/silver
 	head = /obj/item/clothing/head/beret/lt
-	uniform = /obj/item/clothing/under/rank/command/lieutenant
+	uniform = /obj/item/clothing/under/rank/command
 	alt_uniform = /obj/item/clothing/under/rank/command
 	suit = /obj/item/clothing/suit/toggle/lieutenant
 	alt_suit = /obj/item/clothing/suit/armor/lieutenant_trenchcoat

diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
@@ -157,6 +157,12 @@
 	icon_state = "carapace_ntformal"
 	item_state = "capspacesuit"
 
+/obj/item/clothing/suit/armor/vest/capcarapace/captunic
+	name = "captain's parade coat"
+	desc = "Worn by a Captain to show their class."
+	icon_state = "carapace_formal"
+	item_state = "bio_suit"
+
 /obj/item/clothing/suit/armor/vest/capcarapace/minutemen
 	name = "colonial minutemen general coat"
 	desc = "A very fancy coat used by generals of the Colonial Minutemen."

diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
@@ -22,16 +22,6 @@
 	body_parts_covered = CHEST|GROIN|LEGS
 	permeability_coefficient = 0.5
 
-//Captain
-/obj/item/clothing/suit/captunic
-	name = "captain's parade tunic"
-	desc = "Worn by a Captain to show their class."
-	icon_state = "captunic"
-	item_state = "bio_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	flags_inv = HIDEJUMPSUIT
-	allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
-
 //Chef
 /obj/item/clothing/suit/toggle/chef
 	name = "chef's apron"

diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm
@@ -20,7 +20,7 @@
 /obj/item/clothing/under/rank/command/nt/skirt
 	desc = "A standard command jumpskirt."
 	name = "command jumpskirt"
-	icon_state = "cmd_skirt"
+	icon_state = "cmd_nt_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
 
@@ -113,27 +113,27 @@
 
 //Lieutenant
 
-/obj/item/clothing/under/rank/command/lieutenant
+/obj/item/clothing/under/rank/command
 	desc = "A standard command jumpsuit in the colours of the Lieutenant."
 	name = "\improper lieutenant jumpsuit"
 	icon_state = "lt"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/command/lieutenant/skirt
+/obj/item/clothing/under/rank/command/skirt
 	desc = "A command jumpskirt in the colours of the Lieutenant."
 	name = "\improper lieutenant jumpskirt"
 	icon_state = "lt_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
 
-/obj/item/clothing/under/rank/command/lieutenant/nt
+/obj/item/clothing/under/rank/command/nt
 	desc = "A standard command jumpsuit in the colours of the Lieutenant."
 	name = "\improper lieutenant blue jumpsuit"
 	icon_state = "lt_nt"
 	item_state = "b_suit"
 
-/obj/item/clothing/under/rank/command/lieutenant/nt/skirt
+/obj/item/clothing/under/rank/command/nt/skirt
 	desc = "A command jumpskirt in the colours of the Lieutenant."
 	name = "\improper lieutenant blue jumpskirt"
 	icon_state = "lt_nt_skirt"

diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
@@ -54,27 +54,18 @@
 
 	ears = /obj/item/radio/headset/nanotrasen/captain
 	uniform = /obj/item/clothing/under/rank/command/captain/nt
+	gloves = /obj/item/clothing/gloves/color/captain/nt
 	shoes = /obj/item/clothing/shoes/laceup
 	head = /obj/item/clothing/head/caphat/nt
 
 /datum/outfit/job/captain/nt/heron
 	name = "Captain (Nanotrasen)"
 
 	uniform = /obj/item/clothing/under/rank/centcom/officer
+	gloves = /obj/item/clothing/gloves/combat
 	head = /obj/item/clothing/head/centhat
 	suit = /obj/item/clothing/suit/armor/vest/bulletproof
 
-/datum/outfit/job/captain/solgov
-	name = "Captain (SolGov)"
-
-	ears = /obj/item/radio/headset/solgov/captain
-	shoes = /obj/item/clothing/shoes/laceup
-	suit = /obj/item/clothing/suit/toggle/solgov
-
-/datum/outfit/job/captain/solgov/rebel
-	name = "Captain (Deserter)"
-	suit = /obj/item/clothing/suit/toggle/solgov/terragov
-
 /datum/outfit/job/captain/pirate
 	name = "Captain (Pirate)"
 

diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
@@ -291,6 +291,12 @@
 	if(auth_check)
 		return
 
+	if(!client.prefs.randomise[RANDOM_NAME]) // do they have random names enabled
+		var/name = client.prefs.real_name
+		if(GLOB.real_names_joined.Find(name)) // is there someone who spawned with the same name
+			to_chat(usr, "<span class='warning'>Someone has spawned with this name already.")
+			return FALSE
+
 	var/error = IsJobUnavailable(job, ship, check_playtime)
 	if(error != JOB_AVAILABLE)
 		alert(src, get_job_unavailable_error_message(error, job))
@@ -398,6 +404,7 @@
 	close_spawn_windows()
 
 	var/mob/living/carbon/human/H = new(loc)
+	GLOB.joined_player_list += ckey
 
 	var/frn = CONFIG_GET(flag/force_random_names)
 	var/admin_anon_names = SSticker.anonymousnames
@@ -418,6 +425,7 @@
 		is_antag = TRUE
 
 	client.prefs.copy_to(H, antagonist = is_antag)
+	update_names_joined_list(H.real_name)
 	H.dna.update_dna_identity()
 	if(mind)
 		if(transfer_after)