Merge branch 'master' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

code/modules/projectiles/ammunition/magazines.dm

@@ -50,6 +50,7 @@
 
 /obj/item/ammo_magazine/s38/rubber
 	name = "speedloader (.38 rubber)"
+	icon_state = "T38"
 	ammo_type = /obj/item/ammo_casing/a38r
 
 /obj/item/ammo_magazine/s38/emp
@@ -493,6 +494,23 @@
 	max_ammo = 9
 	multiple_sprites = 1
 
+/obj/item/ammo_magazine/s44
+	name = "speedloader (.44)"
+	icon_state = "44"
+	ammo_type = /obj/item/ammo_casing/a44
+	matter = list(DEFAULT_WALL_MATERIAL = 1260) //metal costs are very roughly based around 1 .45 casing = 75 metal
+	caliber = ".44"
+	max_ammo = 6
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/s44/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/s44/rubber
+	name = "speedloader (.44 rubber)"
+	icon_state = "R44"
+	ammo_type = /obj/item/ammo_casing/a44r
+
 ///////// 7.62mm /////////
 
 /obj/item/ammo_magazine/m762

code/modules/projectiles/ammunition/rounds.dm

@@ -59,6 +59,12 @@
 	caliber = ".44"
 	projectile_type = /obj/item/projectile/bullet/pistol/strong
 
+/obj/item/ammo_casing/a44r
+	icon_state = "r-casing"
+	desc = "A .44 rubber bullet casing."
+	caliber = ".44"
+	projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong
+
 /*
  * .75 (aka Gyrojet Rockets, aka admin abuse)
  */

code/modules/projectiles/effects.dm

@@ -1,7 +1,7 @@
 /obj/effect/projectile
 	icon = 'icons/effects/projectiles.dmi'
 	icon_state = "bolt"
-	layer = 20
+	plane = ABOVE_PLANE
 
 /obj/effect/projectile/New(var/turf/location)
 	if(istype(location))
@@ -267,4 +267,25 @@
 	icon_state = "impact_darkb"
 	light_range = 2
 	light_power = 0.5
-	light_color = "#8837A3"
+	light_color = "#8837A3"
+
+//----------------------------
+// Inversion / Cult
+//----------------------------
+/obj/effect/projectile/inversion/tracer
+	icon_state = "invert"
+	light_range = 2
+	light_power = -2
+	light_color = "#FFFFFF"
+
+/obj/effect/projectile/inversion/muzzle
+	icon_state = "muzzle_invert"
+	light_range = 2
+	light_power = -2
+	light_color = "#FFFFFF"
+
+/obj/effect/projectile/inversion/impact
+	icon_state = "impact_invert"
+	light_range = 2
+	light_power = -2
+	light_color = "#FFFFFF"

code/modules/projectiles/gun.dm

@@ -58,6 +58,7 @@
 	var/move_delay = 1
 	var/fire_sound = 'sound/weapons/Gunshot.ogg'
 	var/fire_sound_text = "gunshot"
+	var/fire_anim = null
 	var/recoil = 0		//screen shake
 	var/silenced = 0
 	var/muzzle_flash = 3
@@ -171,6 +172,10 @@
 		return 0
 	if(!user.IsAdvancedToolUser())
 		return 0
+	if(isanimal(user))
+		var/mob/living/simple_animal/S = user
+		if(!S.IsHumanoidToolUser(src))
+			return 0
 
 	var/mob/living/M = user
 	if(dna_lock && attached_lock.stored_dna)
@@ -492,7 +497,7 @@
 		if(!(target && target.loc))
 			target = targloc
 			//pointblank = 0
-	
+
 	var/target_for_log
 	if(ismob(target))
 		target_for_log = target
@@ -533,6 +538,9 @@
 
 //called after successfully firing
 /obj/item/weapon/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0)
