Commit Graph

675 Commits

Author SHA1 Message Date
Hoshi-chan
1e0679ffa1 Added various tools to cyborg and MoMMIs. Tweaked cyborg lasers to recharge in charging stations. 2014-09-29 19:41:24 -04:00
smet19
275279b44a Fixes merge conflicts 2014-09-21 12:00:00 +04:00
SkowronX
6c9471b131 See if this fixes merge conflict 2014-09-20 12:07:10 -05:00
smet19
947744cb23 Sprites & Fixes
Weapons now have states without magazine and without bullet in chamber.
Updated update_icon()
Fixed loading weapons with different mags. Now you cant load your pistol with smg mag.
Now you can load bullet in chamber and unload it
2014-09-19 16:42:35 +04:00
smet19
eea81b86f6 Replaces loaded.len with getAmmo() 2014-09-19 16:39:49 +04:00
smet19
7c94dae89a Removed "spent" . Uses AC.BB instead. 2014-09-19 16:37:04 +04:00
smet19
9b75c5527f Ammo shit
Bullets now have non-spent sprite.
Shotgun ammo now have spent overlay instead of empty shell.
Fixed typepaths and sprite modulo
2014-09-19 16:34:49 +04:00
Chris
c0f96ae272 Revert Click code cleanup (reverted from commit 439bda24bc) 2014-09-18 15:36:38 -05:00
smet19
57c4f9f0d6 New mags 2014-09-18 18:36:26 +04:00
smet19
fdd0ff10af Revert "Adds new sprites for mags and removes " " from paths"
This reverts commit 72ad6072ec.
2014-09-18 18:24:53 +04:00
smet19
72ad6072ec Adds new sprites for mags and removes " " from paths 2014-09-18 17:36:01 +04:00
smet19
a12bec23e4 Added chambers for mag.type guns 2014-09-18 16:13:49 +04:00
Wild Bill
439bda24bc Click code cleanup 2014-09-18 14:07:50 +03:00
ComicIronic
513bda91d1 Added flare guns, both civilian and syndicate
-Shoot flares to light up a blackout, or just use them normally
-Shoot flares to light up people (if you're a tater tot)
-Shoot flares because you have nothing better to do
-Flares now correctly change your l_color so you glow red when holding one
-Added a fancy storage box for flares (also in the autolathe)
-Changed the way emergency toolboxes work: they now have a weighted chance to pick 1 of 3 lighting items, either a flashlight, a box of flares, or a single flare
-Added a storage box for flare shells, as well as a way to craft flare shells and flare shells to the autolathe
-Added a dedicated atmos tech locker, which includes some equipment, an RPD, and the regular flare gun
-Added the syndicate flaregun job item for the atmos tech: embeds flares in people and sets them on fire. Also fires shotgun ammo
-COMING SOON: Map changes to include the atmos lockers. Currently they are just code
2014-09-16 00:11:19 +01:00
ComicIronic
647fe44527 Gun code fix
- Ammo_magazine is now ammo_storage into boxes, magazines, or speedloaders
- Added a speedloader for traitors and ammo boxes for the detective
- Automatics now burst-fire, which shoots fast but has longer cooldown
- Box ammo transfers have a do-after, so there's a reason to use speedloaders
- Magazines now work properly, no more empty_magazine shit
- Map changes as well
- Fully tested on all projectile types, seems to work fine
2014-09-14 21:58:54 +01:00
Rob Nelson
a36e783f3b FIIIIIIRE rework, nano paper cleanup. 2014-08-20 20:11:58 -07:00
dylanstrategie
115eda60dc Fixing reloading problems
- That does that
- Was tested on C20_R. Code was then copy-pasted to other guns, it
should be working fine
2014-08-17 02:39:25 +02:00
dylanstrategie
4936c78d4f RPG Fixes
- Should adress #1266
- Rockets are now w_class 3, which means they only fit on belts, inside
backpacks and large containers and possibly on suit storages, and no
longer in pockets or boxes
- Fixed problem with removing RPG from back, might have canned out
unloading RPGs manually
2014-08-13 16:20:49 +02:00
dylanstrategie
94c706bd0e Modifications to automatics
- A lot of redundant and spaghetti code, but it's the only way I managed
to get it working within a reasonable timeframe
- Should fix #1214
2014-08-12 00:26:34 +02:00
dylanstrategie
4c31b4ca9a RPG updated
- Aligned all sprites
- Full pathing on procs
2014-08-10 16:02:37 +02:00
Rob Nelson
81e8d40bf8 Merge pull request #1213 from dylanstrategie/Nuclear
Massive Nuke Operatives Overhaul
2014-08-09 18:05:16 -07:00
dylanstrategie
30cc702533 Unfucked RPGs and re-added them 2014-08-09 12:05:40 +02:00
dylanstrategie
c8f8700bcd Yet more fixes
- RPGs still have more progress towards unfucking them, notably sprite
behavior should now be correct. There's still a nasty bug with loading
though
- RPG removed from the Nuke Ops shuttle for now
2014-08-09 11:16:07 +02:00
dylanstrategie
84f3f6e9a1 New fix (not tested) 2014-08-09 01:03:48 +02:00
dylanstrategie
0a6ac827fd Fixing misc problems
- Mostly reverting RPG changes
- Wrong RIG was upgraded
2014-08-09 00:30:34 +02:00
dylanstrategie
9054b1c8ed More changes 2014-08-08 21:50:26 +02:00
ComicIronic
6a47b8b810 Mostly functional changes to bolas
- No longer uses a projectile
 - Throwing a bolas now means that it will travel the maximum distance in one range direction before dropping to the floor
 - Mechs have a higher range distance than throwing, because mechanical guns
 - No more snowflake code, other than the vector normalising and scaling used in throw_at
2014-08-08 20:27:30 +01:00
dylanstrategie
17267fca32 Fixes to the Nuke Ops Overhaul 2014-08-08 21:00:39 +02:00
Rob Nelson
7400e37823 Merge pull request #1207 from dylanstrategie/Rocket
New gun features
2014-08-07 14:17:19 -07:00
dylanstrategie
37d2c762c4 Should make sure item_state works properly 2014-08-07 23:00:27 +02:00
dylanstrategie
d6d9ce5883 New gun features
- You can now choose wherever or not you want empty casings when you
fire or load
- This was added for the RPG but can function for any other gun
2014-08-07 22:51:18 +02:00
Rob Nelson
2fec207fc8 Merge pull request #1206 from dylanstrategie/Rocket
Further work on RPG
2014-08-07 13:38:11 -07:00
dylanstrategie
34dafa40ab More additions to RPG
- RPG now has a back sprite, it hasn't been tested but has been resized
and positionned in a fashion alike the spear
- RPG now starts unloaded, this should fix all problems related to
incorrect spawning
2014-08-07 21:10:46 +02:00
dylanstrategie
e16106d6d8 Further work on RPG
- Sprites are now functional outside of on_hand sprites which for some
reason still show the default gun skin
- Functionality is about the same, but a nasty bug has been witnessed
with spawned RPGs in some cases, handle with precaution
- RPGs will be added to the map once I manage to stop the gun from
dropping casings and make sure the gun itself doesn't have serious
glitches
2014-08-07 19:59:10 +02:00
ComicIronic
a2f477d389 Added bolas to map and machines
- Bolas can now be found in sec lockers and the SecVend
 - Bolas can now be printed from a hacked autolathe
 - Fixed a bug where throwing a bolas at the same tile as its source would create a stationary projectile
2014-08-06 21:30:00 +01:00
Rob Nelson
0e9a0038fa Merge pull request #1197 from dylanstrategie/Rocket
Adding assets for RPG
2014-08-06 02:18:26 -07:00
dylanstrategie
ebb947838a Experimental RPG added
- Mostly functional, still a fair bit of oddities
2014-08-06 08:29:11 +02:00
dylanstrategie
5359b17a3e Adding assets for RPG
- Sprited Ammo type in its own sub-file (rocket)
- SpritedFunctional projectile in its own sub-file (rocket)
- Sprited RPG, no in-hand sprite

Still needs an actual RPG to use all of this, but since this seems
decent I'll release this for starters
2014-08-06 04:36:00 +02:00
ComicIronic
5526a42000 Fixes to bolas
- Bolases now drop if the target fails to be cuffed
 - Bolases now spawn if the projectile hits a wall
 - Bolases now correctly fire from mechs
 - Bolases have proper force and a reduced breakouttime variable
2014-08-05 22:07:48 +01:00
Rob Nelson
c5e8a39938 Merge pull request #1174 from ComicIronic/Bleeding-Edge
Bolas (new sec tool)
2014-08-04 18:18:11 -07:00
Rob Nelson
6c7aeae5a7 Setting efficiency to default for next round. 2014-08-04 16:04:32 -07:00
ComicIronic
41941bb812 Merge remote-tracking branch 'upstream/Bleeding-Edge' into Bleeding-Edge 2014-08-04 21:10:53 +01:00
ComicIronic
c6c7e3f4bb Bolas in the game
- Throw it at running people to sometimes trip them and legcuff them
 - Throw it at walking people to not really do anything at all
 - Can be thrown or fired from a mech
 - Mech weapon can only be attached to the Gygax
 - Allows for ranged security and good crowd control
 - Part 1 of 2 changes to Gygax for better sec(TM)
2014-08-04 17:12:06 +01:00
iamgoofball
ada971d71c fix 2014-07-31 15:51:42 -07:00
iamgoofball
7b6ffd2693 fixes and changes 2014-07-31 15:47:21 -07:00
iamgoofball
3b42532472 XCOM UPDATE 2014-07-31 13:36:49 -07:00
ESwordTheCat
84d614d7be Object pool update! 2014-07-27 23:45:59 -08:00
ESwordTheCat
81713b1c14 Update arguments. 2014-07-26 08:35:51 -08:00
Rob Nelson
30475114af Fix potential ready-dna problems. 2014-07-17 10:57:08 -07:00
IratePirate
10347f9924 Fixes to certain sounds, volume changes and new sounds 2014-07-14 00:17:40 +01:00