New Sandplanet Ruin: Cave Base

code/datums/ruins/whitesands.dm

@@ -16,6 +16,12 @@
 	description = "A failed attempt of the Nanotrasen nutrional replacement program"
 	suffix = "whitesands_surface_pubbyslopcrash.dmm"
 
+/datum/map_template/ruin/whitesands/cave_base
+	name = "Abandoned Cave Base"
+	id = "cave_base"
+	description = "The former home of a poor sod on observation duty. Now a cunning trap."
+	suffix = "whitesands_cave_base.dmm"
+
 //////////OUTSIDE SETTLEMENTS/RUINS//////////
 /datum/map_template/ruin/whitesands/survivors/saloon
 	name = "Hermit Saloon"

code/datums/wires/_wires.dm

@@ -173,6 +173,15 @@
 		S.connected = src
 		return S
 
+/datum/wires/proc/attach_assembly_init(obj/item/assembly/S)
+	var/obj/item/assembly/I = new S(holder.loc)
+	for(var/color in colors)
+		if(I && istype(I) && I.attachable && !is_attached(color))
+			assemblies[color] = I
+			I.forceMove(holder)
+			I.connected = src
+			return I
+
 /datum/wires/proc/detach_assembly(color)
 	var/obj/item/assembly/S = get_attached(color)
 	if(S && istype(S))

code/game/area/areas/ruins/sandplanet.dm

@@ -2,10 +2,12 @@
 
 //whitesands surface camp saloon
 
+//saloon ruin
 /area/ruin/whitesands/saloon
 	name = "Hermit Saloon"
 	icon_state = "green"
 
+//the pubby slop crash
 /area/ruin/whitesands/pubbycrash
 	name = "Pubby-Class Wreckage"
 	icon_state = "bluenew"
@@ -17,3 +19,8 @@
 /area/ruin/whitesands/pubbycrash/split
 	name = "Pubby-Class Chunk"
 	icon_state = "red"
+
+//cave base
+/area/ruin/whitesands/cave_base
+	name = "Abandoned Facility"
+	icon_state = "bluenew"

code/game/machinery/telecomms/machines/message_server.dm

@@ -16,10 +16,13 @@
 	active_power_usage = ACTIVE_DRAW_MINIMAL
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
 	var/obj/item/stored
+	var/empty = FALSE
 
 /obj/machinery/blackbox_recorder/Initialize()
 	. = ..()
-	stored = new /obj/item/blackbox(src)
+	if(!empty)
+		stored = new /obj/item/blackbox(src)
+	update_appearance()
 
 /obj/machinery/blackbox_recorder/attack_hand(mob/living/user)
 	. = ..()

code/game/objects/items/grenades/plastic.dm

@@ -125,3 +125,16 @@
 	item_state = "plasticx4"
 	directional = TRUE
 	boom_sizes = list(0, 2, 5)
+
+
+// x-com ufo defense high ex charge 1993
+/obj/item/grenade/c4/satchel_charge
+	name = "Satchel Charge"
+	desc = "Used to put craters into places without too much hassle. An engineer's favorite."
+	w_class = WEIGHT_CLASS_NORMAL
+	icon_state = "satchel_charge0"
+	item_state = "satchel_charge"
+	throw_range = 3
+	lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
+	boom_sizes = list(1, 2, 5)

code/game/turfs/open/floor/plating/whitesands.dm

@@ -80,3 +80,15 @@
 /turf/open/floor/plating/asteroid/whitesands/grass/dead/lit
 	light_power = 1
 	light_range = 2
+
+/turf/open/floor/concrete/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_color = COLOR_VERY_LIGHT_GRAY
+
+/turf/open/floor/concrete/slab_1/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_color = COLOR_VERY_LIGHT_GRAY
+
+/turf/open/floor/plating/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_color = COLOR_VERY_LIGHT_GRAY

code/modules/assembly/voice.dm

@@ -103,6 +103,10 @@
 	. = ..()
 	listening = FALSE
 
+/obj/item/assembly/voice/preset
+	mode = 1
+	recorded = "jorkin it"
+
 #undef INCLUSIVE_MODE
 #undef EXCLUSIVE_MODE
 #undef RECOGNIZER_MODE

code/modules/projectiles/ammunition/_ammunition.dm

@@ -38,6 +38,7 @@
 
 	var/list/bounce_sfx_override // if true, overrides the bouncing sfx from the turf to this one
 
+	///how many will spawn in a generic ammo box containing this ammo
 	var/bullet_per_box
 
 

