Merge pull request #6 from WorldOfDarknessXIII/master

Merge1

code/__HELPERS/game.dm

@@ -416,7 +416,8 @@
 		return candidates
 
 	for(var/mob/dead/observer/G in GLOB.player_list)
-		candidates += G
+		if(!G.auspex_ghosted) //No Auspex ghosts as candidates.
+			candidates += G
 
 	return pollCandidates(Question, jobbanType, gametypeCheck, be_special_flag, poll_time, ignore_category, flashwindow, candidates)
 

code/datums/components/crafting/crafting.dm

@@ -348,9 +348,9 @@
 	return GLOB.not_incapacitated_turf_state
 
 //For the UI related things we're going to assume the user is a mob rather than typesetting it to an atom as the UI isn't generated if the parent is an atom
-/datum/component/personal_crafting/ui_interact(mob/user, datum/tgui/ui)
+/datum/component/personal_crafting/ui_interact(mob/user, datum/tgui/ui, var/open_ui = TRUE)
 	ui = SStgui.try_update_ui(user, src, ui)
-	if(!ui)
+	if(!ui && open_ui)
 		cur_category = categories[1]
 		if(islist(categories[cur_category]))
 			var/list/subcats = categories[cur_category]
@@ -431,6 +431,7 @@
 			else
 				to_chat(user, "<span class='warning'>Construction failed[result]</span>")
 			busy = FALSE
+			ui_interact(user, open_ui = FALSE) //Update the UI again as soon as possible after the UI is no longer busy, but don't open it again if it got closed.
 		if("toggle_recipes")
 			display_craftable_only = !display_craftable_only
 			. = TRUE

code/modules/vending/boozeomat.dm

@@ -63,6 +63,7 @@
 /obj/machinery/vending/boozeomat/all_access
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This model appears to have no access restrictions."
 	req_access = null
+	onstation = FALSE
 
 /obj/machinery/vending/boozeomat/syndicate_access
 	req_access = list(ACCESS_SYNDICATE)

code/modules/vtmb/gridventory.dm

@@ -167,6 +167,7 @@ VENTORY!
 				if(!bound_underlay)
 					bound_underlay = generate_bound_underlay(stored_item.grid_width, stored_item.grid_height)
 					underlay_appearances_by_size["[stored_item.grid_width]x[stored_item.grid_height]"] = bound_underlay
+				stored_item.underlays = null
 				stored_item.underlays += bound_underlay
 				screen_loc = LAZYACCESSASSOC(master.item_to_grid_coordinates, stored_item, 1)
 				screen_loc = master.grid_coordinates_to_screen_loc(screen_loc)
@@ -191,6 +192,7 @@ VENTORY!
 				if(!bound_underlay)
 					bound_underlay = generate_bound_underlay(stored_item.grid_width, stored_item.grid_height)
 					underlay_appearances_by_size["[stored_item.grid_width]x[stored_item.grid_height]"] = bound_underlay
+				stored_item.underlays = null
 				stored_item.underlays += bound_underlay
 				screen_loc = LAZYACCESSASSOC(master.item_to_grid_coordinates, stored_item, 1)
 				screen_loc = master.grid_coordinates_to_screen_loc(screen_loc)
@@ -1038,6 +1040,10 @@ VENTORY!
 	grid_width = 5 GRID_BOXES
 	grid_height = 2 GRID_BOXES
 
+/obj/item/gun/ballistic/automatic/vampire/autoshotgun
+	grid_width = 5 GRID_BOXES
+	grid_height = 2 GRID_BOXES
+
 /obj/item/gun/ballistic/automatic/vampire/sniper
 	grid_width = 4 GRID_BOXES
 	grid_height = 2 GRID_BOXES

code/modules/wod13/ammostack.dm

@@ -91,16 +91,25 @@
 	bare_wound_bonus = 10
 	wound_bonus = 5
 
-/obj/projectile/beam/beam_rifle/vampire/vamp12g/pellet
+/obj/projectile/beam/beam_rifle/vampire/vamp12g/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		M.Stun(25)
+
+/obj/projectile/beam/beam_rifle/vampire/shotpellet
 	name = "12g shotgun pellet"
 	damage = 9
 	range = 22 //range of where you can see + one screen after
+	armour_penetration = 15
+	bare_wound_bonus = 5
+	wound_bonus = 0
 
 /obj/projectile/beam/beam_rifle/vampire/vamp12g/on_hit(atom/target, blocked = FALSE)
 	. = ..()
 	if(iscarbon(target))
 		var/mob/living/carbon/M = target
-		M.Stun(20)
+		M.Stun(4)
 
 /obj/projectile/beam/beam_rifle/vampire/vamp556mm/incendiary
 	armour_penetration = 0
@@ -191,7 +200,7 @@
 
 /obj/item/ammo_casing/vampire/c12g/buck
 	desc = "A 12g shell casing (00 buck)."
-	projectile_type = /obj/projectile/beam/beam_rifle/vampire/vamp12g/pellet
+	projectile_type = /obj/projectile/beam/beam_rifle/vampire/shotpellet
 	pellets = 8
 	variance = 25
 

code/modules/wod13/guns.dm

@@ -556,6 +556,41 @@
 	inhand_x_dimension = 32
 	inhand_y_dimension = 32
 
+/obj/item/ammo_box/magazine/vampautoshot
+	name = "shotgun magazine (12ga)"
+	icon = 'code/modules/wod13/ammo.dmi'
+	lefthand_file = 'code/modules/wod13/righthand.dmi'
+	righthand_file = 'code/modules/wod13/lefthand.dmi'
+	worn_icon = 'code/modules/wod13/worn.dmi'
+	onflooricon = 'code/modules/wod13/onfloor.dmi'
+	icon_state = "spas15"
+	ammo_type = /obj/item/ammo_casing/vampire/c12g/buck
+	caliber = CALIBER_12G
+	max_ammo = 6
+	multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/gun/ballistic/automatic/vampire/autoshotgun
+	name = "\improper Jaegerspas-XV"
+	desc = "A semi-automatic shotgun. It looks more like an assault rifle than a shotgun and fires at a deadly pace."
+	icon = 'code/modules/wod13/48x32weapons.dmi'
+	icon_state = "spas15"
+	inhand_icon_state = "spas15"
+	worn_icon_state = "rifle"
+	w_class = WEIGHT_CLASS_BULKY
+	mag_type = /obj/item/ammo_box/magazine/vampautoshot
+	burst_size = 1
+	fire_delay = 2
+	spread = 4
+	bolt_type = BOLT_TYPE_LOCKING
+	show_bolt_icon = FALSE
+	mag_display = TRUE
+	fire_sound = 'code/modules/wod13/sounds/pomp.ogg'
+	slot_flags = ITEM_SLOT_BACK
+	projectile_damage_multiplier = 0.9
+	masquerade_violating = TRUE
+	recoil = 6
+	cost = 500
+
 /obj/item/gun/ballistic/shotgun/toy/crossbow/vampire
 	name = "crossbow"
 	desc = "Welcome to the Middle Ages!"
@@ -669,4 +704,4 @@
 							oil = max(0, oil-10)
 							if(oil == 0)
 								icon_state = "flamethrower1"
-						new /obj/effect/fire(F)
+						new /obj/effect/fire(F)