Merge branch 'master' into rockruinsnew

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -237,14 +237,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/float_resort/villa)
-"gr" = (
-/obj/structure/table/wood,
-/obj/structure/curtain/cloth,
-/obj/item/nullrod/tribal_knife,
-/turf/open/floor/wood{
-	light_range = 2
-	},
-/area/ruin/beach/float_resort/villa)
 "gQ" = (
 /obj/structure/flora/ausbushes/genericbush,
 /turf/open/floor/plating/grass/beach,
@@ -2502,7 +2494,7 @@ kp
 kp
 kp
 kp
-gr
+ar
 OH
 OH
 OH

_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm

@@ -35,7 +35,6 @@
 /area/ruin/wasteplanet)
 "bL" = (
 /obj/structure/fluff/divine/convertaltar,
-/obj/item/nullrod/tribal_knife,
 /obj/item/clothing/accessory/pandora_hope,
 /turf/open/indestructible/hierophant/two/waste,
 /area/ruin/wasteplanet)

code/__DEFINES/sight.dm

@@ -13,6 +13,8 @@
 #define INVISIBILITY_OBSERVER 60
 #define SEE_INVISIBLE_OBSERVER 60
 
+#define INVISIBILITY_INVINISMIN 80 //invisible admins
+
 #define INVISIBILITY_MAXIMUM 100 //the maximum allowed for "real" objects
 
 #define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there.

code/game/objects/items/devices/radio/headset.dm

@@ -22,6 +22,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	custom_materials = list(/datum/material/iron=75)
 	subspace_transmission = TRUE
 	headset = TRUE
+	listening = TRUE
 	canhear_range = 0 // can't hear headsets from very far away
 
 	slot_flags = ITEM_SLOT_EARS

code/game/objects/items/devices/radio/intercom.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "intercom"
 	anchored = TRUE
+	listening = TRUE
 	w_class = WEIGHT_CLASS_BULKY
 	canhear_range = 2
 	dog_fashion = null

code/game/objects/items/holy_weapons.dm

@@ -671,33 +671,6 @@
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 
-/obj/item/nullrod/tribal_knife
-	icon_state = "crysknife"
-	item_state = "crysknife"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	name = "arrhythmic knife"
-	w_class = WEIGHT_CLASS_HUGE
-	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
-	sharpness = IS_SHARP
-	slot_flags = null
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	item_flags = SLOWS_WHILE_IN_HAND
-
-/obj/item/nullrod/tribal_knife/Initialize(mapload)
-	. = ..()
-	START_PROCESSING(SSobj, src)
-	AddComponent(/datum/component/butchering, 50, 100)
-
-/obj/item/nullrod/tribal_knife/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
-/obj/item/nullrod/tribal_knife/process()
-	slowdown = rand(-2, 2)
-
-
 /obj/item/nullrod/pitchfork
 	icon_state = "pitchfork0"
 	lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'

code/game/objects/structures/crates_lockers/crates/secure.dm

@@ -105,7 +105,7 @@
 	else ..()
 
 /obj/structure/closet/crate/secure/exo
-	desc = "A lock-enabled crate used to carry EXOCON merchandise destined for export to potential buyers."
-	name = "EXOCON storage crate"
+	desc = "A lock-enabled crate used to carry EXOCOM merchandise destined for export to potential buyers."
+	name = "EXOCOM storage crate"
 	icon = 'icons/obj/crates.dmi'
 	icon_state = "exocrate"

code/modules/admin/admin_verbs.dm

@@ -403,11 +403,13 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	set category = "Admin.Game"
 	set desc = "Toggles ghost-like invisibility (Don't abuse this)"
 	if(holder && mob)
-		if(mob.invisibility == INVISIBILITY_OBSERVER)
+		if(mob.invisibility == INVISIBILITY_INVINISMIN)
 			mob.invisibility = initial(mob.invisibility)
+			mob.remove_from_all_data_huds()
 			to_chat(mob, "<span class='boldannounce'>Invisimin off. Invisibility reset.</span>", confidential = TRUE)
 		else
