Commit Graph

79 Commits

Author SHA1 Message Date
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
kingofkosmos
086d636b17 Alt-clicking descriptions when examining (#30988)
* Adds what alt-clicking does into examine-messages.

* whoops fix

* AI holopad examine remove

* Fixed cigarette pack alt-clicking.

* Spear alt-click-message set to show only if explosive lance.
2017-09-29 15:51:31 +13:00
ShizCalev
5d91844926 Fixes suppressing weapons in your bag / pocket (#30894)
* Fixes suppressing in pocked and w_class issues

* Used defines for some things

* Reworded

* Removed the now redundant initial_w_class var

* Early returns

* Null
2017-09-26 11:19:00 +02:00
Cyberboss
08a3c4bd0d Merge pull request #30824 2017-09-17 21:08:12 -04:00
pubby
fa3ea7d803 Fix maple shotgun icon_state (#30796) 2017-09-17 13:41:43 +02:00
shizcalev
81e5154a70 Various grammar fixes 2017-09-17 01:46:41 -04:00
JJRcop
6f1d141143 Fix L6 Saw examine word choice 2017-09-14 11:17:23 -04:00
JJRcop
1f45361beb Adds a tip for L6 SAW machinegun 2017-09-14 02:18:06 -04:00
msgerbs
3e0fdda0e5 Fix syndicate toy C20r and L6 Saw not having riot darts (#30645)
*   Add riot darts back into toy C20r and L6 Saw

Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.

* Comments are good

Especially when inheritance makes everything weird.
2017-09-13 14:00:06 -04:00
BeeSting12
36bd42df53 Spetsnaz Pyro Bundle Rebalance (#30564)
* im gay

* oops did a thing wrong

* wew
2017-09-11 12:32:05 -05:00
Kerbin-Fiber
91a9164062 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter (#30531)
* Automatic changelog generation for PR #30416 [ci skip]

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Automatic changelog generation for PR #30416 [ci skip]

* Delete AutoChangeLog-pr-30416.yml

* Removes riot foam darts from the Donksoft Toy Vendor, however the Syndicate Donksoft Toy Vendor still has riot foam darts.

* Kek

* Changes magazine paths for he Vendors so the Station made one has no riot foam darts at all meanwhile the Syndicate one still has everything just how it is.

* Hopefully fixes this.

* Reee

* Another Fix

* Another Fix, while I'm at it

* My Changelog

* Minor Fixes

* Grammar Fix
2017-09-10 18:42:16 +10:00
pubby
65bb0a3e32 Ammo cleanup (#30361)
* Clean up ammo

* Fix maps

* Cyberboss ammo cleanup fixes
2017-09-07 11:02:44 -04:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk
371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
shizcalev
1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
Joan Lung
36d70f3114 Removes bows 2017-07-26 18:39:57 -04:00
ShizCalev
0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
shizcalev
f31cbb3ac5 Nanotrasen 2017-07-23 04:08:57 -04:00
Joan Lung
ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Really-Good-Soda-Flavor
40de86de35 Moves reskinning items to /obj (#28558) 2017-06-21 15:19:17 -03:00
Joan Lung
2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
InsaneHyena
5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Expletive
70cdc48376 Fixes #27979 (#28002) 2017-06-04 12:11:44 +02:00
Nick
70506a29ae the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978) 2017-06-03 23:45:28 -03: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
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
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
725f669726 Gang Sniper 2017-05-23 19:50:24 -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
6e60d8d6ed InitialCommit 2017-05-22 14:50:04 +08: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
Robustin
889eefdca5 more gang guns 2017-05-12 16:04:44 -04:00
Lularian
36f0916b44 SWAT teams use LMGs right? 2017-04-26 02:43:57 -05:00
Joan Lung
dc0e007a23 A bunch of Initialize()s now have return values (#26464) 2017-04-25 10:51:40 +02:00
QualityVan
f23a31edfa Fixes loading ammo for the L6-SAW (#26370) 2017-04-20 15:31:02 -04:00
oranges
ec0f7a6859 Merge pull request #26298 from MrStonedOne/patch-347
Revert unrelated change from #24878
2017-04-19 11:04:47 +12:00
QualityVan
9c114b993b Adds suppression to the foam pistol, smg, and c20r (#26288) 2017-04-17 18:43:47 -04:00
oranges
3802aac356 Slight shotgun tweak to lose a spawn (#26296) 2017-04-17 18:43:01 -04:00
Kyle Spier-Swenson
a6abd2b911 Revert unrelated change from #24878 2017-04-17 02:59:07 -07:00
XDTM
a48bf2993d Fixes some chameleon clothing not appearing in the list (#25551)
* Fixes some chameleon clothing not appearing in the list

* bio suit (1) => bio suit (bio_suit_janitor)
2017-03-31 08:24:21 +02:00
Cyberboss
8ac4aaf115 Guess what? Qdel hint! (#25117) 2017-03-14 20:40:35 -04:00
coiax
f1d1e6f5e9 Demotes HANDSLOW to secondary flag (#24878)
It's used in literally four places, it doesn't need a high speed
bitflag slot.
2017-03-13 21:59:48 +13:00