Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr

# Conflicts: # _maps/map_files/BoxStation/BoxStation.dmm
2020-03-15 01:11:19 -04:00
parent d81247e15e 2de1395e6b
commit 99b189844e
12 changed files with 42 additions and 21 deletions
@@ -261,6 +261,7 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aaK" = (
+<<<<<<< HEAD
 /obj/machinery/computer/arcade/battle{
 	dir = 4
 	},
@@ -292,6 +293,12 @@
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hos)
+=======
+/obj/structure/table/wood,
+/mob/living/simple_animal/pet/fox/Renault,
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
+>>>>>>> 2de1395e6bc9f920a9a445047f296be03e0ffb97
 "aaN" = (
 /obj/structure/chair/sofa/right,
 /turf/open/floor/plasteel,
@@ -23144,10 +23151,6 @@
 /obj/structure/table,
 /turf/open/floor/wood,
 /area/bridge/meeting_room)
-"bbZ" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/captain)
 "bca" = (
 /turf/open/floor/carpet,
 /area/bridge/meeting_room)
@@ -91727,7 +91730,7 @@ aYo
 aZV
 bao
 baP
-bbZ
+aaK
 bcP
 cBo
 bgS
@@ -85,7 +85,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 				our_quirks -= i
 				cut += i
 				pointscut += quirk_points_by_name(i)
-			if (pointscut >= 0) //with how it works, it needs to be above zero, not below, as points for positive is positive, and negative is negative, we only want it to break if it's above zero, ie. we cut more positive than negative
+			if (pointscut >= 0)
 				break
 	/*	//Code to automatically reduce positive quirks until balance is even.
 	var/points_used = total_points(our_quirks)
@@ -102,7 +102,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	*/

 	//Nah, let's null all non-neutrals out.
-	if (pointscut != 0)// only if the pointscutting didn't work.
+	if (pointscut < 0)// only if the pointscutting didn't work.
 		if(cut.len)
 			for(var/i in our_quirks)
 				if(quirk_points_by_name(i) != 0)
@@ -443,7 +443,7 @@ SUBSYSTEM_DEF(vote)

 			var/admin = FALSE
 			var/ckey = ckey(initiator_key)
-			if(GLOB.admin_datums[ckey])
+			if(GLOB.admin_datums[ckey] || initiator_key == "server")
 				admin = TRUE

 			if(next_allowed_time > world.time && !admin)
@@ -25,7 +25,7 @@

 /obj/item/melee/baton/examine(mob/user)
 	. = ..()
-	. += "<span class='notice'>Right click attack while in combat mode or attack while in disarm intent to disarm instead of stun.</span>"
+	. += "<span class='notice'>Right click attack while in combat mode to disarm instead of stun.</span>"

 /obj/item/melee/baton/get_cell()
 	. = cell
@@ -149,8 +149,6 @@

 //return TRUE to interrupt attack chain.
 /obj/item/melee/baton/proc/common_baton_melee(mob/M, mob/living/user, disarming = FALSE)
-	if(user.a_intent == INTENT_DISARM)
-		disarming = TRUE			//override if they're in disarm intent.
 	if(iscyborg(M) || !isliving(M))		//can't baton cyborgs
 		return FALSE
 	if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
@@ -43,7 +43,7 @@

 //						EXPLANATION
 /datum/objective/bloodsucker/lair/update_explanation_text()
-	explanation_text = "Create a lair by claiming a coffin, and protect it until the end of the shift"//  Make sure to keep it safe!"
+	explanation_text = "Create a lair by claiming a coffin, and protect it until the end of the shift."//  Make sure to keep it safe!"

 //						WIN CONDITIONS?
 /datum/objective/bloodsucker/lair/check_completion()
@@ -228,7 +228,7 @@
 		if (SC && SC.lastgen > 0 && SC.connected_panels.len > 0 && SC.connected_tracker)
 			return FALSE
 	return TRUE
-*/ 
+*/
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

@@ -250,15 +250,15 @@
 //						WIN CONDITIONS?
 /datum/objective/bloodsucker/heartthief/check_completion()
 	// -Must have a body.
-	if (!owner.current)
+	if(!owner.current)
 		return FALSE
 	// Taken from /steal in objective.dm
 	var/list/all_items = owner.current.GetAllContents() // Includes items inside other items.
 	var/itemcount = FALSE
 	for(var/obj/I in all_items) //Check for items
-		if(I == /obj/item/organ/heart)
-			itemcount ++
-			if (itemcount >= target_amount) // Got the right amount?
+		if(istype(I, /obj/item/organ/heart/))
+			itemcount++
+			if(itemcount >= target_amount) // Got the right amount?
 				return TRUE

 	return FALSE
@@ -264,11 +264,11 @@
 	jitteriness += 1000 //High numbers for violent convulsions
 	do_jitter_animation(jitteriness)
 	stuttering += 2
-	if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && (flags & SHOCK_NOSTUN))
+	if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && !(flags & SHOCK_NOSTUN))
 		Stun(40)
 	spawn(20)
 		jitteriness = max(jitteriness - 990, 10) //Still jittery, but vastly less
-		if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && (flags & SHOCK_NOSTUN))
+		if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && !(flags & SHOCK_NOSTUN))
 			DefaultCombatKnockdown(60)
 	return shock_damage

@@ -64,7 +64,7 @@
 	..()

 /mob/living/simple_animal/mouse/handle_automated_action()
-	if(isbelly(loc))
+	if(!isturf(loc))
 		return

 	if(prob(chew_probability))
@@ -76,7 +76,7 @@
 					visible_message("<span class='warning'>[src] chews through the [C]. It's toast!</span>")
 					playsound(src, 'sound/effects/sparks2.ogg', 100, 1)
 					C.deconstruct()
-					death(toast=1)
+					death(toast=TRUE)
 				else
 					C.deconstruct()
 					visible_message("<span class='warning'>[src] chews through the [C].</span>")
@@ -0,0 +1,4 @@
+author: "bunny232"
+delete-after: True
+changes: 
+  - rscadd: "Box station captain office now has a standard issue renault"
@@ -0,0 +1,4 @@
+author: "Kraseo"
+delete-after: True
+changes: 
+  - bugfix: "Mice don't chew on wires anymore while they're on your person."
@@ -0,0 +1,4 @@
+author: "Kraseo"
+delete-after: True
+changes: 
+  - bugfix: "Bloodsucker heart theft objective now completes successfully."
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Server-run votes aren't subject to vote cooldown"
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - bugfix: "quirk blacklist fixing"