Merge remote-tracking branch 'upstream/release'

code/game/gamemodes/gameticker.dm

@@ -304,7 +304,7 @@ var/global/datum/controller/gameticker/ticker
 				if(!player_is_antag(player.mind, only_offstation_roles = 1))
 					job_master.EquipRank(player, player.mind.assigned_role, 0)
 					UpdateFactionList(player)
-					equip_custom_items(player)
+					//equip_custom_items(player)	//VOREStation Removal
 					//player.apply_traits() //VOREStation Removal
 		if(captainless)
 			for(var/mob/M in player_list)

code/game/machinery/machinery.dm

@@ -214,8 +214,7 @@ Class Procs:
 /obj/machinery/CanUseTopic(var/mob/user)
 	if(!interact_offline && (stat & (NOPOWER | BROKEN)))
 		return STATUS_CLOSE
-	// return ..()		// This doesn't call the parent with the correct number of arguments (causing a runtime in /code/modules/nano/interaction/base.dm), nor easily provide any indication as to what the datum/topic_state should be, so this is clearly the wrong action.
-	return STATUS_INTERACTIVE
+	return ..()
 
 /obj/machinery/CouldUseTopic(var/mob/user)
 	..()
@@ -458,4 +457,4 @@ Class Procs:
 	return
 
 /datum/proc/remove_visual(mob/M)
-	return
+	return

code/game/objects/objs.dm

@@ -55,7 +55,7 @@
 	CouldNotUseTopic(usr)
 	return 1
 
-/obj/CanUseTopic(var/mob/user, var/datum/topic_state/state)
+/obj/CanUseTopic(var/mob/user, var/datum/topic_state/state = default_state)
 	if(user.CanUseObjTopic(src))
 		return ..()
 	to_chat(user, "<span class='danger'>\icon[src]Access Denied!</span>")

code/modules/admin/verbs/randomverbs.dm

@@ -491,7 +491,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(equipment)
 		if(charjob)
 			job_master.EquipRank(new_character, charjob, 1)
-		equip_custom_items(new_character)
+		//equip_custom_items(new_character)	//VOREStation Removal
 
 	//If desired, add records.
 	if(records)

code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm

@@ -1,12 +1,11 @@
 /datum/gear/fluff
