Merge remote-tracking branch 'upstream/master'

code/_helpers/global_lists_vr.dm

@@ -127,41 +127,54 @@ var/global/list/tf_egg_types = list(
 	"Xenochimera"		= /obj/structure/closet/secure_closet/egg/scree,
 	"Xenomorph"		= /obj/structure/closet/secure_closet/egg/xenomorph)
 
-var/global/list/edible_trash = list(/obj/item/trash,
+var/global/list/edible_trash = list(/obj/item/broken_device,
+				/obj/item/clothing/mask,
+				/obj/item/clothing/glasses,
+				/obj/item/clothing/gloves,
+				/obj/item/clothing/head,
+				/obj/item/clothing/shoes,
+				/obj/item/device/aicard,
 				/obj/item/device/flashlight,
-				/obj/item/toy/figure,
-				/obj/item/weapon/cigbutt,
-				/obj/item/weapon/bananapeel,
-				/obj/item/stack/material/cardboard,
-				/obj/item/weapon/light,
-				/obj/item/weapon/paper,
-				/obj/item/weapon/broken_bottle,
-				/obj/item/weapon/reagent_containers/food,
+				/obj/item/device/mmi/digital/posibrain,
+				/obj/item/device/paicard,
+				/obj/item/device/pda,
+				/obj/item/device/radio/headset,
 				/obj/item/inflatable/torn,
-				/obj/item/weapon/flame/match,
-				/obj/item/clothing/mask/smokable,
-				/obj/item/weapon/storage/wallet,
-				/obj/item/weapon/spacecash,
-				/obj/item/broken_device,
+				/obj/item/organ,
+				/obj/item/stack/material/cardboard,
+				/obj/item/toy,
+				/obj/item/trash,
+				/obj/item/weapon/bananapeel,
+				/obj/item/weapon/bone,
+				/obj/item/weapon/broken_bottle,
+				/obj/item/weapon/card/emag_broken,
+				/obj/item/weapon/cigbutt,
+				/obj/item/weapon/circuitboard/broken,
+				/obj/item/weapon/clipboard,
 				/obj/item/weapon/corncob,
+				/obj/item/weapon/dice,
+				/obj/item/weapon/flame,
+				/obj/item/weapon/light,
+				/obj/item/weapon/lipstick,
+				/obj/item/weapon/material/shard,
+				/obj/item/weapon/newspaper,
+				/obj/item/weapon/paper,
 				/obj/item/weapon/paperplane,
 				/obj/item/weapon/pen,
 				/obj/item/weapon/photo,
-				/obj/item/weapon/storage/box/wings,
-				/obj/item/weapon/storage/box/matches,
-				/obj/item/weapon/storage/fancy/cigarettes,
-				/obj/item/weapon/storage/fancy/egg_box,
-				/obj/item/weapon/storage/fancy/candle_box,
-				/obj/item/weapon/storage/fancy/crayons,
-				/obj/item/weapon/dice,
-				/obj/item/weapon/newspaper,
+				/obj/item/weapon/reagent_containers/food,
+				/obj/item/weapon/reagent_containers/glass/bottle,
 				/obj/item/weapon/reagent_containers/glass/rag,
-				/obj/item/weapon/lipstick,
 				/obj/item/weapon/soap,
-				/obj/item/weapon/material/shard,
-				/obj/item/device/paicard,
-				/obj/item/device/mmi/digital/posibrain,
-				/obj/item/device/aicard)
+				/obj/item/weapon/spacecash,
+				/obj/item/weapon/storage/box/khcrystal,
+				/obj/item/weapon/storage/box/matches,
+				/obj/item/weapon/storage/box/wings,
+				/obj/item/weapon/storage/fancy/candle_box,
+				/obj/item/weapon/storage/fancy/cigarettes,
+				/obj/item/weapon/storage/fancy/crayons,
+				/obj/item/weapon/storage/fancy/egg_box,
+				/obj/item/weapon/storage/wallet)
 
 var/global/list/cont_flavors = list(
 				"Generic" = cont_flavors_generic,

code/game/objects/random/random_vr.dm

@@ -201,9 +201,31 @@
 			this_mob.forceMove(T)
 
 //Just overriding this here, no more super medkit so those can be reserved for PoIs and such
-/obj/random/firstaid/item_to_spawn()
+/obj/random/tetheraid
+	name = "Random First Aid Kit"
+	desc = "This is a random first aid kit. Does not include Combat Kits."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "firstaid"
+
+/obj/random/tetheraid/item_to_spawn()
 	return pick(prob(4);/obj/item/weapon/storage/firstaid/regular,
 				prob(3);/obj/item/weapon/storage/firstaid/toxin,
 				prob(3);/obj/item/weapon/storage/firstaid/o2,
 				prob(2);/obj/item/weapon/storage/firstaid/adv,
 				prob(3);/obj/item/weapon/storage/firstaid/fire)
+
+//Override from maintenance.dm to prevent combat kits from spawning in Tether maintenance
+/obj/random/maintenance/item_to_spawn()
+	return pick(prob(300);/obj/random/tech_supply,
+				prob(200);/obj/random/medical,
+				prob(100);/obj/random/tetheraid,
+				prob(10);/obj/random/contraband,
+				prob(50);/obj/random/action_figure,
+				prob(50);/obj/random/plushie,
+				prob(200);/obj/random/junk,
+				prob(200);/obj/random/material,
+				prob(50);/obj/random/toy,
+				prob(100);/obj/random/tank,
+				prob(50);/obj/random/soap,
+				prob(60);/obj/random/drinkbottle,
+				prob(500);/obj/random/maintenance/clean)

code/modules/projectiles/guns/projectile/pistol_vr.dm

@@ -2,4 +2,8 @@
 	name = ".45 pistol"
 
 /obj/item/weapon/gun/projectile/p92x/sec
-	magazine_type = /obj/item/ammo_magazine/m9mm/rubber
+	magazine_type = /obj/item/ammo_magazine/m9mm/rubber
+
+/obj/item/weapon/gun/projectile/p92x/large/preban
+	icon_state = "p92x-brown"
+	magazine_type = /obj/item/ammo_magazine/m9mm/large/preban // Spawns with big magazines that are legal.

code/modules/projectiles/projectile/energy.dm

@@ -230,4 +230,4 @@
 /obj/item/projectile/energy/phase/heavy/cannon
 	kill_count = 10
 	damage = 15
-	SA_bonus_damage = 60	// 75 total on animals
+	SA_bonus_damage = 60	// 75 total on animals

code/modules/vore/eating/bellymodes_vr.dm

@@ -85,6 +85,9 @@
 								digest_item(I)
 							to_update = TRUE
 							break
+		//get rid of things like blood drops and gibs that end up in there
+		else if(istype(A,/obj/effect/decal/cleanable/))
+			qdel(A)
 
 ///////////////////////////// DM_HOLD /////////////////////////////
 	if(digest_mode == DM_HOLD)

code/modules/vore/eating/contaminate_vr.dm

@@ -44,12 +44,6 @@ var/image/gurgled_overlay = image('icons/effects/sludgeoverlay_vr.dmi')
 	if(gurgled)
 		decontaminate()
 
-/obj/item/device/pda/can_use() //Get your rice bowl ready.
-	if(gurgled)
-		return FALSE
-	else
-		return ..()
-
 /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) //Wash the soggy item before it can interact with the sink.
 	if(O.gurgled)
 		var/turf/location = user.loc
