Commit Graph

1256 Commits

Author SHA1 Message Date
Bone White
fff6f2a264 French Crossbow Ammo Restriction
Prevents arrows and rods being used in a french-powered crossbow.  Also
added preventative measure for cell installation.

Requested by Fox.
2014-10-24 14:11:55 +01:00
Fox-McCloud
8c1f6431e6 Tweaks and Fixes and Major Map Changed
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
mwerezak
4b647c1905 Fixes xbow tension not being rest when fired 2014-08-16 20:58:58 -04:00
ZomgPonies
e4d2cb53e4 Merge pull request #359 from Bone-White/master
Rubber bullets now cause agony/halloss instead of stun
2014-08-06 19:04:35 -04:00
Bone White
f63a1995b8 Rubber bullets now cause agony/halloss instead of stun
As title, by Mel's request.  Makes sense with the stunbaton nerf to nerf
rubber bullets too.  Two shots cause incapacitation (as opposed to three
from a taser).
2014-08-06 20:41:31 +01:00
ZomgPonies
db4a165244 Turned heavy laser into a kind of laser minigun. Still more bang for your buck than a regular laser 2014-08-05 00:11:57 -04:00
ZomgPonies
509af0b236 Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun 2014-08-04 01:54:27 -04:00
Zuhayr
d1059b488b Bevy of newhydro fixes.
Conflicts:
	code/game/machinery/vending.dm
	code/modules/projectiles/guns/energy/special.dm
	icons/obj/hydroponics.dmi
2014-07-28 13:49:18 -04:00
DJSnapshot
c4a06ef7c1 temporary fix for #4907 2014-07-24 18:39:24 -04:00
DJSnapshot
be6f4b74a8 Updates to gun targeting UI. Fixes #5710
Conflicts:
	code/_onclick/hud/human.dm
	code/modules/client/preferences_toggles.dm
2014-07-24 18:36:52 -04:00
ZomgPonies
431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00
ZomgPonies
4b98dc1ff4 Xeno nerf 2014-07-21 10:08:02 -04:00
Zuhayr
7c07240ac9 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/alien.dm
	code/modules/projectiles/guns/projectile/crossbow.dm
	code/modules/projectiles/guns/projectile/pneumatic.dm
	icons/mob/back.dmi
	maps/tgstation2.dmm
2014-07-21 06:10:45 -04:00
ZomgPonies
64554340f4 Modifed faction system to use a list instead. Mobs can belong to multiple factions at once. 2014-07-19 13:26:55 -04:00
Rob Nelson
08813d45cc Fix potential ready-dna problems.
Conflicts:
	code/game/machinery/cloning.dm
	code/modules/projectiles/projectile/change.dm
2014-07-18 06:18:12 -04:00
mwerezak
a07b7a5ce3 Thrown items can be targeted, has miss chance...
...based on distance, similar to projectiles.

Conflicts:
	code/defines/obj.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/vending.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/games/cards.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living_defense.dm
2014-07-16 09:53:34 -04:00
Kelenius
c54b9e3626 Slime update
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
paprka
2c36c85729 added empty gun noises
Conflicts:
	code/modules/projectiles/gun.dm
2014-06-29 16:43:56 -04:00
ZomgPonies
384992c9fc Merge pull request #252 from Regen1/Combat-borgs
Combat borgs + various tweaks
2014-06-18 06:01:46 -04:00
ZomgPonies
c7fc93538e Update icon energy gun runtime 2014-06-17 11:07:22 -04:00
mwerezak
6ada0cf263 Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_misc.dm
2014-06-17 07:08:25 -04:00
mwerezak
07abc91e8e Bullets are now properly sharp
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2014-06-17 06:52:47 -04:00
mwerezak
4a2993b20b 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.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
Necaladun
1ce1f0df37 Xray laser
Was still at charge cost 50 - up to 500 now
2014-06-17 16:56:20 +09:30
Necaladun
0265660fb2 Stun Revolver Upgrade
Stun revolver uses the old style single shot rather than a beam, but
hits harder.
2014-06-17 16:56:20 +09:30
Necaladun
eb97932ca5 Egun Fix
Eguns now have proper ammo cost, 10 shots standard, not 100.
2014-06-17 16:56:19 +09:30
Cheridan
88aceb454d Update shotgun.dm
shells spin faster
Conflicts:
	code/modules/projectiles/guns/projectile/shotgun.dm
