Merged branch master into LemonBranch

code/ATMOSPHERICS/components/unary/unary_base.dm

@@ -9,6 +9,8 @@
 
 	var/datum/pipe_network/network
 
+	var/welded = 0 //defining this here for ventcrawl stuff
+
 	New()
 		..()
 		initialize_directions = dir

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -40,8 +40,6 @@
 	var/internal_pressure_bound_default = INTERNAL_PRESSURE_BOUND
 	var/pressure_checks_default = PRESSURE_CHECKS
 
-	var/welded = 0 // Added for aliens -- TLE
-
 	var/frequency = 1439
 	var/datum/radio_frequency/radio_connection
 

code/datums/uplink/ammunition.dm

@@ -18,14 +18,26 @@
 	name = "Pistol Magazine (.45)"
 	path = /obj/item/ammo_magazine/c45m
 
+/datum/uplink_item/item/ammo/c45map
+	name = "Pistol Magazine (.45 AP)"
+	path = /obj/item/ammo_magazine/c45m/ap
+
 /datum/uplink_item/item/ammo/tommymag
 	name = "Tommygun Magazine (.45)"
 	path = /obj/item/ammo_magazine/tommymag
 
+/datum/uplink_item/item/ammo/tommymagap
+	name = "Tommygun Magazine (.45 AP)"
+	path = /obj/item/ammo_magazine/tommymag/ap
+
 /datum/uplink_item/item/ammo/tommydrum
 	name = "Tommygun Drum Magazine (.45)"
 	path = /obj/item/ammo_magazine/tommydrum
-	item_cost = 40 // Buy 40 bullets, get 10 free!
+	item_cost = 40
+
+/datum/uplink_item/item/ammo/tommydrumap
+	name = "Tommygun Drum Magazine (.45 AP)"
+	path = /obj/item/ammo_magazine/tommydrum/ap
 
 /datum/uplink_item/item/ammo/darts
 	name = "Darts"

code/game/machinery/Sleeper.dm

@@ -20,9 +20,10 @@
 		var/obj/machinery/sleeper/sleepernew = null
 		for(dir in list(NORTH, EAST, SOUTH, WEST)) // Loop through every direction
 			sleepernew = locate(/obj/machinery/sleeper, get_step(src, dir)) // Try to find a scanner in that direction
-		if(sleepernew)
-			sleeper = sleepernew
-			sleepernew.console = src
+			if(sleepernew)
+				sleeper = sleepernew
+				sleepernew.console = src
+				return
 		return
 
 /obj/machinery/sleep_console/attack_ai(var/mob/user)

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -278,3 +278,26 @@
 		beakers += B1
 		beakers += B2
 		icon_state = initial(icon_state) +"_locked"
+
+/obj/item/weapon/grenade/chem_grenade/teargas
+	name = "tear gas grenade"
+	desc = "Concentrated Capsaicin. Contents under pressure. Use with caution."
+	stage = 2
+	path = 1
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
+
+		B1.reagents.add_reagent("phosphorus", 40)
+		B1.reagents.add_reagent("potassium", 40)
+		B1.reagents.add_reagent("condensedcapsaicin", 40)
+		B2.reagents.add_reagent("sugar", 40)
+		B2.reagents.add_reagent("condensedcapsaicin", 80)
+
+		detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
+
+		beakers += B1
+		beakers += B2
+		icon_state = initial(icon_state) +"_locked"

code/game/objects/items/weapons/storage/boxes.dm

@@ -339,6 +339,16 @@
 	for(var/i = 1 to 7)
 		new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
 
+/obj/item/weapon/storage/box/teargas
+	name = "box of teargas grenades"
+	desc = "A box containing 7 teargas grenades."
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/teargas/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+
 /obj/item/weapon/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."

code/game/response_team.dm

@@ -5,7 +5,7 @@ var/global/send_emergency_team = 0 // Used for automagic response teams
                                    // 'admin_emergency_team' for admin-spawned response teams
 var/ert_base_chance = 10 // Default base chance. Will be incremented by increment ERT chance.
 var/can_call_ert
-var/silent_ert
+var/silent_ert = 0
 
 /client/proc/response_team()
 	set name = "Dispatch Emergency Response Team"

code/modules/client/preference_setup/loadout/loadout_eyes.dm

@@ -38,6 +38,10 @@
 	display_name = "Security HUD, prescription (Security)"
 	path = /obj/item/clothing/glasses/hud/security/prescription
 
+/datum/gear/eyes/security/sunglasshud
+	display_name = "Security HUD, sunglasses (Security)"
+	path = /obj/item/clothing/glasses/sunglasses/sechud
+
 /datum/gear/eyes/secaviators
 	display_name = "Security HUD Aviators"
 	path = /obj/item/clothing/glasses/sunglasses/sechud/aviator

code/modules/client/preference_setup/loadout/loadout_utility.dm

@@ -39,4 +39,13 @@
 /datum/gear/utility/securecase
 	display_name = "secure briefcase"
 	path =/obj/item/weapon/storage/secure/briefcase
+	cost = 2
+
+/datum/gear/utility/flashlight
+	display_name = "flashlight"
+	path = /obj/item/device/flashlight
+
+/datum/gear/utility/maglight
+	display_name = "flashlight, maglight"
+	path = /obj/item/device/flashlight/maglight
 	cost = 2

code/modules/clothing/gloves/arm_guards.dm

