Commit Graph
954 Commits
Author SHA1 Message Date
Fox-McCloud 8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
Fox-McCloud 6e7ac1ec5e Merge pull request #247 from TheDZD/minor-fixes
Cyborg Cell Recharging Fix
2015-02-01 14:55:55 -05:00
DZD 16fafcdf5f Cyborg Cell Recharging Fix
- Fix for syndicate borg LMG and security borg draining extra charge
while in the hotbar, despite being fully charged.
2015-02-01 10:37:35 -05:00
DZD a93ef4dd1b The Return of the Shoulder Holster
- Detective's shoulder holster now only fits projectile-based (not
energy) handguns.
- Swaps the detective's belt holster for the old shoulder holster.
- Makes some specific handguns actually fit inside of holsters.

- Unrelated: Removes a debug output from
/code/modules/power/singularity/generator.dm
2015-01-29 13:23:46 -05:00
DZD a7c9c2a789 Actually makes LMG cost 300 per shot 2015-01-24 14:54:29 -05:00
DZD 6ea11601a7 Security and Syndicate Cyborg Changes
- Security cyborg's taser now properly draws from a cell that slowly
recharges from the cyborg's main battery, rather than drawing directly
from the main battery. 6 shots then CLICK until it recharges.
- Replaces Syndicate cyborg's recharging energy crossbow with a
non-recharging grenade launcher, still stuns, but does a good bit more
damage. (TG port)
- Replaces the Syndicate cyborg's laser with an LMG. (TG port)
- Nerfs cost per projectile to 300 from TG's 20, because a 300 shot
recharging clip is utterly overpowered, not to mention the fact that it
hardly affected the borg's battery when recharging.
- Cost of the cyborg's laser gun prior was 830, so this is still a buff.
However it no longer pulls directly from the cyborg's main battery,
instead pulling from a 6000 charge battery that slowly recharges from
the main battery.
2015-01-24 14:53:34 -05:00
Fox-McCloud a1b5c0d609 Merge pull request #179 from Markolie/master
Bug fixes
2015-01-16 19:09:16 -05:00
Markolie b9ccb857d0 Energy gun description fix, UO45 fix, temporarily disable the engi shuttle 2015-01-17 01:05:23 +01:00
DZD 3939abaf5d Fix Conflicts and Sync with Upstream
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
2015-01-16 17:07:22 -05:00
DZD 475ca3f666 Wizard Update Part 8
- Fixes horsemask spell to work on non-human races.
- Removes ability of Summon Item to mark and recall brains due to
problems with organ system.
- Makes weeping angels turn back to their human form after Flesh to
Stone wears off if they were created via F to S and the Staff of
Animation. (/tg/ port)
2015-01-16 16:39:12 -05:00
Fox-McCloud 73d59113c3 Kinetic Accelerator 2015-01-15 21:58:51 -05:00
DZD 5307d376da Wizard Update Part 7
(That last commit was supposed to be Part 3, not 6, but might as well
roll with it)

- Ports over the summon item spell from /tg/, it allows the wizard to
mark an item and then later recall it to his hands. If it is within
another item, that item will be recalled with the marked item inside.
- Removes RNG max charge variation on staffs, most staffs will now have
6 max charges (Rather than a 25% chance of 8, 50% of 4, and 25% of 3),
the exception being the Staff of Door Creation and Staff of Chaos, which
each have 10 charges.
- Adds summonitem to Summon Magic.
- Summon Guns/Magic now cost 1 spell slot each once again.

All ported from /tg/ with the exception of the Summon Guns/Magic cost
changes, as well as the remove of staff charge variation.
2015-01-15 17:05:49 -05:00
DZD 62c76ba2ef Wizard Update Part 6
- Attempt to fix back sprite for new staffs.
- Fireball wand now has a proximity detonation similar to the fireball
spell.

Ported from /tg/.
2015-01-15 15:50:10 -05:00
DZD 9af973a835 Wizard Update Part 2
- Adds in_hands for the Staff of Chaos and Staff of Door Creation
- Adds back sprites for said staffs, although they do not actually
appear for whatever reason, back sprites for older staffs also do not
appear.
- Adds unique sprites for the two staffs.

Ported from /tg/.
2015-01-14 22:30:51 -05:00
DZD 1c3d247aca Wizard Update Part 1
- Wands will no longer display a missing sprite if you try to fire one
while it is drained. (Only change that wasn't ported from /tg/)
- When using a staff of change on somebody, you can now turn them into a
goat or space bats, and when turning them into a cyborg, there is a
chance of that cyborg being a syndicate cyborg.
- Ports over page-based UI for the Wizard's spellbook from /tg/.
- Ports over the Wand Belt, Staff of Chaos, and Staff of Door Creation
from /tg/. The Wand Belt contains several useful wands, however all of
them have limited charges. The Staff of Chaos will cause a different
projectile spell effect each time it is cast, and can currently imitate
any of the wands. The Staff of Door creation will create wooden doors
over any solid turf they contact, doing so removes said turf.
- Mind swap will no longer remove spells from the wizard due to RNG.
- The charge spell will no longer damage the charge of weapons that
normally recharge by themselves.
- Adds Staff of Door Creation to the Summon Magic list, removes the
staff of change from the normal Summon Magic list and makes it part of
the special list
- If Summon Magic rolls to create an item on the special list, it will
create that item once, and will no longer create anything else from the
special list. (List consists of the Staff of Change, Staff of Animation,
Wand Belt, Staff of Chaos, and Contract).
2015-01-14 21:56:39 -05:00
Fox-McCloud e23841c46f Rebalance Stamina 2015-01-05 06:53:48 -05:00
Fox-McCloud 525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Fox-McCloud 53d15682ce Melee Rebalancing 2014-12-18 10:22:02 -05:00
SamCroswell 47a072742e Removes Snowmobiles, Fixes Ion Inhand 2014-12-14 16:46:42 -05:00
Fox-McCloud fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Fox-McCloud 8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Fox-McCloud 21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
Fox-McCloud fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Markolie a1a80c1a27 Minor fixes 2014-12-04 18:18:01 +01:00
Fox-McCloud 9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
Markolie ced6357e9b Fix basic energy gun runtime 2014-11-30 02:36:35 +01: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
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
mwerezakandZomgPonies 4b647c1905 Fixes xbow tension not being rest when fired 2014-08-16 20:58:58 -04: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
ZuhayrandZomgPonies 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
DJSnapshotandZomgPonies c4a06ef7c1 temporary fix for #4907 2014-07-24 18:39:24 -04:00
ZuhayrandZomgPonies 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
mwerezakandZomgPonies 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
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