@@ -121,7 +115,3 @@ var/image/gurgled_overlay = image('icons/effects/sludgeoverlay_vr.dmi')
 	if((. = ..()))
 		name = "soggy [cleanname]"
 		desc = "This soggy box is about to fall apart any time."
-
-/obj/item/device/pda/gurgle_contaminate(var/atom/movable/item_storage = null)
-	if((. = ..()))
-		desc = "This device seems completely unresponsive while drenched with sludge. Perhaps you could still wash it."

code/modules/vore/eating/digest_act_vr.dm

@@ -58,6 +58,8 @@
 	return FALSE
 /obj/item/device/perfect_tele_beacon/digest_act(var/atom/movable/item_storage = null)
 	return FALSE //Sorta important to not digest your own beacons.
+/obj/item/organ/internal/brain/slime/digest_act(var/atom/movable/item_storage = null)
+	return FALSE //so prometheans can be recovered
 
 /////////////
 // Some special treatment
@@ -65,8 +67,8 @@
 //PDAs need to lose their ID to not take it with them, so we can get a digested ID
 /obj/item/device/pda/digest_act(var/atom/movable/item_storage = null)
 	if(id)
-		id = null
-
+		if(istype(item_storage,/obj/item/device/dogborg/sleeper) || (!isnull(digest_stage) && digest_stage <= 0))
+			id = null
 	. = ..()
 
 /obj/item/weapon/card/id/digest_act(var/atom/movable/item_storage = null)

code/modules/vore/eating/living_vr.dm

