Commit Graph

153 Commits

Author SHA1 Message Date
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Thunder12345 608486a919 Typo fix 2015-06-17 18:55:05 +01:00
Thunder12345 275bde00ef Changed description slightly 2015-06-17 15:49:56 +01: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
phil235 ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
Iamgoofball a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
kingofkosmos c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03: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
Iamgoofball 4de75c539f Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
Iamgoofball c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Ikarrus 351fa89c3a - Renamed tommy guns and made them w_class 5. They're powerful as hell, so they're going to have to be non-concealable. (+3 squashed commit)
Squashed commit:

[acab7ea] - Gang messages distinct between bosses and lieutenants.
- Initial gang points reduced to 25 so they can't buy a pen right away

[140e599] 20 -> 10

[b03fbba] Bulletproof vest + Bugfixes (+1 squashed commits)

Squashed commits:

[b03fbba] Bulletproof vest + Bugfixes
2015-06-11 23:42:08 -06:00
Jordie0608 03ab08112f animated foam pistol shoots proper darts, no generic surgery, augmented eyesight gives nightvision and reagents in admincookie 2015-05-31 18:25:34 +10:00
Jordie 0c08ffb95e Merge pull request #9183 from GoonOnMoon/ARG1
ARG Assault Rifle Addition
2015-04-28 23:49:33 +10:00
kingofkosmos 761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos 72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
GoonOnMoon a326594e0f Removes syndie tech origin from the ARG rifle. Adds it to summon guns. 2015-04-20 15:57:39 -05:00
GoonOnMoon d1b102361d Adds Nanotrasen's equivalent of the M90 assault rifle to the game: the ARG. Currently only obtainable with badminnery. Uses 5.56mm ammunition.
Added myself to admins.cfg as a coder.

Added new icons for the ARG.
2015-04-20 14:21:40 -05:00
GoonOnMoon 4f8c791145 Adds a new assault rifle for the nanotrasen noobs to use. Currently only available with badminnery. 2015-04-19 23:50:49 -05:00
Ikarrus 71d529a6a5 More adjustments
- added unrestricted-use guns
- excluded fake toy guns
- Unexcluded throwing stars
2015-04-11 14:37:21 -06:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
pudl 69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Fayrik 117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00: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 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
Jordie0608 f0731d01e2 changelog compiled 2015-03-17 20:03:31 +11:00
phil235 921ed1330e Fixes russian revolver's special mechanism message appearing when placing it on a table or in your inventory.
Fixes its description about auto spinning barrel.
Fixes its behavior when used as a melee weapon.
2015-03-12 14:34:23 +01:00
Cheridan 7ec6ad84cd Merge branch 'renamingandreskinning' of git://github.com/paprka/-tg-station into paprka-renamingandreskinning
Conflicts:
	icons/mob/back.dmi
2015-03-08 23:15:22 -05:00
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
paprka 9e450b30df further improvements and changelog 2015-02-25 00:25:27 -08:00
paprka 7a8e78a4c3 this kills the object verbs 2015-02-25 00:19:53 -08:00
phil235 3e100729bc Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you. 2015-02-22 23:02:07 +01:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
paprka cff73d83c6 fixes improvised shotgun back slot invisible shit 2015-02-13 14:04:23 -08:00
paprka 3430cfaf44 Merge branch 'master' of https://github.com/tgstation/-tg-station into jamesbondiguess
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
2015-01-23 16:55:52 -08:00
paprka c41e707ee4 restores the ability to attach suppressors 2015-01-22 18:53:46 -08:00
Firecage 72af5ffb8f Did what HG said to do with Protosmg firing pin 2015-01-22 08:08:14 +02:00
Firecage d18511eb72 This removes the firing pin from the Prototype SMG, and adds the standard firing pin to its children where they need it. 2015-01-21 23:33:49 +02:00
paprka 88230fabfa inhand refactor 2015-01-18 20:58:31 -08:00
paprka a2fe7f0352 bloat killer 9000 2015-01-17 16:36:27 -08:00
paprka 4a0aa0c0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/ammunition/ammo_casings.dm
	code/modules/projectiles/ammunition/boxes.dm
	icons/obj/ammo.dmi
	icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
tkdrg 6bfebf2e48 Adds bolt-action rifle
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151

These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.

The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03: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 2fd8b3e749 nerfed saber slightly 2015-01-13 20:05:37 -08:00