Commit Graph

1618 Commits

Author SHA1 Message Date
kevinz000 6cfbab9e2e Update gun.dm (#27776) 2017-05-29 02:15:47 -04:00
Steelpoint 03b31490dd [Lavaland Ruin] Crashed Marine Transport (#27660)
* InitialCommit

* MergeConflict

* Mistakesweremade

* MissingText

* MoreFixesAndBlackList

* Tweaks

* FixedIssues

* FinalFixHopefully

* NewWalls

* IDCardAndNoNTReferences

* LorePassOver

* ArmourNerf

* MergeConflicts

* MergeConflict

* MergeConflict

* SlightRework

* Terran

* IronHawk
2017-05-28 10:30:17 -04:00
Leo ae20ffdb77 Merge pull request #27715 from QualityVan/bayonetbutchering
Lets bayonets butcher, fixes bayoneting typo
2017-05-27 22:47:49 -03:00
Joan Lung a596fc442a Merge pull request #27611 from Robustin/GangBang
Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
2017-05-27 10:26:53 -04:00
kevinz000 aa61650035 Pixel projectile ricochets and reflections! (#27551)
Adds flags to atoms to allow them to reflect projectiles based on that projectile's reflection chance!
(can be overridden later for angle-based chances but this is good for now, ja?)
Gives titanium walls an 80% chance to reflect beams and 30% chance to reflect everything else!
Mostly-realistic reflection angles
If the math isn't fucked (I tested and the glitches seem to be from pixel projectile movement, not the math itself), this means we can have pixel projectile reflectors soon 😂😂😂😂😂
🆑
rscadd: Nanotrasen's new titanium wall blueprints are smooth enough that it can reflect projectiles!
/🆑
https://puu.sh/vYzMA/4f00c2a4a1.gif

o ya if this goes through i'll add pixel projectile support for reflectors when i have time so we can finally dump legacy b00lits.
2017-05-27 18:13:51 +12:00
Leo ab1999e026 Merge pull request #27681 from Cyberboss/GunInit
Ports guns to Initialize
2017-05-26 21:05:55 -03:00
QualityVan a86f2fc252 Lets bayonets butcher, fixes bayoneting typo 2017-05-26 16:25:35 -04:00
kevinz000 d536bf6caf [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#27416)
* hm

* separation part 1

* fixes and more fixes

* gunlight minirefactor

* refactor

* done
2017-05-26 10:37:10 +02:00
Cyberboss 7a4f640eec Ports guns to Initialize 2017-05-25 19:51:08 -04:00
Robustin 143e3fe2f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into GangBangTest
# Conflicts:
#	icons/obj/ammo.dmi
2017-05-25 14:35:25 -04:00
Robustin 0d575f1aa6 Sleeper Fixes 2017-05-25 14:32:51 -04:00
Leo 3d2aca11cd Merge pull request #27630 from ChangelingRain/plasmaray
Aux base plasma turrets now have range equal to the range they fire in
2017-05-25 12:37:04 -03:00
kevinz000 8575bad94b fixes AOE projectile automatic proximity detonation (#27565)
* Update magic.dm

* Update magic.dm

* Update magic.dm

* Update magic.dm

* Update magic.dm
2017-05-25 14:28:49 +02:00
Robustin 21d5ea2e3d Update bullets.dm 2017-05-24 12:46:12 -04:00
Robustin 9ceada6c66 Sleeper Icon 2017-05-24 12:34:38 -04:00
Robustin d9a696b19b sleeper round 2017-05-24 12:33:36 -04:00
Robustin 5097c5ab9a Update external_mag.dm 2017-05-24 12:24:13 -04:00
Robustin df722ce8d7 Update external_mag.dm 2017-05-24 12:23:23 -04:00
Robustin b0e081db2f Update ammo_casings.dm 2017-05-24 12:17:54 -04:00
Joan Lung e062d8e289 Aux base plasma turrets now have range equal to the range they fire in 2017-05-24 11:44:00 -04:00
oranges 075f90590e Merge pull request #27533 from Steelpoint/ArmourPiercing
Auto Rifle Armour Piercing Increase
2017-05-24 22:53:42 +12:00
oranges 0bec7a8150 Merge pull request #27535 from Steelpoint/Sounds
Ballistic Weapon/Shotgun Reload Sounds
2017-05-24 22:51:48 +12:00
Steelpoint 836a81a85d Sketchin Alt Magazine Sprites (#27556)
* InitialCommit

* StraightStripes

* Vertical
2017-05-23 23:13:38 -06:00
Steelpoint a61827d756 Tactical Energy Gun Unique Sprites (#27557)
* InitialCommit

* InitialCommit
2017-05-23 23:12:50 -06:00
Robustin a39ef22a61 Reduced armor penetration 2017-05-23 20:02:53 -04:00
Robustin 725f669726 Gang Sniper 2017-05-23 19:50:24 -04:00
Robustin 8a3207c17c Merge branch 'GangBang' of https://github.com/Robustin/tgstation into SniperNerf 2017-05-23 18:15:32 -04:00
Robustin d0c12bcd7e Gang Sniper Rounds 2017-05-23 18:11:04 -04:00
Steelpoint f1b05d8913 ForgotToRemoveThis 2017-05-23 22:36:15 +08:00
Steelpoint 916e52dde0 MoreSounds! 2017-05-23 22:32:16 +08:00
Steelpoint 8c0a509bf4 Auto Rifle Alt Mag Sprites (#27463) 2017-05-23 00:15:22 -03:00
Joan Lung 9cdf74fb12 KA Pressure Mods are now a traitor miner item (#27484) 2017-05-22 10:19:16 -03:00
Steelpoint 6e60d8d6ed InitialCommit 2017-05-22 14:50:04 +08:00
Steelpoint 326ea1d7bb InitialCommit 2017-05-22 12:08:32 +08:00
Joan Lung ffdfe8a123 Plasma cutters will mine further but will go less distance in open air (#27474) 2017-05-21 22:46:40 -03:00
Robustin eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3
# Conflicts:
#	icons/obj/guns/projectile.dmi
2017-05-21 17:54:44 -04:00
Steelpoint 7103172e0b Warden Compact Combat Shotgun (#27427)
* InitalCommit

* InitialCommit

* Removal

* CloseEncounters
2017-05-21 13:44:03 -04:00
Joan Lung 7db5d150de Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#27380)
* Adds framework for kinetic accelerator projectiles having module-based effects on-hit

* hmmmmm

* we have to do some weird calculation but this is... sort of easier????????

* missed one
2017-05-21 06:16:31 -04:00
kevinz000 380ea858fe fixes chameleon laser guns blowing up welding tanks for real this time (#27443) 2017-05-20 23:22:26 -03:00
Robustin 44bcd278dd Merge branch 'master' into ganguns 2017-05-20 19:41:52 -04:00
Steelpoint 5e45849c5a Pulse Pistol Recharge Addition (#27426) 2017-05-20 10:39:43 -03:00
Steelpoint 8b2189aa74 Tactical Energy Gun/ERT Sec Officer Change (#27387) 2017-05-20 01:54:06 -03:00
Steelpoint 75d4b25796 Pulse Weapons Sprite Update (#27386) 2017-05-19 15:51:16 -03:00
swindly 8010794724 Adds modified syringe guns (#27276) 2017-05-19 08:24:37 -03:00
Joan Lung 1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
Robustin 889eefdca5 more gang guns 2017-05-12 16:04:44 -04:00
kevinz000 96b842d120 Update energy.dm 2017-05-04 22:18:37 -07:00
kevinz000 24af748c67 Update energy.dm 2017-05-04 22:17:03 -07:00
kevinz000 75aaec129f Update projectile.dm 2017-05-02 01:59:02 -07:00
Leo 3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00