Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into Naming-Consistency

code/game/machinery/suit_storage_unit.dm

@@ -586,7 +586,7 @@
 	var/electrified = 0
 
 	//Departments that the cycler can paint suits to look like.
-	var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction")
+	var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard")
 	//Species that the suits can be configured to fit.
 	var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari")
 
@@ -634,7 +634,7 @@
 	name = "Medical suit cycler"
 	model_text = "Medical"
 	req_access = list(access_medical)
-	departments = list("Medical")
+	departments = list("Medical","Biohazard")
 
 /obj/machinery/suit_cycler/syndicate
 	name = "Nonstandard suit cycler"
@@ -751,7 +751,7 @@
 
 	//Clear the access reqs, disable the safeties, and open up all paintjobs.
 	user << "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>"
-	departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","^%###^%$")
+	departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","^%###^%$")
 	species = list("Human","Tajara","Skrell","Unathi", "Teshari")
 
 	emagged = 1
@@ -1036,6 +1036,15 @@
 				suit.name = "Construction voidsuit"
 				suit.icon_state = "rig-engineering_con"
 				suit.item_state = "eng_voidsuit_con"
+		if("Biohazard")
+			if(helmet)
+				helmet.name = "Biohazard voidsuit helmet"
+				helmet.icon_state = "rig0-medical_bio"
+				helmet.item_state = "rig0-medical_bio"
+			if(suit)
+				suit.name = "Biohazard voidsuit"
+				suit.icon_state = "rig-medical_bio"
+				suit.item_state = "medical_voidsuit_bio"
 		if("^%###^%$" || "Mercenary")
 			if(helmet)
 				helmet.name = "blood-red voidsuit helmet"

code/game/objects/items/weapons/implants/implant.dm

@@ -164,12 +164,10 @@ Implant Specifics:<BR>"}
 	if (malfunction == MALFUNCTION_PERMANENT)
 		return
 
-	var/need_gib = null
 	if(istype(imp_in, /mob/))
 		var/mob/T = imp_in
 		message_admins("Explosive implant triggered in [T] ([T.key]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>) ")
 		log_game("Explosive implant triggered in [T] ([T.key]).")
-		need_gib = 1
 
 		if(ishuman(imp_in))
 			if (elevel == "Localized Limb")
@@ -180,11 +178,11 @@ Implant Specifics:<BR>"}
 					if (istype(part,/obj/item/organ/external/chest) ||	\
 						istype(part,/obj/item/organ/external/groin) ||	\
 						istype(part,/obj/item/organ/external/head))
-						part.createwound(BRUISE, 60)	//mangle them instead
-						explosion(get_turf(imp_in), -1, -1, 2, 3)
+						part.createwound(BRUISE, 80)	//mangle them instead
+						explosion(get_turf(imp_in), -1, -1, 1, 3)
 						qdel(src)
 					else
-						explosion(get_turf(imp_in), -1, -1, 2, 3)
+						explosion(get_turf(imp_in), -1, -1, 1, 3)
 						part.droplimb(0,DROPLIMB_BLUNT)
 						qdel(src)
 			if (elevel == "Destroy Body")
@@ -197,9 +195,6 @@ Implant Specifics:<BR>"}
 		else
 			explosion(get_turf(imp_in), 0, 1, 3, 6)
 
-	if(need_gib)
-		imp_in.gib()
-
 	var/turf/t = get_turf(imp_in)
 
 	if(t)
@@ -249,10 +244,10 @@ Implant Specifics:<BR>"}
 				if (istype(part,/obj/item/organ/external/chest) ||	\
 					istype(part,/obj/item/organ/external/groin) ||	\
 					istype(part,/obj/item/organ/external/head))
-					part.createwound(BRUISE, 60)	//mangle them instead
+					part.createwound(BRUISE, 80)	//mangle them instead
 				else
 					part.droplimb(0,DROPLIMB_BLUNT)
-			explosion(get_turf(imp_in), -1, -1, 2, 3)
+			explosion(get_turf(imp_in), -1, -1, 1, 3)
 			qdel(src)
 
 /obj/item/weapon/implant/chem

code/hub.dm

@@ -1,8 +1,8 @@
 /world
 
 	hub = "Exadv1.spacestation13"