code/modules/projectiles/ammunition/ballistic/sniper.dm

@@ -20,3 +20,24 @@
 	desc = "A .50 BMG penetrator bullet casing."
 	bullet_skin = "ap"
 	projectile_type = /obj/projectile/bullet/p50/penetrator
+
+//14.5mm Crunch Gun
+/obj/item/ammo_casing/p145
+	name = "14.5mm Ball casing"
+	desc = "A 14.5mm bullet casing."
+	icon_state = "big-steel"
+	caliber = "14.5mm Heavy"
+	projectile_type = /obj/projectile/bullet/p145
+	bullet_per_box = 9
+
+/obj/item/ammo_casing/p145/ds
+	name = "14.5mm Discarding Sabot casing"
+	desc = "A 14.5mm Discarding Sabot bullet casing"
+	bullet_skin = "ap"
+	projectile_type = /obj/projectile/bullet/p145/ds
+
+/obj/item/ammo_casing/p145/he
+	name = "14.5mm High Explosive casing"
+	desc = "A 14.5mm High Explosive bullet casing. It seems fairly illegal, if not inherently unethical."
+	bullet_skin = "he"
+	projectile_type = /obj/projectile/bullet/p145/he

code/modules/projectiles/boxes_magazines/external/sniper.dm

@@ -20,3 +20,26 @@
 	desc = "A large, heavy 5-round box magazine designed for the sniper rifle. These penetrator rounds deal incredible damage and will penetrate most structures, though they don't knock down or delimb targets."
 	ammo_type = /obj/item/ammo_casing/p50/penetrator
 	max_ammo = 5
+
+//you have no idea how tempted i was to call this crunch berries
+/obj/item/ammo_box/magazine/crunch_shot
+	name = "anti-armor rifle magazine (14.5mm Heavy)"
+	desc = "A large, heavy box magazine designed for an anti-armor rifle. The 14.5mm rounds have a reputation as exceptionally lethal. If incredibly inconvienent."
+	icon_state = "50bmgsniper_mag-0"
+	base_icon_state = "50bmgsniper_mag"
+	ammo_type = /obj/item/ammo_casing/p145
+	max_ammo = 3
+	caliber = "14.5mm Heavy"
+	w_class = WEIGHT_CLASS_NORMAL
+	multiple_sprites = AMMO_BOX_ONE_SPRITE
+
+/obj/item/ammo_box/magazine/crunch_shot/ds
+	name = "anti-armor rifle magazine (14.5mm Discarding Sabot)"
+	desc = "A massive box magazine designed for an anti-armor rifle. There is no armor 14.5mm Discarding Sabot cannot beat."
+	ammo_type = /obj/item/ammo_casing/p145/ds
+
+//if im stealing the idea im stealing all of it.
+/obj/item/ammo_box/magazine/crunch_shot/he
+	name = "anti-armor rifle magazine (14.5mm High Explosive)"
+	desc = "A massive box magazine designed for an anti-armor rifle. You're fairly sure that this variety of ammo was outlawed by most governments."
+	ammo_type = /obj/item/ammo_casing/p145/he

code/modules/projectiles/gun.dm

@@ -854,8 +854,26 @@
 		actual_angle -= 360
 	if(total_recoil > 0)
 		recoil_camera(user, total_recoil + 1, (total_recoil * recoil_backtime_multiplier)+1, total_recoil, actual_angle)
+		var/consequences_of_our_actions = (HAS_TRAIT(user, TRAIT_EASYLIMBDISABLE)? 2 : 4)
+		var/recoil_offset = (total_recoil - consequences_of_our_actions) * 5
+		if(total_recoil >= consequences_of_our_actions && prob(40 + (recoil_offset * 5)))
+			var/mob/living/carbon/jackass = user
+			if(prob(recoil_offset * 10))
+				var/obj/item/bodypart/consequences = jackass.get_active_hand()
+				consequences.break_bone()
+			jackass.apply_damage(recoil_offset * 5, BRUTE, jackass.get_active_hand())
+			jackass.visible_message(span_danger("The recoil of [src] forces it out of [user.name]'s hands and onto the ground!"), span_boldwarning("The recoil of [src] sends it flying out of your hands!"))
+			jackass.dropItemToGround(jackass.get_active_held_item())
+			log_attack("[user] experienced a high level of recoil while trying to fire [src]")
+			toss_gun_at(user, recoil_offset)
 		return TRUE
 
