Merge pull request #4313 from Novacat/nova-pathfinder

Expedition Balance Tweaks

code/modules/mob/living/simple_animal/animals/giant_spider_vr.dm

@@ -0,0 +1,23 @@
+// Slightly placeholder, mostly to replace ion hivebots on V4
+/mob/living/simple_animal/hostile/giant_spider/ion
+	desc = "Furry and green, it makes you shudder to look at it. This one has brilliant green eyes and a hint of static discharge."
+	tt_desc = "X Brachypelma phorus ionus"
+	icon_state = "webslinger"
+	icon_living = "webslinger"
+	icon_dead = "webslinger_dead"
+
+	maxHealth = 90
+	health = 90
+
+	melee_damage_lower = 8
+	melee_damage_upper = 15
+
+	ranged = 1
+	projectilesound = 'sound/weapons/taser2.ogg'
+	projectiletype = /obj/item/projectile/ion/small
+	firing_lines = 1
+	cooperative = 1
+
+	poison_chance = 15
+	poison_per_bite = 2
+	poison_type = "psilocybin"

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -743,10 +743,6 @@
 	var/recharging = 0
 
 	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="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60),
-		)
 
 /obj/item/weapon/gun/energy/frontier/unload_ammo(var/mob/user)
 	if(recharging)
@@ -778,6 +774,13 @@
 /obj/item/weapon/gun/energy/frontier/ex_act() //|rugged|
 	return
 
+//Needed to fix a bug with the holdout phaser
+/obj/item/weapon/gun/energy/frontier/basic
+	firemodes = list(
+		list(mode_name="normal", 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),
+	)
+
 /obj/item/weapon/gun/energy/frontier/locked
 	desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. 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."
 	req_access = list(access_armory) //for toggling safety
@@ -808,6 +811,13 @@
 			return 0
 	return ..()
 
+//Needed to fix a bug with the holdout phaser
+/obj/item/weapon/gun/energy/frontier/locked/basic
+	firemodes = list(
+		list(mode_name="normal", 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),
+	)
+
 //Expeditionary Holdout Phaser
 /obj/item/weapon/gun/energy/frontier/locked/holdout
 	name = "holdout frontier phaser"