-			mob.invisibility = INVISIBILITY_OBSERVER
+			mob.invisibility = INVISIBILITY_INVINISMIN
+			mob.add_to_all_human_data_huds()
 			to_chat(mob, "<span class='adminnotice'><b>Invisimin on. You are now as invisible as a ghost.</b></span>", confidential = TRUE)
 
 /client/proc/check_antagonists()

code/modules/cargo/packs/ammo.dm

@@ -143,6 +143,12 @@
 	contains = list(/obj/item/ammo_box/amagpellet_claris)
 	cost = 1000
 
+/datum/supply_pack/ammo/a300
+	name = ".300 Magnum Stripper Clip Crate"
+	desc = "Contains a five round .300 Magnum stripper clip for sniper rifles such as the HP Scout."
+	contains = list(/obj/item/ammo_box/a300)
+	cost = 750
+
 /datum/supply_pack/ammo/ebr_ammo
 	name = "M514 EBR .308 Magazine Crate"
 	desc = "Contains a .308 magazine for the M514 EBR rifle, containing ten rounds."
@@ -173,6 +179,12 @@
 	contains = list(/obj/item/ammo_box/a762_40)
 	cost = 500
 
+/datum/supply_pack/ammo/a357_ammo_box
+	name = ".357 Ammo Box Crate"
+	desc = "Contains a fifty-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
+	contains = list(/obj/item/ammo_box/a357_box)
+	cost = 250
+
 /datum/supply_pack/ammo/c556mmHITP_ammo_box
 	name = "5.56 Caseless Ammo Box Crate"
 	desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
@@ -209,6 +221,12 @@
 	contains = list(/obj/item/ammo_box/c9mm/ap)
 	cost = 500
 
+/datum/supply_pack/ammo/a357match_ammo_box
+	name = ".357 Match Ammo Box Crate"
+	desc = "Contains a fifty-round .357 match box for better performance against armor."
+	contains = list(/obj/item/ammo_box/a357_box/match)
+	cost = 500
+
 /datum/supply_pack/ammo/c556mmHITPap_ammo_box
 	name = "5.56 caseless AP Ammo Box Crate"
 	desc = "Contains a fifty-round 5.56mm caseless boxloaded with armor piercing ammo."
@@ -233,6 +251,12 @@
 	contains = list(/obj/item/ammo_box/c9mm/hp)
 	cost = 500
 
+/datum/supply_pack/ammo/a357hp_ammo_box
+	name = ".357 HP Ammo Box Crate"
+	desc = "Contains a fifty-round .357 box loaded with hollow point ammo, great against unarmored targets."
+	contains = list(/obj/item/ammo_box/a357_box/hp)
+	cost = 500
+
 /datum/supply_pack/ammo/c10mmhp_ammo_box
 	name = "10mm HP Ammo Box Crate"
 	desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
@@ -305,6 +329,18 @@
 	contains = list(/obj/item/ammo_box/c8x50mmhp_box)
 	cost = 500
 
+/datum/supply_pack/ammo/a300_box
+	name = ".300 Ammo Box Crate"
+	desc = "Contains a twenty-round .300 Magnum ammo box for sniper rifles such as the HP Scout."
+	contains = list(/obj/item/ammo_box/a300_box)
+	cost = 500
+
+/datum/supply_pack/ammo/a4570_box
+	name = ".45-70 Ammo Box Crate"
+	desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition."
+	contains = list(/obj/item/ammo_box/a4570)
+	cost = 500
+
 /datum/supply_pack/ammo/ferropelletboxcrate
 	name = "Ferromagnetic Pellet Box Crate"
 	desc = "Contains a fifty-round ferromagnetic pellet ammo box for gauss guns such as the Claris."

code/modules/cargo/packs/gun.dm

@@ -7,16 +7,19 @@
 */
 
 /datum/supply_pack/gun/disposable
-	name = "Disposable Guns Crate"
-	desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 400cr. That price is still far too high; this pack contains five."
-	cost = 750
-	contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable)
+	name = "Disposable Gun Crate"
+	desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 200cr. That price is still far too high."
+	cost = 150
+	contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable)
 	crate_name = "disposable gun crate"
 
