Commit Graph

821 Commits

Author SHA1 Message Date
Fox-McCloud
a4c72d4603 Species and Guns 2014-11-28 19:13:41 -05:00
SamCroswell
8b16d394ed Projectile Laser Update
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -05:00
Fox-McCloud
b41026c4e6 Merge pull request #514 from SamCroswell/master
Dismemberment Update, Fireaxe Fixes, Gunshot Sound Changes
2014-11-23 20:56:27 -05:00
Fox-McCloud
2f25e4f162 Merge pull request #515 from Markolie/master
Adds Syndiborg to Nuke Ops, enables shortcuts for borgs/drones, notifies the AI of borg changes
2014-11-23 02:25:40 -05:00
Markolie
30c1960fe8 Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes 2014-11-23 07:52:38 +01:00
SamCroswell
ceabc46f1b Dismemberment Update, Fire Axe Fixes, Gun Sounds 2014-11-23 00:52:32 -05:00
SamCroswell
90bb1c5861 Weapon description update
Updated a few weapon descriptions to fit properly.
2014-11-22 13:33:25 -05:00
Markolie
06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +01:00
SamCroswell
c75529462d Bulldog In-Hand Fix 2014-11-14 23:34:47 -05:00
SamCroswell
211023bd67 Syndicate Medibots, Energy Recharge Fix
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.

- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
2014-11-08 19:16:33 -05:00
SamCroswell
4ffd1a94e6 M1911P Fix
Forgot to reset the M1911P's weight and slot flags, since it's a child
of the pulse rifle. My bad.
2014-11-08 14:21:04 -05:00
SamCroswell
722fd6a1e0 Nukeops Update
- Gave the nukeops leader the ability to choose the name of their team.

- Gave the Bulldog an in-hand icon identical to the c20r until we can
figure out how to add left hand right hand icons without breaking
everything.

- Added a helmet for the Syndicates, identical to the helmet they
already had with a special icon.

- Replaced the SWAT helmet they had in their lockers with the new Syndi
helmets.
2014-11-08 10:51:20 -05:00
SamCroswell
a8a585ba32 Map Update, Pulse Rifle Change
Map changes:
- Genetics APC fixed.
- Gygax removed from the armory at Fox's request.
- AI chamber reverted at Fox's request.
- Updated admin room.

Pulse rifles may now only be carried on a person's back. Because we
don't allow fun here.

Fancy new L6 SAW icon as well.
2014-11-07 23:05:34 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud
650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
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