Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

code/game/objects/items/weapons/RCD.dm

@@ -207,9 +207,9 @@ RCD
 						var/obj/machinery/door/airlock/T = new door_type(A)
 						T.autoclose = 1
 						if(one_access)
-							T.req_one_access = door_accesses
+							T.req_one_access = door_accesses.Copy()
 						else
-							T.req_access = door_accesses
+							T.req_access = door_accesses.Copy()
 						return 1
 					return 0
 				return 0

code/game/objects/items/weapons/dice.dm

@@ -147,6 +147,7 @@
 		triggered = 1
 		visible_message("<span class='notice'>You hear a quiet click.</span>")
 		spawn(40)
+
 			var/cap = 0
 			if(result > MAX_EX_LIGHT_RANGE && result != 20)
 				cap = 1
@@ -156,6 +157,13 @@
 			var/turf/epicenter = get_turf(src)
 			explosion(epicenter, round(result*0.25), round(result*0.5), round(result), round(result*1.5), 1, cap)
 
+			var/turf/bombturf = get_turf(src)
+			var/area/A = get_area(bombturf)
+			bombers += "E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]"
+			message_admins("E20 detonated at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> with a roll of [result]. Triggered by: [key_name_admin(user)]")
+			log_game("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]")
+
+
 /obj/item/weapon/dice/update_icon()
 	overlays.Cut()
 	overlays += "[src.icon_state][src.result]"

code/game/objects/structures/crates_lockers/crittercrate.dm

@@ -25,21 +25,12 @@
 		for(var/i = 1, i <= amount, i++)
 			new content_mob(loc)
 		already_opened = 1
-	..()
+	. = ..()
 
 /obj/structure/closet/critter/close()
 	..()
 	return 1
 
-/obj/structure/closet/critter/attack_hand(mob/user as mob)
-	src.add_fingerprint(user)
-
-	if(src.loc == user.loc)
-		to_chat(user, "<span class='notice'>It won't budge!</span>")
-		toggle()
-	else
-		toggle()
-
 /obj/structure/closet/critter/corgi
 	name = "corgi crate"
 	content_mob = /mob/living/simple_animal/pet/corgi