@@ -2,7 +2,6 @@
 	name = "arm guards"
 	desc = "These arm guards will protect your hands and arms."
 	body_parts_covered = HANDS|ARMS
-	slowdown = 0.5
 	overgloves = 1
 	w_class = ITEMSIZE_NORMAL
 

code/modules/clothing/head/misc_special.dm

@@ -27,8 +27,6 @@
 	var/base_state
 
 /obj/item/clothing/head/welding/attack_self()
-	if(!base_state)
-		base_state = icon_state
 	toggle()
 
 
@@ -37,6 +35,9 @@
 	set name = "Adjust welding mask"
 	set src in usr
 
+	if(!base_state)
+		base_state = icon_state
+
 	if(usr.canmove && !usr.stat && !usr.restrained())
 		if(src.up)
 			src.up = !src.up

code/modules/clothing/suits/armor.dm

@@ -58,6 +58,7 @@
 	icon_state = "bulletproof"
 	item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
 	blood_overlay_type = "armor"
+	slowdown = 0.5
 	armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.7
 
@@ -71,6 +72,7 @@
 	desc = "A vest that excels in protecting the wearer against energy projectiles."
 	icon_state = "armor_reflec"
 	blood_overlay_type = "armor"
+	slowdown = 0.5
 	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.1
 
@@ -100,6 +102,7 @@
 	desc = "A vest that protects the wearer from several common types of weaponry."
 	icon_state = "combat"
 	blood_overlay_type = "armor"
+	slowdown = 0.5
 	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 30, bio = 0, rad = 0)
 	siemens_coefficient = 0.6
 
@@ -334,7 +337,7 @@
 	icon_state = "webvest"
 	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
 	armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
-	slowdown = 1
+	slowdown = 0.5
 
 /obj/item/clothing/suit/storage/vest/heavy/officer
 	name = "officer heavy armor vest"

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -129,7 +129,7 @@
 		return
 	custom_emote(1, pick( list("slashes at [target_mob]", "bites [target_mob]") ) )
 
-	var/damage = rand(20,30)
+	var/damage = rand(melee_damage_lower, melee_damage_upper)
 
 	if(ishuman(target_mob))
 		var/mob/living/carbon/human/H = target_mob

code/modules/projectiles/ammunition/boxes.dm

@@ -53,6 +53,10 @@
 	name = "magazine (.45 flash)"
 	ammo_type = /obj/item/ammo_casing/c45f
 
+/obj/item/ammo_magazine/c45m/ap
+	name = "magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/c45ap
+
 /obj/item/ammo_magazine/c45uzi
 	name = "stick magazine (.45)"
 	icon_state = "uzi45"
@@ -75,6 +79,10 @@
 	caliber = ".45"
 	max_ammo = 20
 
+/obj/item/ammo_magazine/tommymag/ap
+	name = "tommygun magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/c45ap
+
 /obj/item/ammo_magazine/tommymag/empty
 	initial_ammo = 0
 
@@ -88,6 +96,10 @@
 	caliber = ".45"
 	max_ammo = 50
 
+/obj/item/ammo_magazine/tommydrum/ap
+	name = "tommygun drum magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/c45ap
+
 /obj/item/ammo_magazine/tommydrum/empty
 	initial_ammo = 0
 

code/modules/projectiles/ammunition/bullets.dm

@@ -63,6 +63,12 @@
 	caliber = ".45"
 	projectile_type = /obj/item/projectile/bullet/pistol/medium
 
+/obj/item/ammo_casing/c45ap
+	desc = "A .45 Armor-Piercing bullet casing."
+	caliber = ".45"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/medium/ap
+
 /obj/item/ammo_casing/c45p
 	desc = "A .45 practice bullet casing."
 	caliber = ".45"

code/modules/projectiles/projectile/bullets.dm

@@ -127,12 +127,16 @@
 	damage = 20
 
 /obj/item/projectile/bullet/pistol/ap
-	damage = 20
+	damage = 15
 	armor_penetration = 30
 
 /obj/item/projectile/bullet/pistol/medium
 	damage = 25
 
+/obj/item/projectile/bullet/pistol/medium/ap
+	damage = 20
+	armor_penetration = 15
+
 /obj/item/projectile/bullet/pistol/strong //revolvers and matebas
 	damage = 60
 

code/modules/ventcrawl/ventcrawl.dm

@@ -81,7 +81,7 @@ var/list/ventcrawl_machinery = list(
 	var/atom/pipe
 	var/list/pipes = list()
 	for(var/obj/machinery/atmospherics/unary/U in range(1))
-		if(is_type_in_list(U,ventcrawl_machinery) && Adjacent(U))
+		if(is_type_in_list(U,ventcrawl_machinery) && Adjacent(U) && !U.welded)
 			pipes |= U
 	if(!pipes || !pipes.len)
 		to_chat(src, "There are no pipes that you can ventcrawl into within range!")

html/changelogs/Anewbe - AP bullets.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: 
+  - rscadd: "Added .45 and tommygun AP ammo to the uplink."

html/changelogs/Anewbe - Armor.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: "Slowdown in armor sets moved to chest and legs, rather than arms and legs."

html/changelogs/Anewbe - ERT.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: 
+  - bugfix: "Fixed all ERT calls being silent, regardless of selected option."

html/changelogs/Anewbe - LoadoutFlashlight.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: 
+  - rscadd: "Added flashlights, maglights, and the secHUD sunglasses (Sec only) to the loadout. "