Merge pull request #91 from Superlagg/aw-fuck-i-got-blood-on-the-bar-…

…floor-gross

Bar tweaks

code/_onclick/item_attack.dm

@@ -250,7 +250,7 @@
 			dt,
 			TRUE
 		)
-		if(I.damtype == BRUTE)
+		if(I.damtype == BRUTE && SSmobs.attacks_cause_blood)
 			if(prob(33))
 				I.add_mob_blood(src)
 				var/turf/location = get_turf(src)

code/controllers/subsystem/mobs.dm

@@ -14,6 +14,8 @@ SUBSYSTEM_DEF(mobs)
 	var/list/mob_tally = list()
 
 	var/allow_wounds = FALSE
+	var/attacks_cause_blood = FALSE
+	var/allow_backstabs = FALSE
 
 	var/there_is_no_escape = FALSE // there is escape
 	var/debug_no_icon_2_html = FALSE

code/controllers/subsystem/who.dm

@@ -30,6 +30,7 @@ SUBSYSTEM_DEF(who) // SS who? SS you!
 	var/show_coords = FALSE
 
 	var/admin_level_to_see_all = R_ADMIN
+	var/obfuscate_hilbert_where = TRUE
 
 	var/debug_regions = TRUE
 

code/game/machinery/doors/door.dm

@@ -497,11 +497,12 @@
 			L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
 		var/turf/location = get_turf(src)
 		//add_blood_DNA doesn't work for borgs/xenos, but add_blood_floor does.
-		if(iscarbon(L))
-			var/mob/living/carbon/C = L
-			C.bleed(DOOR_CRUSH_DAMAGE)
-		else
-			L.add_splatter_floor(location)
+		if(SSmobs.attacks_cause_blood)
+			if(iscarbon(L))
+				var/mob/living/carbon/C = L
+				C.bleed(DOOR_CRUSH_DAMAGE)
+			else
+				L.add_splatter_floor(location)
 	for(var/obj/mecha/M in get_turf(src))
 		M.take_damage(DOOR_CRUSH_DAMAGE)
 

code/game/objects/items.dm

@@ -1298,7 +1298,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 
 /obj/item/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1, damage_override)
 	// Check if the user is behind the target
-	if(get_dir(user, M) == M.dir && isliving(M))
+	if(SSmobs.allow_backstabs && get_dir(user, M) == M.dir && isliving(M))
 		damage_multiplier = backstab_multiplier // Apply the backstab multiplier
 		playsound(user.loc, 'sound/effects/dismember.ogg', 50, 1, -1) // Play a backstab sound
 		to_chat(user, "<span class='notice'>You backstab [M]!</span>")

code/modules/mob/living/carbon/carbon_defense.dm

@@ -122,7 +122,7 @@
 	I.do_stagger_action(src, user, totitemdamage)
 	if(totitemdamage)
 		apply_damage(totitemdamage, I.damtype, affecting, wound_bonus = I.wound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness()) //CIT CHANGE - replaces I.force with totitemdamage
-		if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)
+		if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC && SSmobs.attacks_cause_blood)
 			var/basebloodychance = affecting.brute_dam + totitemdamage
 			if(prob(basebloodychance))
 				I.add_mob_blood(src)

code/modules/mob/living/carbon/human/species.dm

@@ -2058,7 +2058,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 	var/bloody = 0
 	if(((I.damtype == BRUTE) && totitemdamage && prob(25 + (totitemdamage * 2))))
-		if(affecting.status == BODYPART_ORGANIC)
+		if(affecting.status == BODYPART_ORGANIC && SSmobs.attacks_cause_blood)
 			I.add_mob_blood(H)	//Make the weapon bloody, not the person.
 			if(prob(totitemdamage * 2))	//blood spatter!
 				bloody = 1

modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm

@@ -322,7 +322,67 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
 
 /obj/hilbertshotel/proc/linkTurfs(var/datum/turf_reservation/currentReservation, var/currentRoomnumber, var/chosen_room)
 	var/area/hilbertshotel/currentArea = get_area(locate(currentReservation.bottom_left_coords[1], currentReservation.bottom_left_coords[2], currentReservation.bottom_left_coords[3]))
-	currentArea.name = "Hilbert's Hotel Room [currentRoomnumber]"
+	var/rumnam = "Hilbert's Hotel Room [currentRoomnumber]"
+	if(SSwho.obfuscate_hilbert_where)
+		var/list/starts = list(
+			"Somewhere",
+			"Someplace",
+			"Roughly",
+			"Vaguely",
+		)
+		var/list/relatives = list(
+			"adjacent to",
+			"near",
+			"within",
+			"beside",
+			"around",
+			"surrounding the greater area of",
+			"in the general vicinity of",
+			"on top of",
+			"beneath",
+			"bottoming for",
+			"topping for",
+			"inside of",
+			"outside of",
+			"draped over",
+			"clinging to",
+			"clinging to the underbelly of",
+			"clinging to the backside of",
+			"enjoying the company of",
+		)
+		var/list/prefixes = list(
+			"the great",
+			"a sexy",
+			"some kind of",
+			"an historic",
+			"your",
+			"the esteemed mister",
+			"the illustrious missus",
+			"the mysterious",
+			"the enigmatic",
+			"the legendary",
+			"the infamous",
+			"the notorious",
+			"the fabled",
+			"some random",
+			"an EXTREMELY busty",
+			"a worryingly well endowed",
+			"the one and only",
+			"your mom's",
+			"the",
+			"the reason the 14 is STILL under construction, AKA.",
+			"the hit new romcom:",
+			"the sink after a night with",
+		)
+		var/sharkfirst = safepick(GLOB.megacarp_first_names)
+		var/sharklast = safepick(GLOB.megacarp_last_names)
+		rumnam = ""
+		rumnam += "[safepick(starts)] "
+		rumnam += "[safepick(relatives)] "
+		rumnam += "[safepick(prefixes)] "
+		rumnam += "[sharkfirst] [sharklast]"
+
+	currentArea.name = rumnam // somewhere topping for the illustrious missus exploding terror shark
 	currentArea.parentSphere = src
 	currentArea.storageTurf = storageTurf
 	currentArea.roomnumber = currentRoomnumber