Merge branch 'master' into development

# Conflicts:
#	html/changelogs/sdtwbaj-skrellmoney.yml

code/game/objects/items/weapons/melee/energy.dm

@@ -304,7 +304,6 @@
 	shield_power = 150
 	can_block_bullets = 1
 	active = 1
-	armor_penetration = 20
 
 /obj/item/weapon/melee/energy/blade/Initialize()
 	. = ..()

code/modules/food/recipes_microwave.dm

@@ -903,9 +903,9 @@ I said no!
 
 // Chip update
 /datum/recipe/tortila
-	reagents = list("flour" = 5,"sodiumchloride" = 1,"water" = 5)
+	reagents = list("flour" = 5,"water" = 5)
 	result = /obj/item/weapon/reagent_containers/food/snacks/tortilla
-	reagent_mix = RECIPE_REAGENT_REPLACE //no flour
+	reagent_mix = RECIPE_REAGENT_REPLACE //no gross flour or water
 
 /datum/recipe/taconew
 	items = list(
@@ -1014,9 +1014,9 @@ I said no!
 		/obj/item/weapon/reagent_containers/food/snacks/meatball,
 		/obj/item/weapon/reagent_containers/food/snacks/meatball
 	)
-	reagents = list("spacespice" = 1, "phoron" = 5)
+	reagents = list("spacespice" = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burrito_hell
-	reagent_mix = RECIPE_REAGENT_REPLACE //No phoron please.
+	reagent_mix = RECIPE_REAGENT_REPLACE //Already hot sauce
 
 /datum/recipe/burrito_mystery
 	items = list(
@@ -1026,4 +1026,4 @@ I said no!
 		/obj/item/weapon/reagent_containers/food/snacks/meatball,
 		/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
 	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery
+	result = /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery

code/modules/projectiles/guns/bang.dm

@@ -4,6 +4,7 @@
 	icon_state = "revolver"
 	item_state = "revolver"
 	fire_sound = 'sound/misc/sadtrombone.ogg'
+	needspin = FALSE
 	var/image/bang_flag
 	var/fired_gun = 0
 	var/pixel_offset_x = -2
@@ -40,7 +41,7 @@
 /obj/item/weapon/gun/bang/attack_hand(mob/user as mob)
 	if(user.get_inactive_hand() == src && fired_gun)
 		src.cut_overlay(bang_flag)
-		user.visible_message("<span class='notice'>You push the flag back into the barrel of \the [src.name].</span>")
+		user.visible_message("<span class='notice'>\The [user] pushes the flag back into the barrel of \the [src.name].</span>", "<span class='notice'>You push the flag back into the barrel of \the [src.name].</span>")
 		fired_gun = 0
 	else
 		return ..()

code/modules/projectiles/projectile/bullets.dm

@@ -135,9 +135,6 @@
 
 /obj/item/projectile/bullet/pistol/strong //revolvers and matebas
 	damage = 60
-	maiming = 1
-	maim_rate = 25
-	maim_type = DROPLIMB_BLUNT
 
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
 	name = "rubber bullet"
@@ -152,8 +149,6 @@
 /obj/item/projectile/bullet/shotgun
 	name = "slug"
 	damage = 60
-	maiming = 1 //To prevent rando headgibbing, it uses the special headgib damage model. Don't get me wrong, it'll still kill the man, but could be cloned.
-	maim_rate = 25
 
 /obj/item/projectile/bullet/shotgun/beanbag		//because beanbags are not bullets
 	name = "beanbag"
@@ -180,9 +175,6 @@
 	pellets = 6
 	range_step = 1
 	spread_step = 10
-	maiming = 1
-	maim_rate = 1 //6% base chance of gib if all pellets hit. Likely to blow limbs at point blank. (As it should be.)
-	maim_type = DROPLIMB_BLUNT
 
 /* "Rifle" rounds */
 

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -4782,7 +4782,7 @@
 	icon_state = "dip_cheese"
 	trash = /obj/item/trash/dipbowl
 	bitesize = 1
-	nutriment_desc = list("cheese dip" = 1)
+	nutriment_desc = list("queso" = 20)
 	center_of_mass = list("x"=16, "y"=16)
 	nutriment_amt = 20
 
@@ -4828,7 +4828,7 @@
 	nachotrans = /obj/item/weapon/reagent_containers/food/snacks/chip/nacho/salsa
 	chiptrans = /obj/item/weapon/reagent_containers/food/snacks/chip/salsa
 	icon_state = "dip_salsa"
-	nutriment_desc = list("salsa" = 1)
+	nutriment_desc = list("salsa" = 20)
 	nutriment_amt = 20
 
 /obj/item/weapon/reagent_containers/food/snacks/dip/guac
@@ -4837,7 +4837,7 @@
 	nachotrans = /obj/item/weapon/reagent_containers/food/snacks/chip/nacho/guac
 	chiptrans = /obj/item/weapon/reagent_containers/food/snacks/chip/guac
 	icon_state = "dip_guac"
-	nutriment_desc = list("guacmole" = 1)
+	nutriment_desc = list("guacmole" = 20)
 	nutriment_amt = 20
 
 //burritos
@@ -4850,6 +4850,11 @@
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
+/obj/item/weapon/reagent_containers/food/snacks/burrito/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 6)
+
+
 /obj/item/weapon/reagent_containers/food/snacks/burrito_vegan
 	name = "vegan burrito"
 	desc = "Tofu, carrots, and cabbage wrapped in a flour tortilla. Those seen with this food object are Valid."
@@ -4861,7 +4866,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/burrito_vegan/Initialize()
 	. = ..()
-	reagents.add_reagent("tofu", 4)
+	reagents.add_reagent("tofu", 6)
 
 /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
 	name = "spicy meat burrito"
@@ -4872,6 +4877,10 @@
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
+/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 6)
+
 /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
 	name = "meat cheese burrito"
 	desc = "Meat and melted cheese wrapped in a flour tortilla. Do not feed to Skrell."