@@ -554,6 +554,40 @@
 		return
 
 	if(is_type_in_list(I,edible_trash))
+		if(I.hidden_uplink)
+			to_chat(src, "<span class='warning'>You really should not be eating this.</span>")
+			message_admins("[key_name(src)] has attempted to ingest an uplink item. ([src ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>" : "null"])")
+			return
+		if(istype(I,/obj/item/device/pda))
+			var/obj/item/device/pda/P = I
+			if(P.owner)
+				var/watching = FALSE
+				for(var/mob/living/carbon/human/H in view(src))
+					if(H.real_name == P.owner && H.client)
+						watching = TRUE
+						break
+				if(!watching)
+					return
+				else
+					visible_message("<span class='warning'>[src] is threatening to make [P] disappear!</span>")
+					if(P.id)
+						var/confirm = alert(src, "The PDA you're holding contains a vulnerable ID card. Will you risk it?", "Confirmation", "Definitely", "Cancel")
+						if(confirm != "Definitely")
+							return
+					if(!do_after(src, 100, P))
+						return
+					visible_message("<span class='warning'>[src] successfully makes [P] disappear!</span>")
+			to_chat(src, "<span class='notice'>You can taste the sweet flavor of delicious technology.</span>")
+			drop_item()
+			I.forceMove(vore_selected)
+			updateVRPanel()
+			return
+		if(istype(I,/obj/item/clothing/shoes))
+			var/obj/item/clothing/shoes/S = I
+			if(S.holding)
+				to_chat(src, "<span class='warning'>There's something inside!</span>")
+				return
+
 		drop_item()
 		I.forceMove(vore_selected)
 		updateVRPanel()
@@ -588,7 +622,7 @@
 				to_chat(src, "<span class='notice'>You can taste the flavor of pain. This can't possibly be healthy for your guts.</span>")
 			else
 				to_chat(src, "<span class='notice'>You can taste the flavor of really bad ideas.</span>")
-		else if(istype(I,/obj/item/toy/figure))
+		else if(istype(I,/obj/item/toy))
 			visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")
 		else if(istype(I,/obj/item/device/paicard) || istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard))
 			visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -1,4 +1,5 @@
 // ToDo: Alphabetize by ckey.
+// Also these things might be mildly obsolete considering the update to inventory.
 
 // BEGIN - DO NOT EDIT PROTOTYPE
 /obj/item/weapon/storage/box/fluff
@@ -39,6 +40,20 @@
 		/obj/item/clothing/under/fluff/kilanosuit/purple,
 		/obj/item/clothing/shoes/boots/fluff/kilano/purple)
 
+//BeyondMyLife: Ne'tra Ky'ram //Made a box because they have so many items that it'd spam the debug log.
+/obj/item/weapon/storage/box/fluff/kilano
+	name = "Ne'tra Ky'ram's Kit"
+	desc = "A kit containing Ne'tra Ky'ram's clothing."
+	has_items = list(
+		/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat,
+		/obj/item/clothing/under/fluff/kilanosuit,
+		/obj/item/weapon/storage/backpack/messenger/sec/fluff/kilano,
+		/obj/item/weapon/storage/belt/security/fluff/kilano,
+		/obj/item/clothing/gloves/fluff/kilano/netra,
+		/obj/item/clothing/shoes/boots/fluff/kilano,
+		/obj/item/clothing/accessory/storage/black_vest/fluff/kilano
+		)
+
 // bwoincognito:Tasald Corlethian
 /obj/item/weapon/storage/box/fluff/tasald
 	name = "Tasald's Kit"
@@ -47,8 +62,8 @@
 		/obj/item/clothing/suit/storage/det_suit/fluff/tasald,
 		/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat,
 		/obj/item/clothing/under/det/fluff/tasald,
-		/obj/item/clothing/accessory/permit/gun/fluff/tasald_corlethian,
-		/obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian,
+		//	/obj/item/clothing/accessory/permit/gun/fluff/tasald_corlethian,
+		//	/obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian,
 		/obj/item/weapon/implanter/loyalty)
 
 //bwoincognito:Octavious Ward
@@ -65,6 +80,39 @@
 		/obj/item/clothing/glasses/hud/health/octaviousmonicle
 		)
 