+	if(fire_anim)
+		flick(fire_anim, src)
+
 	if(silenced)
 		if(reflex)
 			user.visible_message(

code/modules/projectiles/guns/energy/nuclear_vr.dm

@@ -0,0 +1,14 @@
+/*
+//	Virgo's very own file for overriding Polaris' eguns! Should include: Regular egun, Advanced egun, burst egun, mounted egun
+//
+//	NOTICE: All the eguns are child objects of the base thing. If you modify the base egun, all the other eguns will inherit it unless they explicitly override it.
+*/
+
+/obj/item/weapon/gun/energy/gun
+	icon = 'icons/obj/eguns_vr.dmi'	//makes the egun look for icons here instead. ALL of the eguns.
+
+/obj/item/weapon/gun/energy/gun/burst
+	icon = 'icons/obj/gun.dmi'	//Points it back at the default file so eguns_vr.dmi doesn't need to mirror all the sprites
+
+/obj/item/weapon/gun/energy/gun/nuclear
+	icon = 'icons/obj/gun.dmi'	//Points it back at the default file so eguns_vr.dmi doesn't need to mirror all the sprites

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

@@ -118,7 +118,6 @@ obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()
 		return 1
 
 
-
 // Blade Runner pistol.
 /obj/item/weapon/gun/projectile/revolver/deckard
 	name = "\improper Deckard .38"
@@ -259,3 +258,24 @@ obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()
 		to_chat(user, "\The [src] has a secondary barrel loaded with \a [to_print]")
 	else
 		to_chat(user, "\The [src] has a secondary barrel that is empty.")
+
+
+//Ported from Bay
+/obj/item/weapon/gun/projectile/revolver/webley
+	name = "service revolver"
+	desc = "A rugged top break revolver based on the Webley Mk. VI model, with modern improvements. Uses .44 magnum rounds."
+	icon_state = "webley2"
+	item_state = "webley2"
+	caliber = ".44"
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
+	handle_casings = CYCLE_CASINGS
+	max_shells = 6
+	ammo_type = /obj/item/ammo_casing/a44
+
+/obj/item/weapon/gun/projectile/revolver/webley/auto
+	name = "autorevolver"
+	icon_state = "mosley"
+	desc = "A shiny Mosley Autococker automatic revolver, with black accents. Marketed as the 'Revolver for the Modern Era'. Uses .44 magnum rounds."
+	fire_delay = 5.7 //Autorevolver. Also synced with the animation
+	fire_anim = "mosley_fire"
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)

code/modules/projectiles/projectile.dm

@@ -49,6 +49,7 @@
 		//Effects
 	var/incendiary = 0 //1 for ignite on hit, 2 for trail of fire. 3 maybe later for burst of fire around the impact point. - Mech
 	var/flammability = 0 //Amount of fire stacks to add for the above.
+	var/combustion = TRUE	//Does this set off flammable objects on fire/hit?
 	var/stun = 0
 	var/weaken = 0
 	var/paralyze = 0
@@ -90,6 +91,10 @@
 //called when the projectile stops flying because it collided with something
 /obj/item/projectile/proc/on_impact(var/atom/A)
 	impact_effect(effect_transform)		// generate impact effect
+	if(damage && damage_type == BURN)
+		var/turf/T = get_turf(A)
+		if(T)
+			T.hotspot_expose(700, 5)
 	return
 
 //Checks if the projectile is eligible for embedding. Not that it necessarily will.
@@ -132,6 +137,9 @@
 	if (!istype(targloc) || !istype(curloc))
 		return 1
 
+	if(combustion)
+		curloc.hotspot_expose(700, 5)
+
 	if(targloc == curloc) //Shooting something in the same turf
 		target.bullet_act(src, target_zone)
 		on_impact(target)

code/modules/projectiles/projectile/animate.dm

@@ -8,6 +8,7 @@
 	light_range = 2
 	light_power = 0.5
 	light_color = "#55AAFF"
+	combustion = FALSE
 
 /obj/item/projectile/animate/Bump(var/atom/change)
 	if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, protected_objects))

code/modules/projectiles/projectile/beams.dm

@@ -122,6 +122,8 @@
 	check_armour = "laser"
 	light_color = "#0066FF"
 
+	combustion = FALSE
+
 	muzzle_type = /obj/effect/projectile/laser_blue/muzzle
 	tracer_type = /obj/effect/projectile/laser_blue/tracer
 	impact_type = /obj/effect/projectile/laser_blue/impact
@@ -142,6 +144,8 @@
 	check_armour = "laser"
 	light_color = "#FF0D00"
 
+	combustion = FALSE
+
 /obj/item/projectile/beam/lastertag/red/on_hit(var/atom/target, var/blocked = 0)
 	if(istype(target, /mob/living/carbon/human))
 		var/mob/living/carbon/human/M = target
@@ -157,6 +161,8 @@
 	check_armour = "laser"
 	light_color = "#00C6FF"
 
+	combustion = FALSE
+
 	muzzle_type = /obj/effect/projectile/laser_omni/muzzle
 	tracer_type = /obj/effect/projectile/laser_omni/tracer
 	impact_type = /obj/effect/projectile/laser_omni/impact
@@ -190,6 +196,8 @@
 	damage_type = HALLOSS
 	light_color = "#FFFFFF"
 
+	combustion = FALSE
+
 	muzzle_type = /obj/effect/projectile/stun/muzzle
 	tracer_type = /obj/effect/projectile/stun/tracer
 	impact_type = /obj/effect/projectile/stun/impact

code/modules/projectiles/projectile/bullets.dm

@@ -147,6 +147,14 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
 	damage = 60
 
