diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 0d83814304e..bcdade96d9b 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/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() . = ..() diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 75856748cda..1b573822bf6 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/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 \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery diff --git a/code/modules/projectiles/guns/bang.dm b/code/modules/projectiles/guns/bang.dm index 0a60c72856c..07046073732 100644 --- a/code/modules/projectiles/guns/bang.dm +++ b/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("You push the flag back into the barrel of \the [src.name].") + user.visible_message("\The [user] pushes the flag back into the barrel of \the [src.name].", "You push the flag back into the barrel of \the [src.name].") fired_gun = 0 else return ..() \ No newline at end of file diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index d9de289a3cb..4ffd8ea3a2d 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/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 */ diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 8488bb51834..a5795b4c9f2 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/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 diff --git a/html/changelog.html b/html/changelog.html index 5cbc3b85d05..80b6a8e812d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,16 @@ -->
+

24 February 2018

+

BurgerBB updated:

+ +

sdtwbaj updated:

+ +

11 February 2018

Lohikar updated: