LAST MINUTE PATCH

_maps/map_files/templates/dungeons/raider_subway_2.dmm

@@ -1252,6 +1252,7 @@
 	pixel_x = 8
 	},
 /obj/item/storage/fancy/cigarettes/cigpack_greytort,
+/obj/item/reagent_containers/hypospray/medipen/stimpak,
 /turf/open/floor/f13{
 	icon_state = "rarewhite"
 	},
@@ -1870,6 +1871,11 @@
 	icon_state = "darkgreenfull"
 	},
 /area/f13/vault)
+"zq" = (
+/obj/structure/table,
+/obj/item/reagent_containers/hypospray/medipen/stimpak,
+/turf/open/floor/plasteel/f13/vault_floor/misc/bar,
+/area/f13/vault)
 "zs" = (
 /obj/structure/closet/locker,
 /turf/open/floor/f13{
@@ -2181,6 +2187,13 @@
 	},
 /turf/open/floor/carpet/reno/evil,
 /area/f13/vault)
+"Dy" = (
+/obj/structure/table,
+/obj/item/reagent_containers/glass/bottle/random_virus,
+/turf/open/floor/f13{
+	icon_state = "rarewhite"
+	},
+/area/f13/vault)
 "DK" = (
 /obj/structure/chair/office/dark{
 	dir = 4
@@ -3968,6 +3981,13 @@
 /obj/effect/spawner/lootdrop/trash,
 /turf/open/indestructible/ground/outside/sidewalk/innerhorizontal/dark,
 /area/f13/subway)
+"Xc" = (
+/obj/structure/table,
+/obj/item/reagent_containers/hypospray/medipen/stimpak,
+/turf/open/floor/f13/red{
+	icon_state = "redsolid"
+	},
+/area/f13/vault)
 "Xf" = (
 /obj/machinery/autolathe,
 /turf/open/floor/f13{
@@ -6270,7 +6290,7 @@ Vo
 Vo
 Vo
 CI
-CI
+zq
 xZ
 Uy
 QH
@@ -6868,7 +6888,7 @@ xZ
 Bk
 qu
 vF
-ur
+Dy
 Bk
 Oi
 Vb
@@ -6980,7 +7000,7 @@ Bk
 Bk
 Bk
 Bk
-Oi
+Xc
 fM
 oh
 Sx

code/game/objects/effects/landmarks.dm

@@ -1137,8 +1137,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	name = "Bishop Made Man"
 	icon_state = "Bishop Made Man"
 
-/obj/effect/landmark/start/f13/bishops/casinoworker
-	name = "Bishops Casino Worker"
+/obj/effect/landmark/start/f13/bishops/floorman
+	name = "Bishop Floor Man"
 	icon_state = "Bishops Casino Worker"
 
 /obj/effect/landmark/start/f13/bishops/racketeer

code/game/world.dm

@@ -335,7 +335,7 @@ GLOBAL_VAR(restart_counter)
 
 	s += "<b>[station_name()]</b>";
 	s += " ("
-	s += "<a href=\"https://discord.gg/WAv9hJzP9z\">" //Change this to wherever you want the hub to link to.
+	s += "<a href=\"https://discord.gg/Ba4YqpTzry\">" //Change this to wherever you want the hub to link to.
 	s += "Discord"  //Replace this with something else. Or ever better, delete it and uncomment the game version.
 	s += "</a>"
 	s += ")\]" //CIT CHANGE - encloses the server title in brackets to make the hub entry fancier

code/modules/cargo/exports/f13Cash.dm

@@ -0,0 +1,14 @@
+/datum/export/f13Cash
+	cost = 1
+	k_elasticity = 0
+	unit_name = "cap"
+	export_types = list(/obj/item/stack/f13Cash)
+
+/datum/export/f13Cash/get_amount(obj/O)
+	var/obj/item/stack/f13Cash/caps_entered = O
+	return ..() * caps_entered.get_item_credit_value()
+
+/datum/export/f13Cash/total_printout(datum/export_report/ex, notes = TRUE)
+	. = ..()
+	if(. && notes)
+		. += " Your deposit is completed."

code/modules/fallout/obj/stack/f13Cash.dm

@@ -209,7 +209,7 @@
 	singular_name = "Denari" // -us or -i
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "denarius"
-	flavor_desc =	"The inscriptions are in Latin,\n\
+	flavor_desc = "The inscriptions are in Latin,\n\
 		'Caesar Dictator' on the front and\n\
 		'Magnum Chasma' on the back."
 	value = CASH_DEN * CASH_CAP
@@ -248,9 +248,9 @@
 	singular_name = "Aure"// -us or -i
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "aureus"
-	flavor_desc = 	"The inscriptions are in Latin,\n\
-					'Aeternit Imperi' on the front and\n\
-					'Pax Per Bellum' on the back."
+	flavor_desc =  "The inscriptions are in Latin,\n\
+		'Aeternit Imperi' on the front and\n\
+		'Pax Per Bellum' on the back."
 	value = CASH_AUR * CASH_CAP
 	merge_type = /obj/item/stack/f13Cash/aureus
 

code/modules/jobs/job_types/citizens.dm

@@ -15,7 +15,7 @@
 	selection_color = "#dece90"
 	exp_requirements = 360
 	outfit = /datum/outfit/job/citizens/f13ncrcfwarden
-	access = list(ACCESS_NCR, ACCESS_NCR_COMMAND)
+	access = list(ACCESS_NCR, ACCESS_NCR_COMMAND, ACCESS_BRIG)
 	minimal_access = list(ACCESS_NCR, ACCESS_NCR_COMMAND)
 
 
@@ -38,7 +38,7 @@
 	glasses = /obj/item/clothing/glasses/sunglasses/big
 	neck = /obj/item/storage/belt/holster/legholster
 	gloves = /obj/item/clothing/gloves/f13/leather
-	suit = /obj/item/clothing/suit/armor/f13/civilians/ncr_police_coat/chief
+	suit = /obj/item/clothing/suit/armor/f13/ncrarmor/lieutenant
 	suit_store = /obj/item/gun/ballistic/automatic/service
 	backpack = /obj/item/storage/backpack/trekker
 	satchel = /obj/item/storage/backpack/satchel/trekker
@@ -48,6 +48,7 @@
 		/obj/item/stock_parts/cell/ammo/ec = 2,
 		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
 		/obj/item/melee/classic_baton/police = 1,
+		/obj/item/restraints/handcuffs = 2,
 		/obj/item/reagent_containers/spray/pepper = 1,
 		/obj/item/gun/energy/laser/complianceregulator = 1,
 		/obj/item/storage/bag/money/small/medium = 1
@@ -62,7 +63,7 @@
 	supervisors = "the Warden"
 	outfit = /datum/outfit/job/citizens/f13ncrcfguard
 	access = list(ACCESS_NCR)
-	minimal_access = list(ACCESS_NCR)
+	minimal_access = list(ACCESS_NCR, ACCESS_BRIG)
 
 
 /datum/outfit/job/citizens/f13ncrcfguard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -93,6 +94,7 @@
 		/obj/item/stock_parts/cell/ammo/ec = 2,
 		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
 		/obj/item/melee/classic_baton/police = 1,
+		/obj/item/restraints/handcuffs = 2,
 		/obj/item/reagent_containers/spray/pepper = 1,
 		/obj/item/gun/energy/laser/complianceregulator = 1,
 		/obj/item/storage/bag/money/small/meager = 1
@@ -106,7 +108,7 @@
 	description = "You lucked out and managed a somewhat well-paying occupation. Learned physicians are hard to come by, so your New Californian citizenship only sweetened the deal as you were whisked away by the government into working on a backwater correctional facility."
 	outfit = /datum/outfit/job/citizens/f13ncrcfphysician
 	access = list(ACCESS_NCR)
-	minimal_access = list(ACCESS_NCR)
+	minimal_access = list(ACCESS_NCR, ACCESS_BRIG)
 
 /datum/outfit/job/citizens/f13ncrcfphysician
 	name = "NCRCF Physician"
@@ -117,6 +119,7 @@
 	accessory = null
 	shoes = /obj/item/clothing/shoes/laceup
 	head = null
+	ears = /obj/item/radio/headset/headset_ncrcf
 	mask =  /obj/item/clothing/mask/surgical
 	neck = /obj/item/clothing/neck/stethoscope
 	gloves =  /obj/item/clothing/gloves/color/latex
@@ -311,6 +314,7 @@
 		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
 		/obj/item/melee/classic_baton/police = 1,
 		/obj/item/reagent_containers/spray/pepper = 1,
+		/obj/item/restraints/handcuffs = 2,
 		/obj/item/gun/energy/laser/complianceregulator = 1,
 		/obj/item/storage/bag/money/small/medium = 1
 		)
@@ -354,6 +358,7 @@
 		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
 		/obj/item/melee/classic_baton/police = 1,
 		/obj/item/reagent_containers/spray/pepper = 1,
+		/obj/item/restraints/handcuffs = 2,
 		/obj/item/gun/energy/laser/complianceregulator = 1,
 		/obj/item/storage/bag/money/small/meager = 1
 		)

code/modules/jobs/job_types/wrights.dm

@@ -436,6 +436,11 @@
 		L.registered_name = H.name
 		L.update_label()
 
+/datum/outfit/job/wrights/f13practitioner/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+
 	ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
 	ADD_TRAIT(H, TRAIT_GENERIC, src)
 	ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -3,7 +3,7 @@
 	id = "human"
 	default_color = "FFFFFF"
 
-	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,HAS_FLESH,HAS_BONE)
+	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,HAS_FLESH,HAS_BONE,NOGENITALS)
 	mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None")
 	use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
 	skinned_type = /obj/item/stack/sheet/animalhide/human

code/modules/ruins/lavalandruin_code/elephantgraveyard.dm

@@ -318,7 +318,7 @@
 
 /obj/structure/closet/crate/mcgruffin/experimental_crate
 	name = "The Prototype"
-	desc = "It looks like it could be opened with the right crowbar..."
+	desc = "A crate made of titanium, with robust grooves going down its side. There's probably something good in here. If only you had the right crowbar..."
 	icon = 'icons/obj/crates.dmi'
 	icon_state = "prototype"
 	dense_when_open = TRUE
@@ -397,8 +397,8 @@
 	return
 
 /obj/structure/closet/crate/mcgruffin/strangebird
-	name = "The Prototype"
-	desc = "It looks like it could be opened with the right crowbar..."
+	name = "Strange Bird"
+	desc = "It has an ominous feeling to it. Its eyes seem to drift along with you. You think you could open it with the right crowbar..."
 	icon = 'icons/obj/crates.dmi'
 	icon_state = "bird"
 	dense_when_open = TRUE
@@ -483,7 +483,7 @@
 
 /obj/structure/closet/crate/mcgruffin/ark
 	name = "The Ark"
-	desc = "It looks like it could be opened with the right crowbar..."
+	desc = "It looks very, very old. Something powerful is surely inside it. If only you had the right crowbar..."
 	icon = 'icons/obj/crates.dmi'
 	icon_state = "ark"
 	dense_when_open = TRUE

config/config.txt

@@ -21,16 +21,16 @@ $include policy.txt
 # There are various options which are hard-locked for security reasons.
 
 ##Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'tgstation' with the name of your choice.
-SERVERNAME Fallout: Interstate 80
+SERVERNAME Fallout 13: New Reno
 
 ##Server tagline: This will appear right below the server's title.
-SERVERTAGLINE [18+] Take a trip to Utah and see the Bonneville Salt Flats!
+SERVERTAGLINE [18+] Take a trip to Nevada and see the New Reno arch!
 
 ##Server SQL name: This is the name used to identify the server to the SQL DB, distinct from SERVERNAME as it must be at most 32 characters.
 SERVERSQLNAME pleasework
 
 ##Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
-STATIONNAME Wendover
+STATIONNAME New Reno
 
 ## Put on byond hub: Uncomment this to put your server on the byond hub.
 HUB

config/motd.txt

@@ -1,5 +1,5 @@
 <!-- Most valid html will work in here, excluding images. -->
 
-<h1>Welcome to Wendover!</h1>
+<h1>Welcome to New Reno</h1>
 <br>
 We hope you have a lovely day!<br>

fortune13.dme

@@ -1902,6 +1902,7 @@
 #include "code\modules\cargo\bounties\chef.dm"
 #include "code\modules\cargo\bounties\item.dm"
 #include "code\modules\cargo\bounties\special.dm"
+#include "code\modules\cargo\exports\f13Cash.dm"
 #include "code\modules\cargo\exports\manifest.dm"
 #include "code\modules\cargo\exports\materials.dm"
 #include "code\modules\cargo\packs\crimsoncaravan.dm"
@@ -2421,7 +2422,6 @@
 #include "code\modules\jobs\job_types\SS13\engineering.dm"
 #include "code\modules\jobs\job_types\SS13\janitor.dm"
 #include "code\modules\jobs\job_types\SS13\medical_doctor.dm"
-#include "code\modules\jobs\map_changes\map_changes.dm"
 #include "code\modules\keybindings\bindings_atom.dm"
 #include "code\modules\keybindings\bindings_client.dm"
 #include "code\modules\keybindings\focus.dm"