+/datum/supply_pack/gun/derringer
+	name = ".38 Derringer Crate"
+	desc = "A cheap, concealable pistol manufactured by the reputable Hunter's Pride. At least it's better than a disposable pistol. Chambered in .38 rounds."
+	cost = 350
+	contains = list(/obj/item/gun/ballistic/derringer)
+	crate_name = "derringer crate"
+
 /datum/supply_pack/gun/commanders
 	name = "Commander Pistol Crate"
 	desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
@@ -30,16 +33,22 @@
 	contains = list(/obj/item/gun/ballistic/automatic/pistol,
 					/obj/item/gun/ballistic/automatic/pistol)
 
-/datum/supply_pack/gun/revolver
-	name = "Scarborough Revolver Crate"
-	desc = "Contains a concealable Scarborough revolver, chambered in .357."
+/datum/supply_pack/gun/candors
+	name = "Candor Pistol Crate"
+	desc = "Contains a Candor pistol, the trusty sidearm of any spacer, produced by Hunter's Pride and chambered in .45 ACP."
+	cost = 1000
+	contains = list(/obj/item/gun/ballistic/automatic/pistol/candor)
+
+/datum/supply_pack/gun/pepperbox
+	name = "HP Firebrand Pepperbox Revolver Crate"
+	desc = "Contains a concealable pepperbox revolver manufactured by the Saint Roumain Militia, chambered in .357."
 	cost = 1250
-	contains = list(/obj/item/gun/ballistic/revolver)
+	contains = list(/obj/item/gun/ballistic/revolver/firebrand)
 
 /datum/supply_pack/gun/detrevolver
 	name = "Hunter's Pride Detective Revolver Crate"
-	desc = "Contains a concealable Solarian revolver, chambered in .38."
-	cost = 1000
+	desc = "Contains a concealable revolver favored by police departments around the sector, chambered in .38."
+	cost = 600
 	contains = list(/obj/item/gun/ballistic/revolver/detective)
 
 /datum/supply_pack/gun/shadowrevolver
@@ -101,6 +110,13 @@
 		Shotguns
 */
 
+/datum/supply_pack/gun/doublebarrel_shotgun
+	name = "Double Barrel Shotgun Crate"
+	desc = "For when you need to deal with 2 drunkards the old-fashioned way. Contains a double-barreled shotgun, favored by Bartenders. Warranty voided if sawed off."
+	cost = 1000
+	contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel)
+	crate_name = "shotguns crate"
+
 /datum/supply_pack/gun/hellfire_shotgun
 	name = "Hellfire Shotgun Crate"
 	desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity."
@@ -126,20 +142,34 @@
 	contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow)
 	crate_name = "rifle crate"
 
-/datum/supply_pack/gun/cobra20
-	name = "Cobra-20 SMG Crate"
-	desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
-	cost = 3000
-	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
-	crate_name = "SMG crate"
-
 /datum/supply_pack/gun/illestren
 	name = "Illestren Rifle Crate"
 	desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds."
 	cost = 1250
 	contains = list(/obj/item/gun/ballistic/rifle/illestren)
 	crate_name = "rifle crate"
 
+/datum/supply_pack/gun/beacon
+	name = "Contender Break Action Rifle Crate"
+	desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off."
+	cost = 2250
+	contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel/beacon)
+	crate_name = "rifle crate"
+
+/datum/supply_pack/gun/scout
+	name = "Scout Sniper Rifle Crate"
+	desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
+	cost = 5500
+	contains = list(/obj/item/gun/ballistic/rifle/scout)
+	crate_name = "rifle crate"
+
+/datum/supply_pack/gun/cobra20
+	name = "Cobra-20 SMG Crate"
+	desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
+	cost = 3000
+	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
+	crate_name = "SMG crate"
+
 /datum/supply_pack/gun/wt550
 	name = "WT-550 Auto Rifle Crate"
 	desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."