-	//hub_password = "SORRYNOPASSWORD"
-	hub_password = "kMZy3U5jJHSiBQjr"
+	hub_password = "SORRYNOPASSWORD"
+	//hub_password = "kMZy3U5jJHSiBQjr"
 	name = "Space Station 13"
 
 /* This is for any host that would like their server to appear on the main SS13 hub.

code/modules/clothing/spacesuits/void/station.dm

@@ -7,7 +7,7 @@
 	item_state_slots = list(slot_r_hand_str = "eng_helm", slot_l_hand_str = "eng_helm")
 	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
 
-/obj/item/clothing/head/helmet/space/void/engineering/rad
+/obj/item/clothing/head/helmet/space/void/engineering/hazmat
 	name = "HAZMAT voidsuit helmet"
 	icon_state = "rig0-engineering_rad"
 	item_state_slots = list(slot_r_hand_str = "eng_helm_rad", slot_l_hand_str = "eng_helm_rad")
@@ -26,7 +26,7 @@
 	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 
-/obj/item/clothing/suit/space/void/engineering/rad
+/obj/item/clothing/suit/space/void/engineering/hazmat
 	name = "HAZMAT voidsuit"
 	icon_state = "rig-engineering_rad"
 	item_state_slots = list(slot_r_hand_str = "eng_voidsuit_rad", slot_l_hand_str = "eng_voidsuit_rad")
@@ -60,6 +60,11 @@
 	item_state_slots = list(slot_r_hand_str = "medical_helm", slot_l_hand_str = "medical_helm")
 	armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
 
+/obj/item/clothing/head/helmet/space/void/medical/bio
+	name = "biohazard voidsuit helmet"
+	icon_state = "rig0-medical_bio"
+	item_state_slots = list(slot_r_hand_str = "medical_helm_bio", slot_l_hand_str = "medical_helm_bio")
+
 /obj/item/clothing/suit/space/void/medical
 	name = "medical voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
@@ -68,6 +73,11 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
 	armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
 
+/obj/item/clothing/suit/space/void/medical/bio
+	name = "biohazard voidsuit"
+	icon_state = "rig-medical_bio"
+	item_state_slots = list(slot_r_hand_str = "medical_voidsuit_bio", slot_l_hand_str = "medical_voidsuit_bio")
+
 //Security
 /obj/item/clothing/head/helmet/space/void/security
 	name = "security voidsuit helmet"

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

@@ -126,9 +126,7 @@
 		var/removed_splint
 		for(var/obj/item/organ/external/o in organs)
 			if (o && o.status & ORGAN_SPLINTED)
-				var/obj/item/W = new /obj/item/stack/medical/splint(get_turf(src), 1)
 				o.status &= ~ORGAN_SPLINTED
-				W.add_fingerprint(user)
 				removed_splint = 1
 		if(removed_splint)
 			visible_message("<span class='danger'>\The [user] removes \the [src]'s splints!</span>")

code/modules/projectiles/projectile/energy.dm

@@ -25,14 +25,15 @@
 	for (var/mob/living/carbon/M in viewers(T, flash_range))
 		if(M.eyecheck() < 1)
 			M.flash_eyes()
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			flash_strength *= H.species.flash_mod
 
-			if(flash_strength > 0)
-				H.confused = max(H.confused, flash_strength + 5)
-				H.eye_blind = max(H.eye_blind, flash_strength)
-				H.eye_blurry = max(H.eye_blurry, flash_strength + 5)
+			if(ishuman(M))
+				var/mob/living/carbon/human/H = M
+				flash_strength *= H.species.flash_mod
+
+				if(flash_strength > 0)
+					H.confused = max(H.confused, flash_strength + 5)
+					H.eye_blind = max(H.eye_blind, flash_strength)
+					H.eye_blurry = max(H.eye_blurry, flash_strength + 5)
 
 
 	//snap pop

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -125,10 +125,10 @@
 
 /datum/reagent/water/touch_mob(var/mob/living/L, var/amount)
 	if(istype(L))
-		var/needed = L.fire_stacks * 10
+		var/needed = L.fire_stacks * 5
 		if(amount > needed)
 			L.ExtinguishMob()
-		L.adjust_fire_stacks(-(amount / 10))
+		L.adjust_fire_stacks(-(amount / 5))
 		remove_self(needed)
 
 /datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)

html/changelogs/Anewbe - Explosive Implants.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Anewbe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Explosive implants should no longer gib the target if the setting is Localized Limb."

html/changelogs/Anewbe - Splints.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Anewbe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscdel: "Splints are no longer reusable."

html/changelogs/Anewbe - Water.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Anewbe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Water is now more effective at dousing burning people."