2014-06-17 02:45:09 -04:00
Cheridan
3244291624 Casing rotation
Spent casings ejected from firearms will spin as they 'tumble' towards the ground.
Improved sprites for shotgun shells
Improved sprite for bullet projectile.

Conflicts:
	code/__HELPERS/matrices.dm
	code/modules/projectiles/guns/projectile.dm
	icons/obj/ammo.dmi
	icons/obj/projectiles.dmi
2014-06-17 02:40:47 -04:00
Regen
7263fc5eef More PR fixes I guess 2014-06-14 22:46:05 +02:00
ZomgPonies
386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
Regen
b6f12108e4 Nerfed combat borgs
Made the cell charge it costs to use the laser 500 instead of 100, since
it gave borgs WAAAY to many shots before they have to even consider
going back to charge
Fire delay also doubled, because we don't want them to waste everything
in two seconds, and it was way quick before, still considerabily fast,
though
2014-06-11 19:49:48 +02:00
alex-gh
0eed06bcc9 Stunbeams should no longer destroy computers 2014-06-02 09:49:58 +02:00
ZomgPonies
11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
ZomgPonies
b81acff7a3 Fix charge_costs of guns 2014-05-24 14:03:37 -04:00
ESwordTheCat
a6ee8dc678 Revert gun pool for now.
Conflicts:
	code/game/machinery/turrets.dm
	code/modules/projectiles/projectile/beams.dm
2014-05-19 19:34:20 -04:00
Zuhayr
43e60ab01e Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.

Noise cannon fire sound, Vox shriek sound.

Added Vox Armalis species.

Swapped vox breath mask over to species_restricted check.

Added Vox Armalis gear.

Added a random shriek effect to Vox and Vox Armalis speech.

Added quickspawn Vox Armalis definition.

Vox shriek sound effect. Thought I committed this earlier.

Added r_hand and l_hand icon_overwrite checks.

More work on Armalis. Added gut() and leap() human procs.

Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().

Fixing some missing pixels in the armalis tail.

Almost forgot to whitelist armalis...

Conflicts:
	code/modules/clothing/spacesuits/alien.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/gun.dmi
2014-05-14 18:24:01 -04:00
Zuhayr
1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
2014-05-12 02:59:53 -04:00
ZomgPonies
b8a70103d7 Fix soem bugs -- Immortal Facehugger and Cap laser rechargerate 2014-05-07 00:06:50 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master
Nukeops Weapons Rework
2014-05-04 15:43:03 -04:00
SamCroswell
2081699e54 Bullet damage tweaks
Upped the L6's bullet damage due to how high the cost of it is. Subject
to change, as always.
2014-05-04 11:01:39 -04:00
SamCroswell
521467fa3e C4 now explodes on detonation, Stechtkin pistol fix
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
ESwordTheCat
532298c725 Tweak object pool system.
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
2014-05-03 22:54:09 -04:00
Regen
f63a5bed01 Fixed L.W.A.P charge cost 2014-05-03 17:02:41 +02:00
ZomgPonies
36b52731f0 Changing power numbers to balance gun upgrades 2014-05-01 16:23:09 -04:00
ZomgPonies
48ca1f1a32 Fix shotgun sounds 2014-04-30 13:29:48 -04:00
ESwordTheCat
33c492ae4c Fixed all the runtimes. 2014-04-29 13:39:50 -04:00
ESwordTheCat
2382984c03 Some optimization at object pooling, tinkering at beams.dm and reverting useless code.
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-04-29 13:39:20 -04:00
ESwordTheCat
774a4407da Moar object pool.
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
2014-04-29 13:36:39 -04:00
ESwordTheCat
ebfcc9be79 Object pool for beam projectile, minor changes to object pool.
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2014-04-29 13:33:06 -04:00
Mloc-Argent
fcdcef5931 human: move organ generation into a species proc
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
2014-04-28 21:09:45 -04:00