cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 04:17:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3881, #3965, #4070, #4079 (#4181)

Browse Source 
Overview
Fixes/Tweaks PRs #3881 , #3965 , #4070 , and #4079.

#3881
Auto-Hiss was really bad. There is now a chance that the Dionaea autohiss will actually fully pronounce a word properly. Words like "everything" and "course" are no longer read as "eeeeveeerthing" or "courseeee".

#3965
Poking people with the cane would sometimes cause an excessive amount of blood, so I just removed the damage altogether poke people at your own leisure now.

#4070
Some garbage items had too high of a chance. Hindsight, it's dumb for an arcade machine to vend alcohol. The red space suit replica is also useless and doesn't work really.

#4079
Burritos used a terrible way of mixing chemicals in recipes, so now they have a proper way of transferring chemicals. Burritos now also require more meat, and by extension, are now more filling.
This commit is contained in:
BurgerLUA
2018-01-28 09:48:35 -08:00
committed by Erki
parent 5d5db416c8
commit 596fb2ef85
6 changed files with 100 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+4 -2
View File
@@ -131,7 +131,7 @@
verbtouse = pick("tapped")
else
verbtouse = pick("tapped","poked","prodded","touched")
damageamount *= 0.025
damageamount = 0
if(I_DISARM)
verbtouse = pick("smacked","slapped")
soundname = "punch"
@@ -242,7 +242,9 @@
else
endmessage1st = "You [verbtouse] [selfnoun] with the [name]"
endmessage3rd = "[user] [verbtouse] [noun] with the [name]"
target.standard_weapon_hit_effects(src, user, damageamount, armorpercent, target_zone)
if(damageamount > 0) // Poking will no longer do damage until there is some fix that makes it so that 0.0001 HALLOS doesn't cause bleed.
target.standard_weapon_hit_effects(src, user, damageamount, armorpercent, target_zone)
user.visible_message("<span class='[class]'>[endmessage3rd][punct]</span>", "<span class='[class]'>[endmessage1st][punct]</span>")
user.do_attack_animation(target)
code/game/machinery/computer/arcade.dm
+11 -18
View File
@@ -5,13 +5,12 @@
icon_screen = "invaders"
var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 11,
/obj/item/clothing/under/syndicate/tacticool = 11,
/obj/item/clothing/under/syndicate/tacticool = 5,
/obj/item/toy/sword = 22,
/obj/item/weapon/gun/projectile/revolver/capgun = 11,
/obj/item/toy/crossbow = 11,
/obj/item/clothing/suit/syndicatefake = 11,
/obj/item/weapon/storage/fancy/crayons = 11,
/obj/item/toy/spinningtoy = 22,
/obj/item/toy/spinningtoy = 11,
/obj/item/toy/prize/ripley = 1,
/obj/item/toy/prize/fireripley = 1,
/obj/item/toy/prize/deathripley = 1,
@@ -23,26 +22,24 @@
/obj/item/toy/prize/mauler = 1,
/obj/item/toy/prize/odysseus = 1,
/obj/item/toy/prize/phazon = 1,
/obj/item/toy/waterflower = 11,
/obj/item/toy/waterflower = 5,
/obj/random/action_figure = 11,
/obj/random/plushie = 55,
/obj/item/toy/cultsword = 11,
/obj/item/toy/syndicateballoon = 11,
/obj/item/toy/nanotrasenballoon = 11,
/obj/random/plushie = 44,
/obj/item/toy/cultsword = 5,
/obj/item/toy/syndicateballoon = 5,
/obj/item/toy/nanotrasenballoon = 5,
/obj/item/toy/katana = 11,
/obj/item/toy/bosunwhistle = 11,
/obj/item/toy/bosunwhistle = 5,
/obj/item/weapon/storage/belt/champion = 11,
/obj/item/weapon/pen/invisible = 11,
/obj/item/weapon/pen/invisible = 5,
/obj/item/weapon/grenade/fake = 1,
/obj/item/weapon/bikehorn = 11,
/obj/item/weapon/lipstick/random = 11,
/obj/item/clothing/mask/fakemoustache = 11,
/obj/item/clothing/mask/gas/clown_hat = 11,
/obj/item/clothing/mask/gas/mime = 11,
/obj/item/weapon/gun/energy/wand/toy = 11,
/obj/item/weapon/gun/energy/wand/toy = 5,
/obj/item/device/binoculars = 11,
/obj/item/device/megaphone = 11,
/obj/random/booze = 22
/obj/item/device/megaphone = 11
)
/obj/machinery/computer/arcade/Initialize()
@@ -60,10 +57,6 @@
if(!contents.len)
var/prizeselect = pickweight(prizes)
new prizeselect(src.loc)
if(istype(prizeselect, /obj/item/clothing/suit/syndicatefake)) //Helmet is part of the suit
new /obj/item/clothing/head/syndicatefake(src.loc)
else
var/atom/movable/prize = pick(contents)
prize.loc = src.loc
code/modules/food/recipes_microwave.dm
+18 -14
View File
@@ -905,7 +905,7 @@ I said no!
/datum/recipe/tortila
reagents = list("flour" = 5,"sodiumchloride" = 1,"water" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/tortilla
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE //no flour
/datum/recipe/taconew
items = list(
@@ -921,7 +921,6 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/tortilla
)
result = /obj/item/weapon/reagent_containers/food/snacks/chipplate
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/nachos
items = list(
@@ -934,7 +933,7 @@ I said no!
fruit = list("chili" = 1, "tomato" = 1, "lime" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/dip/salsa
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/guac
fruit = list("chili" = 1, "lime" = 1)
@@ -943,7 +942,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/dip/guac
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/cheesesauce
fruit = list("chili" = 1, "tomato" = 1)
@@ -952,16 +951,17 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/dip
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/burrito
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball
)
reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/burrito_vegan
fruit = list("carrot" = 1, "cabbage" = 1)
@@ -971,55 +971,59 @@ I said no!
)
reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_vegan
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/burrito_spicy
fruit = list("chili" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball
)
reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/burrito_cheese
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/burrito_cheese_spicy
fruit = list("chili" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/burrito_hell
fruit = list("chili" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball
)
reagents = list("spacespice" = 1, "phoron" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_hell
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE //No phoron please.
/datum/recipe/burrito_mystery
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
)
reagents = list("phoron" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery
code/modules/mob/living/autohiss.dm
+7 -7
View File
@@ -92,15 +92,15 @@
autohiss_extender = "..."
autohiss_basic_map = list(
"s" = list("ss","sss"),
"z" = list("zz","zzz"),
"e" = list("ee", "eee")
"s" = list("s","ss","sss"),
"z" = list("z","zz","zzz"),
"ee" = list("ee","eee")
)
autohiss_extra_map = list(
"a" = list("aa", "aaa"),
"i" = list("ii", "iii"),
"o" = list("oo", "ooo"),
"u" = list("uu", "uuu")
"a" = list("a","aa", "aaa"),
"i" = list("i","ii", "iii"),
"o" = list("o","oo", "ooo"),
"u" = list("u","uu", "uuu")
)
autohiss_exempt = list(
LANGUAGE_ROOTSONG
code/modules/reagents/reagent_containers/food/snacks.dm
+20 -111
View File
@@ -4642,11 +4642,6 @@
center_of_mass = list("x"=16, "y"=16)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/tortilla/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
//chips
/obj/item/weapon/reagent_containers/food/snacks/chip
name = "chip"
@@ -4655,13 +4650,9 @@
var/bitten_state = "chip_half"
bitesize = 1
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla chips" = 1)
nutriment_desc = list("nacho chips" = 1)
nutriment_amt = 2
/obj/item/weapon/reagent_containers/food/snacks/chip/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 0.1)
/obj/item/weapon/reagent_containers/food/snacks/chip/On_Consume(mob/M as mob)
if(reagents && reagents.total_volume)
icon_state = bitten_state
@@ -4716,14 +4707,10 @@
icon_state = "chip_basket"
trash = /obj/item/trash/chipbasket
var/vendingobject = /obj/item/weapon/reagent_containers/food/snacks/chip
nutriment_desc = list("tortilla chips" = 1)
nutriment_desc = list("tortilla chips" = 10)
bitesize = 1
nutriment_amt = 10
/obj/item/weapon/reagent_containers/food/snacks/chipplate/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
/obj/item/weapon/reagent_containers/food/snacks/chipplate/attack_self(mob/user as mob)
var/obj/item/weapon/reagent_containers/food/snacks/returningitem = new vendingobject(loc)
returningitem.reagents.clear_reagents()
@@ -4745,14 +4732,9 @@
icon_state = "nachos"
trash = /obj/item/trash/plate
vendingobject = /obj/item/weapon/reagent_containers/food/snacks/chip/nacho
nutriment_desc = list("tortilla chips" = 1)
nutriment_desc = list("tortilla chips" = 10)
bitesize = 1
nutriment_amt = 20
/obj/item/weapon/reagent_containers/food/snacks/chipplate/nachos/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("cheese", 10)
nutriment_amt = 10
//dips
/obj/item/weapon/reagent_containers/food/snacks/dip
@@ -4763,14 +4745,9 @@
icon_state = "dip_cheese"
trash = /obj/item/trash/dipbowl
bitesize = 1
nutriment_desc = list("seasoning" = 1)
nutriment_desc = list("cheese dip" = 1)
center_of_mass = list("x"=16, "y"=16)
nutriment_amt = 3
/obj/item/weapon/reagent_containers/food/snacks/dip/Initialize()
. = ..()
reagents.add_reagent("cheese", 12)
reagents.add_reagent("tomatojuice", 5)
nutriment_amt = 20
/obj/item/weapon/reagent_containers/food/snacks/dip/attackby(obj/item/weapon/reagent_containers/food/snacks/item as obj, mob/user as mob)
. = ..()
@@ -4814,12 +4791,8 @@
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"
/obj/item/weapon/reagent_containers/food/snacks/dip/salsa/Initialize()
. = ..()
reagents.add_reagent("tomatojuice", 10)
reagents.add_reagent("capsaicin", 5)
reagents.add_reagent("water", 2)
nutriment_desc = list("salsa" = 1)
nutriment_amt = 20
/obj/item/weapon/reagent_containers/food/snacks/dip/guac
name = "guac dip"
@@ -4827,13 +4800,8 @@
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("seasoning" = 1)
/obj/item/weapon/reagent_containers/food/snacks/dip/guac/Initialize()
. = ..()
reagents.add_reagent("tofu", 10)
reagents.add_reagent("capsaicin", 5)
reagents.add_reagent("limejuice", 2)
nutriment_desc = list("guacmole" = 1)
nutriment_amt = 20
//burritos
/obj/item/weapon/reagent_containers/food/snacks/burrito
@@ -4842,21 +4810,17 @@
icon_state = "burrito"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla" = 1)
nutriment_desc = list("tortilla" = 6)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
/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."
icon_state = "burrito_vegan"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla" = 1, "lettuce" = 1, "carrot" = 1)
nutriment_amt = 12
nutriment_desc = list("tortilla" = 6)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_vegan/Initialize()
. = ..()
@@ -4868,50 +4832,34 @@
icon_state = "burrito_spicy"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla" = 1)
nutriment_desc = list("tortilla" = 6)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("capsaicin", 4)
/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."
icon_state = "burrito_cheese"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla" = 1)
nutriment_desc = list("tortilla" = 6)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("cheese", 4)
/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."
icon_state = "burrito_cheese_spicy"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla" = 1)
nutriment_desc = list("tortilla" = 6)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("cheese", 4)
reagents.add_reagent("capsaicin", 4)
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell
name = "el diablo"
desc = "Meat and a fuckload of chilis packed in a flour tortilla. The chaplain's office is west of the kitchen."
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" = 1)
nutriment_desc = list("tortilla" = 6)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell/Initialize()
@@ -4925,44 +4873,5 @@
icon_state = "burrito_mystery"
bitesize = 5
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("regret" = 1)
nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_mystery/Initialize()
reagents.add_reagent("protein", 4)
. = ..()
switch(rand(1,10))
if(1)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
if(2)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("frostoil", 3)
reagents.add_reagent("tomatojuice", 2)
if(3)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("water", 5)
reagents.add_reagent("tricordrazine", 5)
if(4)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("water", 10)
if(5)
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("banana", 10)
if(6)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("blood", 10)
if(7)
reagents.add_reagent("slimejelly", 10)
reagents.add_reagent("water", 10)
if(8)
reagents.add_reagent("carbon", 10)
reagents.add_reagent("toxin", 10)
if(9)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("tomatojuice", 10)
if(10)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
nutriment_desc = list("regret" = 6)
nutriment_amt = 6
html/changelogs/burgerbb-fixes.yml
+40
View File
@@ -0,0 +1,40 @@
################################
# 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: BurgerBB
# 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: "Poking people with a cane no longer causes blood to fly everywhere."
- tweak: "Tweaked Arcade Machine droprates so they're less depressing."
- tweak: "Tweaked burito recipies to use more meatballs, and as well use a new nutrition algorithm."
- tweak: "Tweaked dionaea autohiss to be less annoying."