25 Commits

Author	SHA1	Message	Date
Ron	5de06206e7	More bug fixes (#2305) ... Fixes #2296 Fixes #1904 Fixes #2303 Fixes #2285 Fixes #1753 Fixes #1649 Fixes #789 Fixes #1779	2017-05-20 18:41:26 +03:00
Alberyk	edfe3c235a	Fix forks being an infinite source of food (#1559) ... This should fix forks being broken as fuck and you able to eat from them forever. also, spoons aren't sharp anymore. Also, this ports the baystation fix to neckgrabs always flooring people, and makes resisting out of grabs when you are weakened a bit more harder. Fix the lack of delay when attacking a ninja nest Carp now have a chance of staying after their event ends	2017-01-14 12:36:00 +02:00
NanakoAC	6cef8c9074	Attack Proc fixes (#1259) ... Baymerge changed the attack proc, i think by removing a default value, and a lot of things broke because they weren't using the function correctly. This proc does three main things. Adds a default to /obj/item/proc/attack to target the chest when no target zone is supplied. Fixes the lack of a target zone in many attack procs, properly defining it so it'll get passed to the parent, and ensure that bodypart-specific targeting works. Removes most instances of code to retrieve the user's selected zone, and instead to use the zone passed into the attack function. saves duplication of effort.	2016-12-24 03:34:23 +02:00
skull132	e9b688e1f6	Merge branch 'development-2' into development ... Christ on a stick. SO MANY ERRORS. REEE. # Conflicts: # baystation12.dme # code/_helpers/lists.dm # code/_helpers/logging.dm # code/_helpers/text.dm # code/_onclick/click.dm # code/controllers/configuration.dm # code/controllers/master_controller.dm # code/datums/supplypacks.dm # code/game/antagonist/antagonist.dm # code/game/antagonist/antagonist_print.dm # code/game/antagonist/outsider/commando.dm # code/game/antagonist/outsider/ninja.dm # code/game/area/areas.dm # code/game/gamemodes/cult/cult_items.dm # code/game/gamemodes/game_mode.dm # code/game/jobs/access.dm # code/game/machinery/atmoalter/canister.dm # code/game/machinery/autolathe.dm # code/game/machinery/doors/airlock.dm # code/game/machinery/recharger.dm # code/game/machinery/suit_storage_unit.dm # code/game/mecha/mech_fabricator.dm # code/game/mecha/mecha.dm # code/game/objects/effects/spiders.dm # code/game/objects/items.dm # code/game/objects/items/devices/PDA/PDA.dm # code/game/objects/items/devices/flash.dm # code/game/objects/items/devices/lightreplacer.dm # code/game/objects/items/devices/paicard.dm # code/game/objects/items/devices/scanners.dm # code/game/objects/items/devices/suit_cooling.dm # code/game/objects/items/devices/uplink.dm # code/game/objects/items/robot/robot_upgrades.dm # code/game/objects/items/toys.dm # code/game/objects/items/weapons/cards_ids.dm # code/game/objects/items/weapons/handcuffs.dm # code/game/objects/items/weapons/manuals.dm # code/game/objects/items/weapons/material/kitchen.dm # code/game/objects/items/weapons/material/misc.dm # code/game/objects/items/weapons/material/swords.dm # code/game/objects/items/weapons/melee/energy.dm # code/game/objects/items/weapons/melee/misc.dm # code/game/objects/items/weapons/scrolls.dm # code/game/objects/items/weapons/storage/belt.dm # code/game/objects/items/weapons/stunbaton.dm # code/game/objects/items/weapons/tools.dm # code/game/objects/objs.dm # code/game/objects/structures/crates_lockers/closets.dm # code/game/objects/structures/crates_lockers/closets/secure/security.dm # code/game/objects/structures/janicart.dm # code/game/sound.dm # code/game/turfs/simulated.dm # code/game/verbs/ooc.dm # code/global.dm # code/modules/admin/verbs/debug.dm # code/modules/admin/verbs/modifyvariables.dm # code/modules/client/client procs.dm # code/modules/client/preferences.dm # code/modules/clothing/clothing.dm # code/modules/clothing/head/hardhat.dm # code/modules/clothing/head/helmet.dm # code/modules/clothing/head/jobs.dm # code/modules/clothing/head/misc_special.dm # code/modules/clothing/shoes/jobs.dm # code/modules/clothing/spacesuits/alien.dm # code/modules/clothing/spacesuits/captain.dm # code/modules/clothing/spacesuits/miscellaneous.dm # code/modules/clothing/spacesuits/rig/rig_pieces.dm # code/modules/clothing/spacesuits/rig/suits/alien.dm # code/modules/clothing/spacesuits/spacesuits.dm # code/modules/clothing/spacesuits/void/merc.dm # code/modules/clothing/spacesuits/void/void.dm # code/modules/clothing/suits/armor.dm # code/modules/clothing/suits/jobs.dm # code/modules/clothing/suits/storage.dm # code/modules/clothing/suits/utility.dm # code/modules/clothing/suits/wiz_robe.dm # code/modules/clothing/under/jobs/security.dm # code/modules/economy/Events.dm # code/modules/economy/Events_Mundane.dm # code/modules/economy/economy_misc.dm # code/modules/events/blob.dm # code/modules/events/event.dm # code/modules/events/event_container.dm # code/modules/events/event_manager.dm # code/modules/events/money_lotto.dm # code/modules/events/prison_break.dm # code/modules/events/spacevine.dm # code/modules/hydroponics/trays/tray.dm # code/modules/mob/dead/observer/observer.dm # code/modules/mob/emote.dm # code/modules/mob/holder.dm # code/modules/mob/language/station.dm # code/modules/mob/living/bot/cleanbot.dm # code/modules/mob/living/carbon/alien/diona/diona.dm # code/modules/mob/living/carbon/alien/diona/diona_attacks.dm # code/modules/mob/living/carbon/give.dm # code/modules/mob/living/carbon/human/emote.dm # code/modules/mob/living/carbon/human/human.dm # code/modules/mob/living/carbon/human/human_defense.dm # code/modules/mob/living/carbon/human/inventory.dm # code/modules/mob/living/carbon/human/life.dm # code/modules/mob/living/carbon/human/species/outsider/vox.dm # code/modules/mob/living/carbon/human/species/station/golem.dm # code/modules/mob/living/carbon/human/species/station/station.dm # code/modules/mob/living/carbon/human/update_icons.dm # code/modules/mob/living/carbon/metroid/metroid.dm # code/modules/mob/living/living.dm # code/modules/mob/living/living_defense.dm # code/modules/mob/living/living_defines.dm # code/modules/mob/living/silicon/ai/ai.dm # code/modules/mob/living/silicon/pai/admin.dm # code/modules/mob/living/silicon/pai/pai.dm # code/modules/mob/living/silicon/robot/drone/drone.dm # code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm # code/modules/mob/living/silicon/robot/emote.dm # code/modules/mob/living/silicon/robot/robot_items.dm # code/modules/mob/living/silicon/robot/robot_modules.dm # code/modules/mob/living/silicon/silicon.dm # code/modules/mob/living/simple_animal/bees.dm # code/modules/mob/living/simple_animal/friendly/cat.dm # code/modules/mob/living/simple_animal/friendly/corgi.dm # code/modules/mob/living/simple_animal/friendly/farm_animals.dm # code/modules/mob/living/simple_animal/friendly/mouse.dm # code/modules/mob/living/simple_animal/friendly/spiderbot.dm # code/modules/mob/living/simple_animal/hostile/hostile.dm # code/modules/mob/living/simple_animal/simple_animal.dm # code/modules/mob/logout.dm # code/modules/mob/mob.dm # code/modules/mob/mob_grab_specials.dm # code/modules/mob/mob_helpers.dm # code/modules/mob/new_player/sprite_accessories.dm # code/modules/organs/organ.dm # code/modules/organs/organ_alien.dm # code/modules/organs/organ_external.dm # code/modules/paperwork/faxmachine.dm # code/modules/projectiles/ammunition/boxes.dm # code/modules/projectiles/ammunition/bullets.dm # code/modules/projectiles/guns/energy/nuclear.dm # code/modules/projectiles/guns/energy/rifle.dm # code/modules/projectiles/guns/energy/special.dm # code/modules/projectiles/guns/projectile.dm # code/modules/projectiles/guns/projectile/automatic.dm # code/modules/projectiles/guns/projectile/pistol.dm # code/modules/projectiles/guns/projectile/revolver.dm # code/modules/projectiles/guns/projectile/shotgun.dm # code/modules/projectiles/projectile/bullets.dm # code/modules/projectiles/projectile/special.dm # code/modules/reagents/reagent_containers.dm # code/modules/reagents/reagent_containers/food/drinks.dm # code/modules/research/designs.dm # code/modules/research/destructive_analyzer.dm # code/modules/research/rdconsole.dm # code/modules/spells/artifacts.dm # code/modules/spells/spellbook.dm # code/modules/tables/tables.dm # code/world.dm # config/example/config.txt # icons/mob/items_lefthand.dmi # icons/mob/items_righthand.dmi # icons/obj/lighting.dmi	2016-10-31 00:01:52 +02:00
SoundScopes	893398104f	SoundScopes' bugfixes - 01SEP2016 (#848)	2016-09-01 20:45:18 +02:00
Zuhayr	cc4c86c995	Fixes #270	2016-01-14 08:37:10 +01:00
PsiOmegaDelta	f6eec096e7	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/_onclick/click.dm code/game/objects/items/weapons/material/kitchen.dm code/modules/mob/living/silicon/ai/ai.dm	2015-12-20 11:55:53 +01:00
PsiOmegaDelta	c78f98754a	Utensils now respect the lack of mouths, and has a delay on feeding others.	2015-12-20 11:46:42 +01:00
PsiOmegaDelta	5d3d0c5dc3	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/game/objects/items/weapons/material/kitchen.dm	2015-12-20 11:22:08 +01:00
Spamcat	905070bc96	\the	2015-12-16 20:30:26 +03:00
Spamcat	8df6ee3318	\red >> styles	2015-12-16 20:21:10 +03:00
Spamcat	485a2fdd45	Made kitchen utensils less dangerous. ... #11370	2015-12-16 20:07:35 +03:00
Zuhayr	0b8125d30b	Added boot knives and putting a knife in your boot.	2015-12-01 02:05:29 +10:30
PsiOmegaDelta	e37394e8fa	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/modules/mob/living/carbon/human/human_helpers.dm code/modules/reagents/reagent_containers/food/snacks.dm	2015-10-25 20:28:48 +01:00
PsiOmegaDelta	d845a2f587	Generalizes the feed and force feed checks.	2015-10-23 10:57:55 +02:00
PsiOmegaDelta	8305404a14	Can no longer use utensils to eat if you lack the means. ... Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly. Fixes #11333.	2015-10-22 16:52:07 +02:00
mwerezak	af52b475ff	Fixes missing cooldowns, missing cult blade sound.	2015-09-09 15:15:43 -04:00
mwerezak	068d02c28c	Refactors various item attack() implementations ... Replaced some attack() overrides with apply_hit_effect() or other attack procs where appropriate. Removed the attack() override from reagent_containers.	2015-09-08 23:39:33 -04:00
PsiOmegaDelta	9b4d09c974	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/_helpers/unsorted.dm code/game/objects/items/weapons/RCD.dm code/game/objects/items/weapons/grenades/emgrenade.dm code/modules/clothing/spacesuits/rig/rig_attackby.dm	2015-07-11 10:58:49 +02:00
mwerezak	01104eda45	Fixes utensil force dividers. ... Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.	2015-07-08 01:37:07 -04:00
GinjaNinja32	c77605265c	code/game/objects, code/game/machinery merge fix	2015-06-02 20:18:45 +01:00
Zuhayr	ed34aa2466	Rebalancing and adjusting divisors for all weapon damage values.	2015-05-17 16:51:55 +09:30
Zuhayr	b8ca15f541	Tweaks/fixes and greyscale icons.	2015-05-17 00:07:29 +09:30
Zuhayr	150b24023e	Renamed kitchen utensils.	2015-05-16 21:24:36 +09:30
Zuhayr	f27ddd548f	Restructuring a bunch of files in prep for widespread path changes.	2015-05-16 20:09:28 +09:30