Merge remote-tracking branch 'citadel/master' into mobility_flags

code/game/objects/structures/barsigns.dm

@@ -308,28 +308,26 @@
 	icon = "Meow Mix"
 	desc = "No, we don't serve catnip, officer!"
 
+/datum/barsign/the_hive
+	name = "The Hive"
+	icon = "thehive"
+	desc = "Comb in for some sweet drinks! Not known for serving any sappy drink."
+
 /datum/barsign/hiddensigns
 	hidden = TRUE
 
-
 //Hidden signs list below this point
 
-
-
 /datum/barsign/hiddensigns/empbarsign
 	name = "Haywire Barsign"
 	icon = "empbarsign"
 	desc = "Something has gone very wrong."
 
-
-
 /datum/barsign/hiddensigns/syndibarsign
 	name = "Syndi Cat Takeover"
 	icon = "syndibarsign"
 	desc = "Syndicate or die."
 
-
-
 /datum/barsign/hiddensigns/signoff
 	name = "Bar Sign"
 	icon = "empty"

code/game/objects/structures/beds_chairs/chair.dm

@@ -407,7 +407,7 @@
 	buildstackamount = 1
 
 /obj/structure/chair/stool/bar/alien
-	name = "bronze bar stool"
+	name = "alien bar stool"
 	desc = "A hard bar stool made of advanced alien alloy."
 	icon_state = "baralien"
 	icon = 'icons/obj/abductor.dmi'

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

@@ -359,7 +359,7 @@
 								"<span class='italics'>You hear [welder ? "welding" : "rustling of screws and metal"].</span>")
 				deconstruct(TRUE)
 				return
-		if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too
+		if(user.a_intent != INTENT_HARM && user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too
 			return TRUE
 	else if(istype(W, /obj/item/electronics/airlock))
 		handle_lock_addition(user, W)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -265,12 +265,15 @@
 	new /obj/item/clothing/head/helmet/alt(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
 	new /obj/item/clothing/suit/armor/bulletproof(src)
+
 /obj/structure/closet/secure_closet/lethalshots
-	name = "shotgun lethal rounds"
+	name = "lethal ammunition and riot staves"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "tac"
 /obj/structure/closet/secure_closet/lethalshots/PopulateContents()
 	..()
+	new /obj/item/twohanded/electrostaff(src)
+	new /obj/item/twohanded/electrostaff(src)
 	for(var/i in 1 to 3)
 		new /obj/item/storage/box/lethalshot(src)
 

code/game/objects/structures/holosign.dm

@@ -110,10 +110,10 @@
 	CanAtmosPass = ATMOS_PASS_NO
 	resistance_flags = FIRE_PROOF
 
-/obj/structure/holosign/barrier/combolock/blocksTemperature()
+/obj/structure/holosign/barrier/combifan/blocksTemperature()
 	return TRUE
 
-/obj/structure/holosign/barrier/combolock/Initialize()
+/obj/structure/holosign/barrier/combifan/Initialize()
 	. = ..()
 	air_update_turf(TRUE)
 

code/game/objects/structures/kitchen_spike.dm

@@ -64,6 +64,9 @@
 /obj/structure/kitchenspike/attack_hand(mob/user)
 	if(VIABLE_MOB_CHECK(user.pulling) && user.a_intent == INTENT_GRAB && !has_buckled_mobs())
 		var/mob/living/L = user.pulling
+		if(HAS_TRAIT(user, TRAIT_PACIFISM) && L.stat != DEAD)
+			to_chat(user, "<span class='warning'>You don't want to hurt a living creature!</span>")
+			return
 		if(do_mob(user, src, 120))
 			if(has_buckled_mobs()) //to prevent spam/queing up attacks
 				return