Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
mwerezak
a6c31bc5e8
Fixes xbow tension not being rest when fired
2014-08-07 17:06:01 -04:00
Zuhayr
57b790ad92
Merging.
2014-07-25 22:50:35 +09:30
Zuhayr
d02e370830
Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
2014-07-21 19:02:38 +09:30
mwerezak
f2845dbe76
Thrown items can be targeted, has miss chance...
...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
mwerezak
1b33ca943d
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
Zuhayr
5e682668b2
Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
2014-05-10 02:10:06 +09:30
Mike
f3b0ee8a43
Fixes #4856
...
Shotgun pumping not playing
2014-04-30 10:38:30 -04:00
Zuhayr
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
Chinsky
3f3ae1fad6
Rocket launchers shouldn't probably fit on belt
2013-12-28 16:25:49 +04:00
DJSnapshot
1f5e278aa6
Added Sue's new weapon code and sprites.
2013-12-27 16:44:44 -08:00
Chinsky
6630a046c9
Merge pull request #4095 from DJSnapshot/dev-freeze
...
Misc Fixes to guns
2013-12-23 04:38:44 -08:00
DJSnapshot
2f0b5e31f4
Fix so magazines read correctly on the Colt M1911.
...
Also notice for when the clip falls out.
2013-12-21 22:58:24 -08:00
Chinsky
09efeaea5c
Fixed detective semiauto turning wrong caliber when screwdrived.
2013-12-17 22:32:23 +04:00
Chinsky
83d1924b83
Commiting SueTheCake's detective things.
...
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
2013-11-27 04:10:06 +04:00
Mloc-Argent
a1f55a50b1
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Hopefully done right this time.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 20:27:39 +01:00
Erthilo
5d1c4548fa
Cell.use checks instead of just minuses. Yay for code!
2013-09-01 00:16:11 +01:00
Segrain
292b04399c
Doublesuperheating fix.
2013-08-08 02:43:23 +03:00
comma
bdaeb2c6fb
Adds fire delay to all weapons (except automatics).
...
For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
Shotungs do not get special delay because they are slow as they are anyway.
Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.
2013-07-10 21:19:21 +04:00
Zuhayr
94c3c7ef49
Armalis additions, tweaks.
2013-06-16 13:17:20 -07:00
Zuhayr
23299809f6
Armalis sprites, simple animal/mob yank-out verb and embedding.
2013-06-16 00:38:40 -07:00
Zuhayr
5c15ce687c
SHUT UP SPAMCAT. Bow fix, vox raider message fix.
2013-06-15 14:18:40 -07:00
Zuhayr
b41b1fc2f3
Armalis simple_animal/sprite.
2013-06-15 04:09:49 -07:00
Zuhayr
3cb36272cb
Adjusted yank verb to apply to others as well as yourself.
2013-06-13 22:18:26 -07:00
Zuhayr
6b73b8ec2f
Adjusted kitchen knives. Added projectile pinning. Various tweaks.
2013-06-13 20:46:09 -07:00
Zuhayr
4aa577bef3
Powered crossbows, sprites, ammo.
2013-06-13 15:31:47 -07:00
Zuhayr
c57f2bb137
Polished off some pneumatic cannon bugs. All done.
2013-06-11 12:19:20 -07:00
Zuhayr
96d9a41ea7
Pneumatic cannon sprites, gas loss code.
2013-06-11 00:57:15 -07:00
Zuhayr
98d31e9191
Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)
2013-06-10 22:35:01 -07:00
MagmaRam
db07fd16fd
Fixes an issue where an uzi could not be reloaded, they can now be reloaded with boxes of .45 bullets.
2013-05-30 18:54:31 +07:00
jediluke69
85eb0f1224
Adds new drinks and fixes a few things
2013-04-24 18:49:01 -04:00
Whitellama
5d090b0611
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest
...
Conflicts:
code/WorkInProgress/Cib/amorph/amorph_hud.dm
code/game/objects/structures/window.dm
code/modules/mob/living/blob/blob.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob_defines.dm
code/modules/mob/screen.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/tgstation.2.0.9.1.dmm
2013-01-31 14:26:58 -08:00
Cael_Aislinn
351e6d490c
empty guns play a "click" sound
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-21 18:47:36 +10:00
Cael_Aislinn
bdeb96b7e5
Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/__HELPERS/game.dm
code/controllers/shuttle_controller.dm
code/datums/datumvars.dm
code/datums/supplypacks.dm
code/defines/obj/storage.dm
code/defines/obj/vending.dm
code/defines/obj/weapon.dm
code/defines/procs/command_alert.dm
code/game/area/Space Station 13 areas.dm
code/game/atoms.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/dust.dm
code/game/gamemodes/events/miniblob.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/factions.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/jobs/access.dm
code/game/jobs/job/assistant.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/engineering.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/jobs/job_controller.dm
code/game/machinery/alarm.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/message.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/constructable_frame.dm
code/game/machinery/doors/door.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/newscaster.dm
code/game/machinery/recharger.dm
code/game/machinery/spaceheater.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/working/ripley.dm
code/game/objects/items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/flashlight.dm
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/medical.dm
code/game/objects/items/weapons/cards_ids.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/hydroponics.dm
code/game/objects/items/weapons/manuals.dm
code/game/objects/items/weapons/secstorage/secstorage.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/storage/firstaid.dm
code/game/objects/items/weapons/storage/kit.dm
code/game/objects/items/weapons/storage/storage.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/electricchair.dm
code/game/objects/structures/extinguisher.dm
code/game/objects/structures/watercloset.dm
code/game/objects/weapons.dm
code/game/turfs/turf.dm
code/game/vehicles/airtight/airtight.dm
code/game/vehicles/vehicle.dm
code/global.dm
code/modules/DetectiveWork/evidence.dm
code/modules/admin/IsBanned.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/admin/verbs/getlogs.dm
code/modules/client/preferences.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/critters/critter_defenses.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/Hallucination.dm
code/modules/food/recipes_microwave.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.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/silicon/ai/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/power/cable.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/revolver.dm
code/modules/projectiles/projectile/change.dm
code/modules/projectiles/projectile/special.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/hypospray.dm
code/modules/recycling/sortingmachinery.dm
code/modules/research/designs.dm
config/config.txt
html/changelog.html
icons/mob/head.dmi
icons/mob/hud.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
icons/obj/grenade.dmi
icons/obj/projectiles.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 22:12:31 +10:00
Cael_Aislinn
aae42d928a
Merge branch 'incremental_tg' r5200 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/__HELPERS/type2type.dm
code/__HELPERS/unsorted.dm
code/datums/datumvars.dm
code/datums/disease.dm
code/datums/organs/organ_external.dm
code/datums/supplypacks.dm
code/defines/obj.dm
code/game/area/areas.dm
code/game/atoms.dm
code/game/gamemodes/cult/cult_structures.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/hud.dm
code/game/jobs/access.dm
code/game/jobs/job/civilian.dm
code/game/machinery/alarm.dm
code/game/machinery/cloning.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/medical.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/objects/effects/decals/contraband.dm
code/game/objects/effects/signs.dm
code/game/objects/items/devices/PDA/PDA.dm
code/game/objects/items/devices/PDA/cart.dm
code/game/objects/items/weapons/photography.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/window.dm
code/game/sound.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/DetectiveWork/evidence.dm
code/modules/DetectiveWork/footprints_and_rag.dm
code/modules/DetectiveWork/scanner.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/admin/verbs/adminpm.dm
code/modules/awaymissions/gateway.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/client/preferences.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mint.dm
code/modules/mining/ores_coins.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/say.dm
code/modules/mob/mob.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/mob/new_player/login.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/savefile.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/setup.dm
code/unused/mining/datum_processing_recipe.dm
code/unused/powerarmor/powerarmor.dm
code/world.dm
html/changelog.html
icons/effects/96x96.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/hydroponics.dmi
icons/obj/items.dmi
icons/turf/areas.dmi
icons/turf/walls.dmi
maps/RandomZLevels/fileList.txt
maps/RandomZLevels/spacebattle.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 00:23:22 +10:00
Chinsky
24a02f90b9
Ported coats pockets
2013-01-04 05:31:14 +04:00
Cael_Aislinn
31349fb7d3
Merge branch 'incremental_tg' r5067 into bs12_with_tgport
...
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)
Conflicts:
baystation12.dme
code/__HELPERS/type2type.dm
code/controllers/configuration.dm
code/datums/datumvars.dm
code/datums/helper_datums/getrev.dm
code/defines/obj.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job_controller.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/card.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/turrets.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/turfs/turf.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/holder2.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/assembly/igniter.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/jobs.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/reagents/Chemistry-Machinery.dm
code/setup.dm
code/stylesheet.dm
code/world.dm
config/admins.txt
config/config.txt
html/changelog.html
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
icons/turf/areas.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 14:13:11 +10:00
petethegoat@gmail.com
dde9d121a2
Fixes issue 1154. Slime Jam Not Appearing
...
Nerfed the janicart ricochet chance a bit.
Removed the coolness check from the det revolver.
Removed the det revolver from the map, and made it spawn in his locker.
You can now modify the det revolver to fire .357 with a screwdriver.
Fixed the det revolver having one round too many. S&W Model 10 only has six shots.
Updated some guncode, mostly just adding proper text styles.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5297 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-11 22:01:25 +00:00
Whitellama
90235adbc1
WIP Guncode
2012-12-09 17:12:59 -08:00
Kortgstation@gmail.com
0c4f441cb5
Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 04:12:22 +00:00
petethegoat@gmail.com
dbd759477e
Improved window code, mostly formatting and styles, but also general improvements.
...
I've tested it a fair bit, but there may be bugs, so please report those if you run into them.
Added an ismetroidadult() helper
Improved L6 code.
Made the syndie shuttle console impervious to bullets.
Made mirrors breakable.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5187 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 17:09:38 +00:00
petethegoat@gmail.com
fd9f6490f1
Updated listeningpost.dmm to look nicer and be a bit more interesting.
...
Updated the Stechtkov pistol. Should be pretty solid now.
Made a returning ex_act for snow floors.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5182 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 17:38:24 +00:00
Whitellama
900b931c34
Readded Xenobiology shuttle, readded combat shotguns to armoury (with beanbag shells), Removed Roboticist's access from command-clearance tech storage
2012-11-21 04:00:31 -08:00
petethegoat@gmail.com
c6b8a3b009
Fixed some L6 issues.
...
Added a pistol that can be silenced for future nuke op use.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5138 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 18:57:14 +00:00
petethegoat@gmail.com
ee66c32bd0
Updated the L6.
...
Fixes issue 1095. L6 Icons bugged after reload
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5089 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 18:52:41 +00:00
Kortgstation@gmail.com
a38b22fb70
Fixed the invisible ammo for the SAW.
...
Made the SAW not fit in bags.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5038 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 09:06:36 +00:00
Kortgstation@gmail.com
ab4c92e066
Using summon guns gives a message to the the user to confirm it working.
...
Added a new borg upgrade module which requires illegal tech and combat tech to make. It allows you to give them their emagged equipment without fucking with their laws.
New LMG by Ausops (both sprites and code). Right now appears only in Summon Guns, but may appear elsewhere in time.
Grilles now have a bullet act, so they no longer magically absorb infinite bullets.
Updated changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 07:43:49 +00:00
Chinsky
683e4f304a
Fix for detective revolver.
...
Turns out my previous fix did not help. Problem was in detective ammo having wrong caliber.
2012-10-30 03:07:51 +04:00
Chinsky
eb72f2d48e
Fixed couple of holster messages typos.
...
Reworked way isHolster() works.
Fixed bug with detecive revolver, making it impossible to reload.
2012-10-25 16:32:57 +04:00