+//drakefrostpaw:Drake Frostpaw
+/obj/item/weapon/storage/box/fluff/drake
+	name = "United Federation Uniform Kit"
+	desc = "A box containing all the parts of a United Federation Uniform"
+	has_items = list(
+		/obj/item/clothing/under/rank/internalaffairs/fluff/joan,
+		/obj/item/clothing/suit/storage/fluff/modernfedcoat/modernfedsec,
+		/obj/item/clothing/head/caphat/formal/fedcover/fedcoversec,
+		/obj/item/clothing/gloves/white,
+		)
+
+// Draycu: Schae Yonra
+/obj/item/weapon/storage/box/fluff/yonra
+	name = "Yonra's Starting Kit"
+	desc = "A small box containing Yonra's personal effects"
+	has_items = list(
+		/obj/item/weapon/melee/fluff/holochain/mass,
+		/obj/item/weapon/implanter/reagent_generator/yonra,
+		/obj/item/clothing/accessory/medal/silver/unity)
+
+//ivymoomoo:Ivy Baladeva
+/obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo
+	name = "Ivy's Courier"
+	desc = "A bag resembling something used by college students. Contains items for ''MooMoo''."
+
+	New()
+		..()
+		new /obj/item/clothing/head/beretg(src)
+		new /obj/item/device/fluff/id_kit_ivy(src)
+		new /obj/item/weapon/storage/fancy/cigarettes/dromedaryco(src)
+		new /obj/item/weapon/storage/box/matches(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake(src)
+
 // jemli:Cirra Mayhem
 /obj/item/weapon/storage/box/fluff/cirra
 	name = "Instant Pirate Kit"
@@ -127,44 +175,11 @@
 		new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src)
 		new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src)
 
-//drakefrostpaw:Drake Frostpaw
-/obj/item/weapon/storage/box/fluff/drake
-	name = "United Federation Uniform Kit"
-	desc = "A box containing all the parts of a United Federation Uniform"
-	has_items = list(
-		/obj/item/clothing/under/rank/internalaffairs/fluff/joan,
-		/obj/item/clothing/suit/storage/fluff/modernfedcoat/modernfedsec,
-		/obj/item/clothing/head/caphat/formal/fedcover/fedcoversec,
-		/obj/item/clothing/gloves/white,
-		)
-
-// Draycu: Schae Yonra
-/obj/item/weapon/storage/box/fluff/yonra
-	name = "Yonra's Starting Kit"
-	desc = "A small box containing Yonra's personal effects"
-	has_items = list(
-		/obj/item/weapon/melee/fluff/holochain/mass,
-		/obj/item/weapon/implanter/reagent_generator/yonra,
-		/obj/item/clothing/accessory/medal/silver/unity)
-
 //Razerwing:Archer Maximus
 /obj/item/weapon/storage/box/fluff/archermaximus
 	desc = "Personal Effects"
 	has_items = list()
 
-//ivymoomoo:Ivy Baladeva
-/obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo
-	name = "Ivy's Courier"
-	desc = "A bag resembling something used by college students. Contains items for ''MooMoo''."
-
-	New()
-		..()
-		new /obj/item/clothing/head/beretg(src)
-		new /obj/item/device/fluff/id_kit_ivy(src)
-		new /obj/item/weapon/storage/fancy/cigarettes/dromedaryco(src)
-		new /obj/item/weapon/storage/box/matches(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake(src)
-
 //Xsdew:Penelope Allen
 /obj/item/weapon/storage/box/fluff/penelope
 	name = "Penelope's capsule"
@@ -204,20 +219,6 @@
 		/obj/item/weapon/gun/projectile/colt/fluff/serdy)
 */
 
-//BeyondMyLife: Ne'tra Ky'ram //Made a box because they have so many items that it'd spam the debug log.
-/obj/item/weapon/storage/box/fluff/kilano
-	name = "Ne'tra Ky'ram's Kit"
-	desc = "A kit containing Ne'tra Ky'ram's clothing."
-	has_items = list(
-		/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat,
-		/obj/item/clothing/under/fluff/kilanosuit,
-		/obj/item/weapon/storage/backpack/messenger/sec/fluff/kilano,
-		/obj/item/weapon/storage/belt/security/fluff/kilano,
-		/obj/item/clothing/gloves/fluff/kilano/netra,
-		/obj/item/clothing/shoes/boots/fluff/kilano,
-		/obj/item/clothing/accessory/storage/black_vest/fluff/kilano
-		)
-
 // JackNoir413: Mor Xaina
 /obj/item/weapon/storage/box/fluff/morxaina
 	name = "Fashionable clothes set"

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -120,6 +120,11 @@
 	ammo_type = /obj/item/ammo_casing/a12g/stunshell
 	max_shells = 6
 
