Jordie0608
9c0ef0c2ce
overlays for energy guns
2015-07-15 19:06:48 +10:00
Jordie
8bf129cc06
Merge pull request #10336 from AlexanderUlanH/riotshotguns
...
Rubber Shotgun Pellets
2015-07-09 20:56:25 +10:00
Swag McYolosteinen
1bdae57d30
Merge pull request #10313 from optimumtact/chickychickyrumba
...
Remove taser firing delay
2015-07-03 11:45:49 +02:00
Alexander P. Ulan Hernandez
f0d70a42b0
Rubber Shotgun Pellets
...
Adds rubber shotgun pellets, which spawn in the riot shotguns and can be
produced at an autolathe.
2015-07-02 21:29:18 -04: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
xxalpha
cfb5e724b6
Material container, all items can have materials, wake me up
...
cant wake up
go to sleep debug
2015-07-01 03:34:47 +01:00
Cheridan
957f987b5d
Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet
...
Conflicts:
icons/effects/effects.dmi
icons/obj/items.dmi
2015-06-22 22:57:53 -05:00
Xhuis
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04:00
Swag McYolosteinen
e4281bbaab
Merge pull request #10019 from Thunder12345/autoshotgun
...
Moved combat shotguns to shotgun/automatic/combat
2015-06-19 17:06:00 +02:00
Swag McYolosteinen
1dde070d18
Merge pull request #9800 from Dorsisdwarf/wittybranchname
...
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
Xhuis
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04:00
Thunder12345
1c83cc6d45
Pray pray pray
2015-06-18 18:07:57 +01:00
Cheridan
470f21a752
Merge pull request #10004 from Ikarrus/gangimplants
...
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
phil235
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
Ikarrus
fe14ff46ee
- Reduced uzi ammo to 25 influence cost
...
- Added uzis to summon guns
- uncapitalized uzi names
2015-06-17 19:26:02 -06:00
Ikarrus
556b25aec3
Added 9mm 2-burst 32 mag uzis that costs 40 influence. Unlike tommy guns gangs will be able to purchase ammo for uzis.
2015-06-17 09:36:15 -06:00
Thunder12345
bfb2345726
Moved combat shotguns to shotgun/automatic/combat
...
- shotgun/automatic/ will pump itself automatically on firing
- combat shotgun capacity nerfed to 6 rounds
- replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
Xhuis
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
Cheridan
7aba70ecf3
DRAGnet lives!
2015-06-15 23:55:28 -05:00
xxalpha
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
Ikarrus
d59c67ecd0
Squashed commit:
...
[c9795d3] Writing and formatting tweaks
[65aae64] Tweaks to messages and notices, formatting, and cleanup. (+2 squashed commit)
Squashed commit:
[995a61b] I guess I should call them for what they are (9mm)
[0f04213] - tweak: "While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control."
- tweak: "Tommy guns no longer deal stamina damage."
[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown
[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)
Squashed commit:
[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence
[4e65dff] - Capped outfits in stock to 10
[1f347a9] Changelog
[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)
Squashed commit:
[1f347a9] Changelog
[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)
Squashed commit:
[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown
[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)
Squashed commit:
[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence
[4e65dff] - Capped outfits in stock to 10
[1f347a9] Changelog
[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)
Squashed commit:
[1f347a9] Changelog
[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time)
2015-06-13 22:13:01 -06:00
Xhuis
700c461422
FEATURE FOUR: Bulldog shotgun darts
2015-06-07 13:08:17 -04:00
Dorsisdwarf
fc88bce4b6
sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it
2015-06-05 14:05:32 +01:00
CosmicScientist
a94075d07d
Edited pAIcard displayed message, donksoft dart description and some tips of the round.
2015-05-24 20:49:06 +01: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
Fayrik
0173c7af6e
Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)
2015-03-21 16:18:32 +00:00
Fayrik
d3d491588e
Cleaned up the functionality and prepared things for PR.
2015-03-20 23:19:19 +00:00
Fayrik
57f544ffdf
Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff.
2015-03-20 23:19:04 +00:00
Fayrik
a030c9889e
Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check.
2015-03-20 23:03:06 +00:00
Fayrik
b758992e8c
First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.
2015-03-20 23:02:53 +00:00
Jordie
fb6aa85094
Merge pull request #8274 from Thunder12345/techshellening
...
Shotgun party, new shells, an improvement and a fix
2015-03-16 18:30:14 +11:00
Thunder12345
8a780e89bf
Overloading improvised shells
...
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
2015-03-11 11:41:26 +00:00
Miauw
09cf2e474f
Reduces the taser firing delay.
2015-03-10 19:36:05 +01:00
Thunder12345
9723f6d092
Laser slugs + improvised shell fix
...
Adds laser slugs, fixes improvised slug recipe
2015-03-10 15:55:29 +00:00
Thunder12345
56ab83d4e7
Ion shell updates
...
Ion shell now acts as a shotgun of weaker ion bolts. Stronger than a
regular ion rifle when fired point blank, but suffers at longer ranges.
2015-03-10 14:42:08 +00:00
Thunder12345
a1a5edd314
FRAG-12, ion, improvised shotgun shells
...
Adds: Ion slug, ion rifle in a shotgun shell
Improves: Improvised shell, new sprite + recipe
Fixes: FRAG-12 slug, now with 100% more explosion
2015-03-10 13:57:54 +00: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
paprka
393123b50b
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
code/modules/projectiles/gun.dm
icons/obj/guns/energy.dmi
2015-02-24 20:03:33 -08:00
Steelpoint
da53175ad5
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +08:00
Steelpoint
1221f012c6
Breach to Disable
2015-02-20 11:41:56 +08:00
hornygranny
ea12d68e60
Merge pull request #7817 from paprka/whatthefucktg
...
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
paprka
efbb4f5116
makes syndicate shotguns spawn with buckshot by default
2015-02-18 14:10:46 -08:00
paprka
388e0a330e
fixes firing delay
2015-02-18 02:55:28 -08:00
paprka
15e2b88a0f
removes bloat from magazines icons
2015-02-17 19:43:20 -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