+/obj/item/projectile/bullet/pistol/rubber/strong //"rubber" bullets for revolvers and matebas
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
+	damage = 10
+	agony = 60
+	embed_chance = 0
+	sharp = 0
+	check_armour = "melee"
+
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
 	name = "rubber bullet"
 	damage = 5
@@ -191,6 +199,8 @@
 	sharp = 0
 	check_armour = "melee"
 
+	combustion = FALSE
+
 /obj/item/projectile/bullet/shotgun/ion/on_hit(var/atom/target, var/blocked = 0)
 	..()
 	empulse(target, 0, 0, 0, 0)	//Only affects what it hits
@@ -325,6 +335,8 @@
 	embed_chance = 0
 	sharp = 0
 
+	combustion = FALSE
+
 /obj/item/projectile/bullet/pistol/cap/process()
 	loc = null
 	qdel(src)

code/modules/projectiles/projectile/change.dm

@@ -6,6 +6,8 @@
 	nodamage = 1
 	check_armour = "energy"
 
+	combustion = FALSE
+
 /obj/item/projectile/change/on_hit(var/atom/change)
 	wabbajack(change)
 

code/modules/projectiles/projectile/energy.dm

@@ -92,6 +92,7 @@
 	light_power = 0.5
 	light_color = "#33CC00"
 
+	combustion = FALSE
 
 /obj/item/projectile/energy/dart
 	name = "dart"
@@ -101,6 +102,7 @@
 	agony = 120
 	check_armour = "energy"
 
+	combustion = FALSE
 
 /obj/item/projectile/energy/bolt
 	name = "bolt"
@@ -122,6 +124,8 @@
 	agony = 10
 	check_armour = "bio"
 
+	combustion = FALSE
+
 /obj/item/projectile/energy/neurotoxin
 	name = "neurotoxic spit"
 	icon_state = "neurotoxin"
@@ -130,6 +134,8 @@
 	agony = 80
 	check_armour = "bio"
 
+	combustion = FALSE
+
 /obj/item/projectile/energy/neurotoxin/toxic //New alien mob projectile to match the player-variant's projectiles.
 	name = "neurotoxic spit"
 	icon_state = "neurotoxin"
@@ -149,6 +155,8 @@
 	light_power = 0.5
 	light_color = "#33CC00"
 
+	combustion = FALSE
+
 /obj/item/projectile/energy/plasmastun
 	name = "plasma pulse"
 	icon_state = "plasma_stun"

code/modules/projectiles/projectile/force.dm

@@ -5,6 +5,8 @@
 	damage = 20
 	check_armour = "energy"
 
+	combustion = FALSE
+
 /obj/item/projectile/forcebolt/strong
 	name = "force bolt"
 

code/modules/projectiles/projectile/special.dm

@@ -9,6 +9,9 @@
 	light_range = 2
 	light_power = 0.5
 	light_color = "#55AAFF"
+
+	combustion = FALSE
+
 	var/sev1_range = 0
 	var/sev2_range = 1
 	var/sev3_range = 1
@@ -56,6 +59,8 @@
 	light_power = 0.5
 	light_color = "#55AAFF"
 
+	combustion = FALSE
+
 /obj/item/projectile/temp/on_hit(atom/target, blocked = FALSE)
 	..()
 	if(isliving(target))
@@ -85,6 +90,8 @@
 	name = "heat beam"
 	target_temperature = 1000
 
+	combustion = TRUE
+
 /obj/item/projectile/meteor
 	name = "meteor"
 	icon = 'icons/obj/meteor.dmi'
@@ -127,6 +134,8 @@
 	light_power = 0.5
 	light_color = "#33CC00"
 
+	combustion = FALSE
+
 /obj/item/projectile/energy/floramut/on_hit(var/atom/target, var/blocked = 0)
 	var/mob/living/M = target
 	if(ishuman(target))
@@ -196,6 +205,8 @@
 /obj/item/projectile/beam/mindflayer
 	name = "flayer ray"
 
+	combustion = FALSE
+
 /obj/item/projectile/beam/mindflayer/on_hit(var/atom/target, var/blocked = 0)
 	if(ishuman(target))
 		var/mob/living/carbon/human/M = target
@@ -218,6 +229,8 @@
 	damage_type = HALLOSS
 	muzzle_type = null
 
+	combustion = FALSE
+
 /obj/item/projectile/bola/on_hit(var/atom/target, var/blocked = 0)
 	if(ishuman(target))
 		var/mob/living/carbon/human/M = target
@@ -235,6 +248,8 @@
 	damage_type = BRUTE
 	muzzle_type = null
 
+	combustion = FALSE
+
 /obj/item/projectile/webball/on_hit(var/atom/target, var/blocked = 0)
 	if(isturf(target.loc))
 		var/obj/effect/spider/stickyweb/W = locate() in get_turf(target)