+/* // jertheace : Jeremiah 'Ace' Acacius
+/obj/item/ammo_magazine/m9mm/large/preban/hp // Not yet implemented. Waiting on a PR to Polaris. -Ace
+	ammo_type = /obj/item/ammo_casing/a9mm/hp
+*/
+
 // bwoincognito:Tasald Corlethian
 /obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian //Now that it is actually Single-Action and not hacky broken SA, I see no reason to nerf this down to .38. --Joan Risu
 	name = "\improper \"Big Iron\" revolver"
@@ -513,8 +518,8 @@
 	fire_sound = 'sound/weapons/Taser.ogg'
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	firemodes = list(
-		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
-		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
+		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg', charge_cost = 600),
+		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg', charge_cost = 1200),
 		)
 
 /obj/item/weapon/gun/energy/gun/martin/proc/update_mode()
@@ -733,9 +738,9 @@
 	icon_state = "phaser"
 	item_state = "phaser"
 	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/mob/belt_vr.dmi')
-	item_state_slots = list(slot_r_hand_str = "phaser", slot_l_hand_str = "phaser", "slot_belt" = "phaser")
 	fire_sound = 'sound/weapons/laser2.ogg'
 	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4)
+	charge_cost = 300
 
 	battery_lock = 1
 	unacidable = 1
@@ -744,7 +749,7 @@
 
 	projectile_type = /obj/item/projectile/beam
 	firemodes = list(
-		list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 300),
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 300),
 		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60),
 	)
 
@@ -808,32 +813,41 @@
 			return 0
 	return ..()
 
+//Phaser Carbine - Reskinned phaser
+/obj/item/weapon/gun/energy/frontier/locked/carbine
+	name = "frontier carbine"
+	desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "carbinekill"
+	item_state = "retro"
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
+
+	modifystate = "carbinekill"
+	firemodes = list(
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="carbinekill", charge_cost = 300),
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, modifystate="carbinestun", charge_cost = 60),
+	)
+
+/obj/item/weapon/gun/energy/frontier/locked/carbine/update_icon()
+	if(recharging)
+		icon_state = "[modifystate]_pump"
+		update_held_icon()
+		return
+	..()
+
 //Expeditionary Holdout Phaser
 /obj/item/weapon/gun/energy/frontier/locked/holdout
 	name = "holdout frontier phaser"
-	desc = "A recently introduced weapon intended for self defense by expeditionary support. It includes the same crank charger as the frontier phaser."
+	desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
 	icon = 'icons/obj/gun_vr.dmi'
-	icon_state = "PDW"
-	item_state = "gun"
+	icon_state = "holdoutkill"
+	item_state = null
+
 	w_class = ITEMSIZE_SMALL
 	charge_cost = 600
+	modifystate = "holdoutkill"
 	firemodes = list(
-		list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 600),
-		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 120),
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="holdoutkill", charge_cost = 600),
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, modifystate="holdoutstun", charge_cost = 120),
+		list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300),
 	)
-
-/obj/item/weapon/gun/energy/frontier/locked/holdout/proc/update_mode()
-	var/datum/firemode/current_mode = firemodes[sel_mode]
-	switch(current_mode.name)
-		if("low-power") add_overlay("taser_pdw")
-		if("normal") add_overlay("lazer_pdw")
-
-/obj/item/weapon/gun/energy/frontier/locked/holdout/update_icon()
-	cut_overlays()
-	if(recharging)
-		icon_state = "[initial(icon_state)]_pump"
-		update_held_icon()
-		return
-	else
-		icon_state = "[initial(icon_state)]"
-		update_mode()

code/modules/vore/fluffstuff/custom_permits_vr.dm

@@ -18,21 +18,23 @@
 	desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on February 16th, 2562."
 */
 
+/*
 // bwoincognito:Tasald Corlethian
 /obj/item/clothing/accessory/permit/gun/fluff/tasald_corlethian
 	name = "Tasald Ajax Corlethian's Sidearm Permit"
 	desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on August 2nd, 2562."
+*/
 
 /* dhaeleena:Dhaeleena M'iar
 /obj/item/clothing/accessory/permit/gun/fluff/dhaeleena_miar
 	name = "Dhaeleena M'iar's Sidearm Permit"
-	desc = "A card indicating that the owner is allowed to carry a sidearm that uses less-than-lethal munitions. It is issued by CentCom, so it is valid until it expires on March 1st, 2562."
+	desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on March 1st, 2562."
 */
 
 // jertheace:Jeremiah 'Ace' Acacius
 /obj/item/clothing/accessory/permit/gun/fluff/ace