@@ -4881,6 +4890,10 @@
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
+/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 6)
+
 /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy
 	name = "spicy cheese meat burrito"
 	desc = "Meat, melted cheese, and chilis wrapped in a flour tortilla. Medical is north of the washrooms."
@@ -4890,18 +4903,22 @@
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
+/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 6)
+
 /obj/item/weapon/reagent_containers/food/snacks/burrito_hell
 	name = "el diablo"
 	desc = "Meat and an insane amount of chilis packed in a flour tortilla. The chaplain's office is west of the kitchen."
 	icon_state = "burrito_hell"
 	bitesize = 4
 	center_of_mass = list("x"=16, "y"=16)
-	nutriment_desc = list("tortilla" = 6)
-	nutriment_amt = 6
+	nutriment_desc = list("hellfire" = 6)
+	nutriment_amt = 24// 10 Chilis is a lot.
 
 /obj/item/weapon/reagent_containers/food/snacks/burrito_hell/Initialize()
 	. = ..()
-	reagents.add_reagent("protein", 4)
+	reagents.add_reagent("protein", 9)
 	reagents.add_reagent("condensedcapsaicin", 20) //what could possibly go wrong
 
 /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery

html/changelog.html

@@ -56,6 +56,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">24 February 2018</h2>
+			<h3 class="author">BurgerBB updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Improved tortilla and burrito recipies. Dips are also more flavorful.</li>
+			</ul>
+			<h3 class="author">sdtwbaj updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Skrell have a higher chance to get more money.</li>
+			</ul>
+
 			<h2 class="date">11 February 2018</h2>
 			<h3 class="author">Lohikar updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -5141,3 +5141,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       explosions, or mining.
   - tweak: Breaking asteroid floors on the lowest level will now break to openspace/space
       instead of more asteroid.
+2018-02-24:
+  BurgerBB:
+  - tweak: Improved tortilla and burrito recipies. Dips are also more flavorful.
+  sdtwbaj:
+  - rscadd: Skrell have a higher chance to get more money.

html/changelogs/sdtwbaj-skrellmoney.yml

@@ -1,37 +0,0 @@
-################################
-# 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
-#   balance
-#################################
-
-# Your name.  
-author: sdtwbaj
-
-# 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: "Skrell have a higher chance to get more money."