Merge branch 'dev' into SaferoomSafety

baystation12.dme

@@ -1474,7 +1474,6 @@
 #include "code\modules\awaymissions\trigger.dm"
 #include "code\modules\awaymissions\zlevel.dm"
 #include "code\modules\blob\blob.dm"
-#include "code\modules\boh\admin\items.dm"
 #include "code\modules\boh\admin\panicbunker.dm"
 #include "code\modules\boh\antiboarding\tur_id.dm"
 #include "code\modules\boh\ascent2\chemicals.dm"

code/modules/boh_misc/boxes.dm

@@ -151,7 +151,7 @@
 /obj/item/gunbox/corpo
 	desc = "A secure box containing a sidearm."
 
-/obj/item/gunbox/pol/attack_self(mob/living/user)
+/obj/item/gunbox/corpo/attack_self(mob/living/user)
 	var/list/options = list()
 	options["Ballistic - ZH Ghoul"] = list(/obj/item/weapon/gun/projectile/dartgun/pol,/obj/item/clothing/accessory/storage/holster/thigh)
 	options["Ballistic - Lumoco Mk12"] = list(/obj/item/weapon/gun/projectile/revolver/medium/sec,/obj/item/clothing/accessory/storage/holster/thigh)

code/modules/projectiles/guns/magnetic/magnetic_railgun.dm

@@ -184,7 +184,7 @@
 	initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor/adv
 	load_type = /obj/item/weapon/magnetic_ammo/skrell
 	loaded = /obj/item/weapon/magnetic_ammo/skrell/slug
-	projectile_type = /obj/item/projectile/bullet/magnetic/slug
+	projectile_type = /obj/item/projectile/bullet/magnetic/slug/skrell
 	slot_flags = SLOT_BACK
 	power_cost = 100
 	wielded_item_state = "skrell_rifle-wielded"

code/modules/projectiles/projectile/magnetic.dm

@@ -17,6 +17,9 @@
 	damage = 50
 	armor_penetration = 75
 
+/obj/item/projectile/bullet/magnetic/slug/skrell
+	stun = 0
+
 /obj/item/projectile/bullet/magnetic/flechette
 	name = "flechette"
 	icon_state = "flechette"

code/modules/species/station/plasmasans.dm

@@ -227,8 +227,7 @@
 					"<span class='warning'>Your body reacts with the atmosphere and starts to sizzle and burn!</span>"
 				)
 				H.IgniteMob()
-			H.burn_skin(H.get_pressure_weakness())
 			H.updatehealth()
 
 /datum/hud_data/phorosian
-	has_nutrition = 0
+	has_nutrition = 0

code/modules/virus2/disease2.dm

@@ -76,8 +76,8 @@ LEGACY_RECORD_STRUCTURE(virus_records, virus_record)
 	if(mob.radiation > 50)
 		if((mob.species.name == SPECIES_DIONA) && prob(mob.radiation/25))
 			cure(mob)
-		else if(prob(1))
-			majormutate()
+/*		else if(prob(1))
+			majormutate()*/
 
 	if(prob(mob.virus_immunity()) && prob(stage)) // Increasing chance of curing as the virus progresses
 		cure(mob,1)

maps/torch/items/items.dm

@@ -143,4 +143,46 @@ Weapons
 	initial_ammo = 1
 
 /obj/effect/paint/expeditionary
-	color = "#68099e"
+	color = "#68099e"
+
+//batong
+/obj/item/weapon/melee/darkrp_baton
+	name = "magical stunbaton"
+	desc = "Citizens aren't supposed to have guns."
+	icon_state = "stunbaton"
+	item_state = "baton"
+	color = COLOR_RED
+	slot_flags = SLOT_BELT
+	force = 1
+	sharp = 0
+	edge = 0
+	throwforce = 7
+	w_class = ITEM_SIZE_NORMAL
+	origin_tech = list(TECH_COMBAT = 2)
+	attack_verb = list("arrested")
+	base_parry_chance = 100
+
+
+/obj/item/weapon/melee/darkrp_baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+
+	if(target == user)
+		return FALSE
+
+	if(!istype(target)) //Not sure if needed? Just in case.
+		return ..()
+
+	var/list/valid_areas = list()
+	var/list/possible_areas = get_area_turfs(/area/security/processing)
+	for(var/turf/simulated/floor/F in possible_areas)
+		if(!F.is_floor())
+			continue
+		valid_areas += F
+
+	if(length(valid_areas))
+		do_teleport(target,pick(valid_areas))
+		playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+		msg_admin_attack("[key_name(user)] arrested [key_name(target)] with the [src].")
+		to_world("<span><font face='Arial Black, Arial, sans-serif'>\The [target.name] has been arrested for 120 seconds!</font></span>")
+		return TRUE
+
+	return FALSE

maps/torch/structures/closets/misc.dm

@@ -202,6 +202,16 @@ obj/structure/closet/secure_closet/solguard
 			/obj/item/weapon/gun/projectile/pistol/military/alt/solar/cabinet = 3,
 	)
 
+/obj/structure/closet/secure_closet/guncabinet/sidearm/bridge
+	name = "personal sidearm cabinet"
+
+/obj/structure/closet/secure_closet/guncabinet/sidearm/bridge/WillContain()
+	return list(
+			/obj/item/clothing/accessory/storage/holster/thigh = 3,
+			/obj/item/weapon/storage/box/ammo/solar/full = 1,
+			/obj/item/weapon/gun/energy/gun/small/secure/sec = 3,
+	)
+
 /obj/structure/closet/secure_closet/guncabinet/sidearm/combined
 	name = "combined sidearm cabinet"
 

maps/torch/torch6_bridge.dmm

@@ -1813,8 +1813,8 @@
 	},
 /obj/structure/cable/green,
 /obj/machinery/computer/ship/missiles{
-	icon_state = "computer";
-	dir = 1
+	dir = 1;
+	icon_state = "computer"
 	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/bridge)
@@ -13081,12 +13081,12 @@
 	icon_state = "nosmoking";
 	pixel_x = -37
 	},
-/obj/structure/closet/secure_closet/guncabinet/sidearm/small,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/closet/secure_closet/guncabinet/sidearm/bridge,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/bridge/storage)
 "vC" = (