CPTANT
086dd558f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire
...
# Conflicts:
# code/game/gamemodes/malfunction/Malf_Modules.dm
2016-02-16 03:23:55 +01:00
MMMiracles
64b09f82e5
outlining on rifle is more defined, made a red and blue variant along with a generic variant.
2016-02-02 18:19:22 -05:00
CPTANT
fb154f0b2e
cleans up the code and brings fire stacks back to 0.5
2016-02-02 21:02:53 +01:00
CPTANT
34e22c8a1b
adds on hit fire effect to lasers.
...
Makes lasers a subtype of beam
2016-02-02 16:13:11 +01:00
MMMiracles
ea3e03ec48
adds a blue variant of the rifle for team-based stuff or something
2016-01-30 01:57:14 -05:00
MMMiracles
cb8e000580
adds instagib rifle
2016-01-30 01:24:56 -05:00
bgobandit
bcd456eea1
Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk
2015-11-23 18:44:54 -05:00
bgobandit
899e6ecaf9
Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
...
Conflicts:
_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit
47dcbc2fd0
Various mining additions, fixes and rebalances.
2015-11-18 19:14:28 -05:00
KorPhaeron
015c480e8f
Lasertag beams
2015-11-01 20:55:46 -06:00
phil235
866cdbcd34
Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues.
...
Rearrange girders.dm
Singularity_pull() no longer unanchors anchored objects (because it breaks the deconstruction of table/girder/states/etc, and make mech pullable by mobs), but it still pulls them.
2015-08-07 23:14:45 +02:00
phil235
e2ca2de4b2
Plasma cutter's fire rate is now a bit slower but its projectile can pierce multiple asteroid walls(2 for normal cutter, 3 for advanced). Its range is no longer reduced in pressurized environment (so the projectile is no longer invisible).
2015-08-05 21:58:19 +02:00
Jordie0608
9c0ef0c2ce
overlays for energy guns
2015-07-15 19:06:48 +10:00
oranges
ae99453a72
Remove taser firing delay
...
Making the game unintuitive as fuck and annoying as shit is not a balance
change, I'm frankly quite suprised it was merged in the first place
In the future don't nerf the interface as a balance fix
2015-07-01 20:44:01 +12:00
Cheridan
7aba70ecf3
DRAGnet lives!
2015-06-15 23:55:28 -05:00
phil235
7df5998740
Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.
2015-04-08 03:44:56 +02:00
pudl
69924a15be
plasma/ripley update
2015-03-25 18:06:26 -05:00
Miauw
09cf2e474f
Reduces the taser firing delay.
2015-03-10 19:36:05 +01:00
Steelpoint
9ce2add084
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-25 14:10:54 +08:00
paprka
1d552123dc
hos gun revert
2015-02-24 21:54:48 -08:00
paprka
7fad8a3bab
nerfs energy bolts more
2015-02-24 20:04:48 -08:00
Steelpoint
1221f012c6
Breach to Disable
2015-02-20 11:41:56 +08:00
paprka
388e0a330e
fixes firing delay
2015-02-18 02:55:28 -08:00
paprka
8b12b14f59
hospistol and disabler stun revolver
2015-02-15 13:31:31 -08:00
Steelpoint
a9c9f7c2cb
BalanceChange-5stun10laser
2015-02-14 17:56:35 +08:00
paprka
354ce2a458
removes shot delay on stun revolver
2015-02-13 09:35:30 -08:00
paprka
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
Steelpoint
8c2961c79b
MoreConflictFixing
2015-02-04 19:37:57 +08:00
paprka
f6be6754ae
readds the stun revolver (oops)
2015-02-01 21:32:51 -08:00
paprka
453a3db196
etc
2015-01-30 23:18:02 -08:00
Steelpoint
a097f86ac6
ERTBalancePassV1
2015-01-18 19:18:47 +08:00
paprka
ab7d50c90e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/guns/projectile/launchers.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/research/designs/weapon_designs.dm
icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
paprka
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
Steelpoint
3f88acb6f6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
...
Conflicts:
icons/mob/head.dmi
2015-01-14 11:25:07 +08:00
Cheridan
c81eada938
Merge pull request #6737 from tkdrg/hurr
...
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
Steelpoint
982c54c2f3
EmergencyResponseTeamV2
2015-01-11 19:21:38 +08:00
tkdrg
b0635993a4
Revert "[FEATURE] Emergency Response Team"
2015-01-10 19:55:30 -03:00
Steelpoint
34589f52bf
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
code/modules/projectiles/guns/energy/nuclear.dm
icons/obj/gun.dmi
2015-01-09 11:02:50 +08:00
tkdrg
778eb28c15
Repaths practice laser
...
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
paprka
0cd34c9c2f
changes syndicate borg equipment
2015-01-05 19:42:31 -08:00
paprka
46ee047404
further changes to the ranged stun system
2015-01-01 22:22:03 -08:00
Steelpoint
f72ced26fd
PulseRifleVarients+ArmouryRooms+FixesAndRefinements
2015-01-01 13:33:23 +08:00
Steelpoint
dd111a7c54
EmergencyResponseTeam
2014-12-31 17:31:45 +08:00
paprka
109be766d6
fixes a few bugs
2014-12-26 19:23:22 -08:00
paprka
47659dbbf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08:00
paprka
e53f8294d7
initial commit for nerfing ranged stuns
2014-12-10 00:16:53 -08:00
Cuboos
fb6e756502
Defib sounds plus Code
...
Defibt sounds added plus code edits to accept new defib sounds and new weapon sounds
Defib previews
https://dl.dropboxusercontent.com/u/9654207/def_saftyOff.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_charge.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_failed.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_ready.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_SaftyOn.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_success.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_zap.ogg
2014-12-05 22:18:34 -08:00
Perakp
0761d42d65
Bluespace wormhole projector
...
- emits quantum-coupled bluespace beams
- high research requirements: combat 6, materials 6, bluespace 4
- sprites by Nienhaus. Big thanks!
- electrodes now colored with the color var
2014-10-26 15:06:30 +02:00
nobalm
0a1df18f25
Turret SFX and spawning changes
...
* Turrets now use the SFX associated with the weapon installed in them
* Turrets now have a default installed gun for when they are spawned
* fire_sound is now a property of all ammunition, not just energy ammo,
which should make future additions a lot simpler.
* Added some energy gun SFX handling to the giant switch statement at
the top of portable_turret.dm, because 'emagged' and 'lethal' are the
same thing and have to be handled weirdly.
* The upshot of all these changes is that every turret, constructed or
default, should make exactly the right noise, even if guns are added in
the future!
2014-10-07 16:44:51 -04:00
Steelpoint
fd32b3ebda
Removes LaserTagLaser Sprite Change + Reduces Laser Gun Ammo
2014-03-31 15:49:08 +08:00
