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
Alberyk
38a0033b2e
Fixing compile errors ( #8 )
...
* Fixing more errors
* Update baystation12.int
2016-11-12 12:47:43 +02:00
skull132
ee68f3c9d0
Final merge
...
Merge branch 'development-2' into development
# Conflicts:
# baystation12.dme
# code/_helpers/icons.dm
# code/controllers/master_controller.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/computer3/laptop.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/floorlayer.dm
# code/game/machinery/vending.dm
# code/game/mecha/mech_fabricator.dm
# code/game/objects/effects/decals/contraband.dm
# code/game/objects/explosion.dm
# code/game/objects/items/robot/robot_upgrades.dm
# code/game/objects/items/weapons/melee/misc.dm
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/window.dm
# code/modules/clothing/spacesuits/rig/rig.dm
# code/modules/clothing/suits/jobs.dm
# code/modules/mob/freelook/update_triggers.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/human_movement.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/mob_movement.dm
# code/modules/projectiles/ammunition/boxes.dm
# nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +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
LordFowl
1062b03eee
Runtime v. Mouse + Head-spears ( #1083 )
...
Fixes runtimes in mousegun and beegun, fixes head-spear issues.
2016-10-29 21:30:31 +03:00
Alberyk
479666a47d
Random maint loot and miscellaneous things ( #1052 )
...
Things done:
Created several random objects, that can be used to randomize loot in the maint or other places. Several items, some rare things and other random useful or not objects.
Added a svd gun with its own snowflakness, to replace the heister's lwap, but, they will get an extra energy gun to compesate.
Added tracksuits, stunrod, new sprite for the rapier, a new sword flavor and the old cane sword.
Changed the heister ship armory; two random melee weapons, the dragunov with an extra mag and a random energy gun.
Changed the chances of ghetto guns going bad.
Replaced the carbines in the ert area with energy pistols, so, they can make use of the holsters.
Clumsy people may have trouble with glowsticks now.
2016-10-26 20:29:38 +03:00
Alberyk
04fbeddf36
Compile errors round 2 by Alberyk ( #3 )
2016-10-15 21:53:09 +03:00
skull132
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
Alberyk
664ab2a532
Fixing species restrictions on space suits ( #947 )
...
vaurca can now wear the ninja rig suit
vaurca can wear softsuits, but not hardsuits anymore, with the exception of the mercenary one
fixing trench knives being able to parry attacks like regular swords
2016-09-18 23:28:29 +03:00
SoundScopes
893398104f
SoundScopes' bugfixes - 01SEP2016 ( #848 )
2016-09-01 20:45:18 +02:00
Alberyk
3e6fc26ecc
Replacing nyx references with tau ceti ( #818 )
...
What it says in the title, removing all references of nyx and replacing them with the canon system, tau ceti.
2016-08-27 18:24:59 +02:00
Alberyk
7beb19e21d
Increasing the robutness of swords ( #753 )
...
Regular swords and cult swords won't get stuck into people anymore.
2016-08-15 14:19:30 +03:00
Alberyk
8428a94b99
Adding chainswords and more blades ( #534 )
...
Chainswords can be turned on and off, with sprite and damage changes. Also, adding more swords, with some flavor and stats differences.
Swords cannot go inside bags anymore.
2016-07-11 16:48:17 +03:00
LordFowl
56e288e910
Vaurca Content 2 ( #426 )
...
Vaurca hivemind language added.
Vaurca appropriate name generator added.
Tied Vaurca language to their neural socket organ.
Added a method for non-Vaurca to intercept the Vaurca hivenet so long as they construct the correct item.
Sprites for Vaurca organs.
Neutered all Vaurca.
Cutting open a Vaurca for surgery now requires heavier equipment.
Injecting a Vaurca with a syringe now will take time.
Adds various Vaurca cosmetic items available via loadout.
Adds a few new burst-fire weapons exploiting the burstfire fix - obtainable via research or adminbus.
Ports the ability to stick heads on spears from Paradise-code.
Added an error message when trying to bite someone before the cooldown expires.
Removed spoken Vaurca language.
Heavily nerfed K'ois' properties.
Halved the nutrition value of nutriment, returning it to old-code state.
Nerfed the damage dealt by bite, while reducing the cooldown.
Fixed burstfire weapons spamming attack messages when fired, allowing for more automatic weapons.
Fixed Vaurca player ability to select coloured eyes.
2016-06-24 14:55:44 +03:00
Alberyk
36cacd28a4
Gun update ( #387 )
...
This pull adds bolt actions rifles, they are like pump shotguns, with the capacity for 5 7.62mm bullets.
Also adds a 7.62mm clip in the hacked autolathe. Raiders have a chance to spawn with one.
2016-06-23 02:16:57 +03:00
Lord Lag
edbec1962f
Fixes #263 , #235 . Tweaks ED
...
Asides from two small bugfixes, adjusts Emergency Doors.
2016-04-17 14:09:31 +01:00
Zuhayr
cc4c86c995
Fixes #270
2016-01-14 08:37:10 +01:00
Ccomp5950
7dc9b3487a
Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
...
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05: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
PsiOmegaDelta
1a8fc50f1e
Removes suicide code.
2015-12-14 15:57:56 +01:00
Zuhayr
0b8125d30b
Added boot knives and putting a knife in your boot.
2015-12-01 02:05:29 +10:30
Zuhayr
09e4749a9c
Bats can now be slung over your back.
2015-11-20 19:36:27 +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
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
PsiOmegaDelta
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
mwerezak
a8263e979f
Fixes missing ..()
2015-09-09 13:22:17 -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
Chinsky
72d768808a
Merge pull request #10110 from mwerezak/shields
...
Better shield handling
2015-09-03 20:38:48 +03:00
PsiOmega
6165b6fee3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/material/shards.dm
2015-08-30 10:23:14 +02:00
PsiOmegaDelta
88250ad57f
Merge pull request #10939 from Baystation12/master
...
Dev-freeze
2015-08-30 10:20:32 +02:00
PsiOmega
22262507b9
Only living mobs now trigger shrapnel.
...
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
2015-08-29 10:03:58 +02:00
mwerezak
db8aefb121
Refactors duplicate parry code
2015-08-28 14:39:28 -04:00
HarpyEagle
df3eeb891e
Fixes dead people blocking stuff with shields.
2015-08-26 11:51:04 -04:00
mwerezak
fb6b94de87
Incorporates laser reflection into the shield system
2015-08-26 10:39:54 -04:00
mwerezak
0a751322e3
Rewrites shield handling
...
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
2015-08-26 10:39:31 -04:00
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
mwerezak
2cb46e035c
Removes unused obj flags and fixes overlapping flags
...
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
2015-08-18 17:08:41 -04:00
HarpyEagle
c136bd47cc
Improves shard-stepping
2015-08-18 17:01:39 -04:00
PsiOmega
e875a7ce48
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
HarpyEagle
fc7e89380e
More material renames
...
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
mwerezak
e3609bac94
Adds common proc to obtain the material of an object
...
Adds a common get_material() proc to objects, and implements overrides
where applicable
2015-08-01 23:03:21 -04:00
PsiOmegaDelta
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