-	path = /obj/item/
+	path = /obj/item
 	sort_category = "Fluff Items"
 	display_name = "If this item can be chosen or seen, ping a coder immediately!"
 	ckeywhitelist = list("This entry should never be choosable with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
 	character_name = list("This entry should never be choosable with this variable set.")
-	allowed_roles = list()
 	cost = 0
-/* 
+/*
 /datum/gear/fluff/testhorn
 	path = /obj/item/weapon/bikehorn
 	display_name = "Airhorn - Example Item"
@@ -210,7 +209,7 @@
 	display_name = "Verd's Medal"
 	ckeywhitelist = list("epigraphzero")
 	character_name = list("Verd Woodrow")
-	
+
 //  F CKEYS
 
 //  G CKEYS
@@ -250,7 +249,7 @@
 	path = /obj/item/clothing/accessory/badge/holo/detective/ruda
 	display_name = "Ruda's Detective Badge"
 	ckeywhitelist = list("interrolouis")
-	character_name = list(" Ruda Lizden")
+	character_name = list("Ruda Lizden")
 
 /datum/gear/fluff/kai_modkit
 	path = /obj/item/borg/upgrade/modkit/chassis_mod/kai
@@ -438,7 +437,7 @@
 /datum/gear/fluff/taiga_uniform
 	path = /obj/item/clothing/under/fluff/taiga
 	display_name = "Taifa's Uniform"
-	ckeywhitelist = list("kiwiDaNinja")
+	ckeywhitelist = list("kiwidaninja")
 	character_name = list("Chakat Taiga")
 
 /datum/gear/fluff/rischi_implant
@@ -663,13 +662,13 @@
 /datum/gear/fluff/roiz_implant
 	path = /obj/item/weapon/implanter/reagent_generator/roiz
 	display_name = "Roiz's Implant"
-	ckeywhitelist = list("spoopyLizz")
+	ckeywhitelist = list("spoopylizz")
 	character_name = list("Roiz Lizden")
 
 /datum/gear/fluff/roiz_coat
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz
 	display_name = "Roiz's Coat"
-	ckeywhitelist = list("spoopyLizz")
+	ckeywhitelist = list("spoopylizz")
 	character_name = list("Roiz Lizden")
 
 /datum/gear/fluff/silent_mimemask

code/modules/clothing/spacesuits/rig/modules/combat_vr.dm

@@ -0,0 +1,12 @@
+/obj/item/rig_module/grenade_launcher/cleaner
+	name = "mounted cleaner-grenade launcher"
+	desc = "A shoulder-mounted cleaner-grenade dispenser."
+
+	interface_name = "integrated cleaner-grenade launcher"
+	interface_desc = "Discharges loaded cleaner-grenades against the wearer's location."
+
+	fire_force = 15
+
+	charges = list(
+		list("cleaner grenade",  "cleaner grenade",  /obj/item/weapon/grenade/chem_grenade/cleaner,  6)
+		)

code/modules/clothing/spacesuits/rig/suits/ert_vr.dm

@@ -0,0 +1,13 @@
+/obj/item/weapon/rig/ert/janitor
+	name = "ERT-J suit control module"
+	desc = "A suit worn by the janitorial division of an Emergency Response Team. Has purple highlights. Armoured and space ready."
+	suit_type = "ERT janitor"
+	icon_state = "ert_janitor_rig"
+
+	initial_modules = list(
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/grenade_launcher/cleaner,
+		)
+
+/obj/item/weapon/rig/ert/assetprotection
+	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)

code/modules/clothing/spacesuits/rig/suits/station_vr.dm

@@ -15,9 +15,6 @@
 	desc = "A heavy, powerful hardsuit used by construction crews and mining corporations. This is a mass production model with reduced armor."
 	armor = list(melee = 50, bullet = 10, laser = 20, energy = 15, bomb = 30, bio = 100, rad = 50)
 
-/obj/item/weapon/rig/ert/assetprotection
-	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
-
 //Area allowing backpacks to be placed on rigsuits.
 /obj/item/weapon/rig/vox
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/backpack)

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -77,7 +77,8 @@
 		new /datum/data/mining_equipment("Defense Equipment - Plasteel Machete",	/obj/item/weapon/material/knife/machete,				500),
 		new /datum/data/mining_equipment("Fishing Net",					/obj/item/weapon/material/fishing_net,								500),
 		new /datum/data/mining_equipment("Titanium Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern,						1000),
-		new /datum/data/mining_equipment("Durasteel Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern/strong,				7500)
+		new /datum/data/mining_equipment("Durasteel Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern/strong,				7500),
+		new /datum/data/mining_equipment("Bar Shelter Capsule",		/obj/item/device/survivalcapsule/luxurybar,							10000)
 		)
 	//VOREStation Edit End
 

code/modules/mining/ore_redemption_machine/survey_vendor.dm

@@ -46,7 +46,8 @@
 		new /datum/data/mining_equipment("Defense Equipment - Steel Machete",	/obj/item/weapon/material/knife/machete,					75),
 		new /datum/data/mining_equipment("Fishing Net",					/obj/item/weapon/material/fishing_net,								50),
 		new /datum/data/mining_equipment("Titanium Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern,						100),
-		new /datum/data/mining_equipment("Durasteel Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern/strong,				750)
+		new /datum/data/mining_equipment("Durasteel Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern/strong,				750),
+		new /datum/data/mining_equipment("Bar Shelter Capsule",		/obj/item/device/survivalcapsule/luxurybar,							1000)
 		)
 		//VOREStation Edit End
 

code/modules/mob/new_player/new_player.dm

@@ -387,7 +387,7 @@
 		return
 
 	// Equip our custom items only AFTER deploying to spawn points eh?
-	equip_custom_items(character)
+	//equip_custom_items(character)	//VOREStation Removal
 
 	//character.apply_traits() //VOREStation Removal