+/obj/item/gun/proc/toss_gun_at(mob/living/user, intensity)
+	throw_at(get_edge_target_turf(user, rand(dir)), intensity, intensity*2)
+	pixel_x = rand(-4, 4)
+	pixel_y = rand(-4, 4)
+	SpinAnimation(5, 1)
+
 /obj/item/gun/proc/handle_muzzle_flash(mob/living/user, firing_angle)
 	var/atom/movable/flash_loc = user
 	var/prev_light = light_range

code/modules/projectiles/guns/ballistic/rifle.dm

@@ -193,3 +193,46 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/polymer
 	can_be_sawn_off = FALSE
 	manufacturer = MANUFACTURER_NONE
+
+
+/obj/item/gun/ballistic/rifle/crunch_gun
+	name = "\improper anti-armor rifle"
+	desc = "A massive rifle chambered in 14.5mm Heavy, affectionately known as a 'crunch gun' by the few people crazy enough to use it. It seems to be missing a bipod." //blowing a fist sized hole through the inteq enforcer
+
+	icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+	lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+	righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+	mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+	icon_state = "taipan"
+	item_state = "taipan"
+	fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
+	fire_sound_volume = 120
+	load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg'
+	rack_sound = 'sound/weapons/gun/sniper/rack.ogg'
+	suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
+
+	zoomable = TRUE
+	zoom_amt = 16 //Fairly long range.
+	zoom_out_amt = 0
+
+	actions_types = list()
+	show_magazine_on_sprite = TRUE
+
+	casing_ejector = FALSE
+	internal_magazine = FALSE
+	semi_auto = FALSE
+	tac_reloads = FALSE
+	valid_attachments = list()
+
+	weapon_weight = WEAPON_VERY_HEAVY
+	mag_type = /obj/item/ammo_box/magazine/crunch_shot
+	w_class = WEIGHT_CLASS_HUGE
+	manufacturer = MANUFACTURER_BRAZIL
+
+	spread = -5
+	spread_unwielded = 60
+	recoil = 6
+	recoil_unwielded = 25 //not that you should be able to fire it unwielded regardless
+
+	wield_delay = 3 SECONDS
+	wield_slowdown = 2

code/modules/projectiles/projectile.dm

@@ -141,6 +141,7 @@
 	var/decayedRange			//stores original range
 	var/reflect_range_decrease = 5			//amount of original range that falls off when reflecting, so it doesn't go forever
 	var/reflectable = NONE // Can it be reflected or not?
+
 		//Effects
 	var/stun = 0
 	var/knockdown = 0

code/modules/projectiles/projectile/bullets/sniper.dm

@@ -7,12 +7,13 @@
 	knockdown = 100
 	dismemberment = 50
 	armour_penetration = 60
+	var/obj_damage_mod = 1.1
 	var/breakthings = TRUE
 
 /obj/projectile/bullet/p50/on_hit(atom/target, blocked = 0)
 	if(isobj(target) && (blocked != 100) && breakthings)
 		var/obj/O = target
-		O.take_damage(80, BRUTE, "bullet", FALSE)
+		O.take_damage((damage * obj_damage_mod), BRUTE, "bullet", FALSE)
 	return ..()
 
 /obj/projectile/bullet/p50/soporific
@@ -43,3 +44,37 @@
 	icon_state = "gaussstrong"
 	damage = 25
 	range = 16
+
+//crung gun
+/obj/projectile/bullet/p145
+	name = "14.5mm Ball shot"
+	speed = 0.3
+	damage = 75
+	knockdown = 100
+	dismemberment = 25
+	armour_penetration = 30
+	var/obj_damage_mod = 1.5
+	var/breakthings = TRUE
+
+/obj/projectile/bullet/p145/on_hit(atom/target, blocked = 0)
+	if(isobj(target) && (blocked != 100) && breakthings)
+		var/obj/O = target
+		O.take_damage((damage * obj_damage_mod), BRUTE, "bullet", FALSE)
+	return ..()
+
+/obj/projectile/bullet/p145/ds
+	name = "14.5mm Discarding Sabot shot"
+	speed = 0.2
+	damage = 85
+	armour_penetration = 70
+	dismemberment = 5
+	obj_damage_mod = 3
+
+/obj/projectile/bullet/p145/he
+	name = "14.5mm High Explosive shot"
+	damage = 30 // most of the damage should be in the explosion
+	dismemberment = 5
+
+/obj/projectile/bullet/p145/he/on_hit(atom/target, blocked = 0)
+	explosion(target, 0, 1, 1, 1, flame_range = 2)
+	return ..()