-	name = "Ace's Shotgun Permit"
-	desc = "A card indicating that the owner is allowed to carry a firearm. It is issued by CentCom, so it is valid until it expires on October 1st, 2562."
+	name = "Jeremiah Acacius's Sidearm Permit"
+	desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on November 10th, 2563."
 
 /* joanrisu:Joan Risu
 /obj/item/clothing/accessory/permit/gun/fluff/joanrisu
@@ -52,15 +54,17 @@
 	desc = "A card indicating that the owner is allowed to carry a sidearm that uses less-than-lethal munitions. It is issued by CentCom, so it is valid until it expires on April 24th, 2562."
 */
 
+/*
 // pawoverlord:Sorrel Cavalet
 /obj/item/clothing/accessory/permit/gun/fluff/sorrel_cavalet
 	name = "Sorrel Cavalet's Sidearm Permit"
 	desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on September 26th, 2562."
+*/
 
 /*  hzdonut:Jesse Soemmer
 /obj/item/clothing/accessory/permit/gun/fluff/JesseSoemmer
 	name = "Jesse Soemmer's Sidearm Permit"
-	desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on March 4, 2563."
+	desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on March 4, 2563." // Apparently revoked? -Ace
 */
 
 /* Legacy Permits

maps/southern_cross/structures/closets/misc_vr.dm

@@ -26,6 +26,7 @@
 		/obj/item/stack/marker_beacon/thirty,
 		/obj/item/weapon/material/knife/tacknife/survival,
 		/obj/item/weapon/material/knife/machete/deluxe,
+		/obj/item/weapon/gun/energy/frontier/locked/carbine,
 		/obj/item/clothing/accessory/holster/machete,
 		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2)
 

maps/tether/tether-03-surface3.dmm

@@ -253,7 +253,7 @@
 /area/tether/surfacebase/medical/triage)
 "aE" = (
 /obj/structure/table/rack,
-/obj/random/firstaid,
+/obj/random/tetheraid,
 /obj/random/maintenance/medical,
 /turf/simulated/floor/wood,
 /area/vacant/vacant_site2)
@@ -1787,7 +1787,7 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/random/firstaid,
+/obj/random/tetheraid,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "dB" = (
@@ -2249,11 +2249,11 @@
 /obj/effect/floor_decal/corner/red/border{
 	dir = 4
 	},
-/obj/random/firstaid,
+/obj/random/tetheraid,
 /obj/machinery/vending/wallmed1{
 	pixel_x = 32
 	},
-/obj/random/firstaid,
+/obj/random/tetheraid,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/common)
 "ev" = (
@@ -20740,8 +20740,8 @@
 /turf/simulated/floor/reinforced,
 /area/tether/surfacebase/shuttle_pad)
 "JI" = (
-/turf/simulated/floor/reinforced,
 /obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
 /turf/simulated/shuttle/plating/carry,
 /area/shuttle/tether/surface)
 "JJ" = (

maps/tether/tether-06-station2.dmm

@@ -13945,8 +13945,8 @@
 	dir = 8
 	},
 /obj/structure/table/standard,
-/obj/random/firstaid,
-/obj/random/firstaid,
+/obj/random/tetheraid,
+/obj/random/tetheraid,
 /obj/item/device/radio/intercom{
 	dir = 8;
 	pixel_x = -24

maps/tether/tether-07-station3.dmm

@@ -21667,7 +21667,7 @@
 /obj/random/maintenance/clean,
 /obj/random/maintenance/medical,
 /obj/random/junk,
-/obj/random/firstaid,
+/obj/random/tetheraid,
 /obj/random/medical/lite,
 /obj/random/maintenance/medical,
 /obj/effect/decal/cleanable/dirt,

maps/tether/tether_things.dm

@@ -390,11 +390,11 @@ var/global/list/latejoin_tram   = list()
 
 /obj/structure/closet/secure_closet/guncabinet/excursion
 	name = "expedition weaponry cabinet"
-	req_one_access = list(access_explorer,access_brig)
+	req_one_access = list(access_explorer,access_armory)
 
 /obj/structure/closet/secure_closet/guncabinet/excursion/New()
 	..()
-	for(var/i = 1 to 4)
+	for(var/i = 1 to 3)
 		new /obj/item/weapon/gun/energy/frontier/locked(src)
 	for(var/i = 1 to 4)
 		new /obj/item/weapon/gun/energy/frontier/locked/holdout(src)