b33e91fbb1
Cleaned up a lot of the module selection code, added Combat module.
2013-06-29 22:14:43 -07:00
94c3c7ef49
Armalis additions, tweaks.
2013-06-16 13:17:20 -07:00
23299809f6
Armalis sprites, simple animal/mob yank-out verb and embedding.
2013-06-16 00:38:40 -07:00
5c15ce687c
SHUT UP SPAMCAT. Bow fix, vox raider message fix.
2013-06-15 14:18:40 -07:00
b41b1fc2f3
Armalis simple_animal/sprite.
2013-06-15 04:09:49 -07:00
b1cac56e9a
Merge resolution.
2013-06-15 03:54:22 -07:00
3cb36272cb
Adjusted yank verb to apply to others as well as yourself.
2013-06-13 22:18:26 -07:00
6b73b8ec2f
Adjusted kitchen knives. Added projectile pinning. Various tweaks.
2013-06-13 20:46:09 -07:00
4aa577bef3
Powered crossbows, sprites, ammo.
2013-06-13 15:31:47 -07:00
a2fddc0fc1
Adds in the Kida
...
Adds in the Kida Race to all parts.
2013-06-13 18:22:05 -04:00
c57f2bb137
Polished off some pneumatic cannon bugs. All done.
2013-06-11 12:19:20 -07:00
96d9a41ea7
Pneumatic cannon sprites, gas loss code.
2013-06-11 00:57:15 -07:00
0fb234d6a4
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-10 22:35:42 -07:00
98d31e9191
Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)
2013-06-10 22:35:01 -07:00
b835ab4bd2
Fix of breacher chasis to keep anyone but Ughanti from wearing it.
...
Fix of gun suicide - lethal is lethal, nonlethal just hurts like a mother.
Despamming electrode resistance.
2013-06-09 14:10:11 -05:00
8b518f5639
Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental.
2013-06-08 19:20:02 -07:00
8e401489e7
Making sure I don't break anyone else calling apply_effects.
2013-06-06 19:50:32 -05:00
a34174e124
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-05 18:39:43 -05:00
06f04e6374
Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.
2013-06-05 17:35:38 +09:30
f240edcdb8
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-04 22:42:45 -05:00
fd8d61aa8b
New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations.
...
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.
HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.
Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.
Icon adjustments.
2013-06-04 22:41:23 -05:00
b2aeed8fba
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-01 08:26:43 +04:00
4749d6016d
Made syringe gun work with aiming system.
2013-06-01 08:23:38 +04:00
2d6bb6a768
Merge pull request #2934 from Baystation12/master
...
Bleeding Edge gonna bleed.
2013-05-31 21:12:37 -07:00
b91cf84993
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-01 04:18:43 +04:00
793f472a4f
Should fix quite a few of false positives on gun targeting.
...
Allows mob to click on turfs with empty hand.
2013-06-01 04:11:16 +04:00
1a51aefaac
Fixes #2922
...
Putting gun away now properly lowers aim.
Prevents gun from going off if it's not in active hand.
2013-06-01 04:05:33 +04:00
06b7700086
Cobpipe fix
...
Smoking pipe icon fix.
Eye-stab admin logging fix.
Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773
Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
2013-05-31 00:09:00 -05:00
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
e4c913fad9
Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click).
2013-05-29 13:34:54 +07:00
85eb0f1224
Adds new drinks and fixes a few things
2013-04-24 18:49:01 -04:00
c351bc1a33
Getting hit by bullet will shake camera.
2013-03-12 08:43:42 +04:00
5fa6414d70
If you aim at people, shots will be slightly more accurate.
2013-03-08 03:21:47 +04:00
81a432930b
Bit of refactoring.
...
Moved gun icons adding/deletion in separate procs.
Moved dropping aim in separate procs.
Moved gun empty clicking in separate proc because all the copypaste.
Fixed issues with aim mode HUD icons not being updated in some cases.
Now toggling mode cancels aim properly.
Fixed type in firing message.
2013-03-08 02:56:55 +04:00
4f75feffe5
Added recoil to projectile weapons.
...
On shot shakes screen a little.
2013-03-07 05:55:14 +04:00
56b4f0c85f
Fixed couple of issues with suicide - no sound and inability to suicide again if tried to do it without ammo.
2013-03-07 05:54:46 +04:00
5a916019de
Refactored and moved targeting code around a little.
...
Refactored suicide and point blank shooting code to use their projectiles properties instead of huge chain of conditions with arbitrary values.
2013-03-07 00:44:28 +04:00
55671d7485
Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
icons/mob/screen1_old.dmi
2013-03-06 17:04:45 +04:00
c9e657a4c6
Reloading spent casings in the revolver doesn't duplicate "This one is spent" message
...
Fixed #2434 .
2013-02-28 17:07:20 +04:00
4e35fccdb7
Fixed issue with laser beams freezing forever in case they missed the mob.
2013-02-20 19:30:13 +04:00
b649ab5a44
Fixes projectiles still applying effects even if they missed.
2013-02-20 17:33:48 +04:00
226a96b38f
If bullet misses someone it does not disappear, but continues on its way.
2013-02-16 21:02:38 +04:00
106018ca3b
Fix for firing distance calculation.
...
'original' var is not a starting point of projectile, but an atom it was fired at initially.
'starting' is turf where projectile was fired from.
2013-02-16 19:00:49 +04:00
bfe9b3839e
Merge branch 'gun' of https://github.com/comma/Baystation12 into gun
2013-02-16 18:53:20 +04:00
4d7aa320cb
Due to git tree being fucked up for some reason, manually reapplied many man many fixes.
...
Just got to tip of real tree and got zipball, then unpacked it here.
2013-02-07 07:13:27 +04:00
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
10127c4f34
Fixed gun aiming HUD buttons, other WIP junk
2013-01-27 17:34:12 -08:00
7f05c6fdb3
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/jobs/job/captain.dm
code/game/jobs/job/security.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mob/living/carbon/human/hud.dm
html/changelog.html
icons/obj/items.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 01:02:27 +10:00
fb2b2a1d52
various compile fixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:43:54 +10:00
bb5a349fcf
Merge branch 'incremental_tg' r5600 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/controllers/master_controller.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/machinery/computer/cloning.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/implants/implantnanoaug.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/shoes/miscellaneous.dm
code/modules/clothing/under/ties.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/silicon/say.dm
code/modules/mob/mob_defines.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/stamps.dm
code/modules/projectiles/projectile.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/reagent_containers/glass.dm
code/setup.dm
config/config.txt
html/changelog.html
icons/effects/effects.dmi
icons/mob/feet.dmi
icons/mob/head.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/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
maps/tgstation.2.1.0.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:23:37 +10:00
Zuhayr