Commit Graph

1734 Commits

Author SHA1 Message Date
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +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
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02: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
KorPhaeron
b8244823b7 Prevents medbeams from crossing themselves 2017-08-27 10:41:27 -05:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
pubby
d2290096c5 Gorillas (#29923)
* Add gorillas

* forgot the sound effect

* Fixes

* Split emotes into new file

* Restore perfect knockdown

* oops

* Gorilla hands

* Cyberboss changes
2017-08-20 20:55:35 -04:00
shizcalev
75dc5d8272 Moved emagged var to item parent. 2017-08-17 22:15:11 -04:00
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
oranges
bb45919ae6 Merge pull request #29688 from PraiseRatvar/PraiseRatvar-patch-1
Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
2017-08-17 10:53:33 +12: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
Leo
5fafb4befe Merge pull request #29889 from Cyberboss/MouseOpacityDefines
Adds defines for mouse_opacity
2017-08-15 13:01:28 -03:00
shizcalev
2a5df54e7c moved can_trigger_gun to weapon parent 2017-08-14 13:30:20 -04:00
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
FrozenGuy5
afe0030205 Update bullets.dm
nerfs hollowpoint for the l6
2017-08-03 19:36:04 +03:00
Jordan Brown
3ec4aec215 Merge pull request #29601 2017-08-01 09:37:28 -04:00
Ashe Higgs
0a32812982 Separates actions.dmi into multiple files (#29587)
actions.dmi is way too cluttered and messy, and with inhands getting the axe I decided to fix this, too. I separated the major categories of actions into their own files, like antagonist-specific actions and spells. A full list of categories is found here:

    actions_AI.dmi contains AI-specific actions;
    actions_clockcult.dmi contains clockcult-specific actions, and scripture quickbind icons;
    actions_cult.dmi contains cult-specific actions as well as sintouch;
    actions_flightsuit.dmi contains flightsuit and flightpack actions;
    actions_items.dmi contains minor item-specific actions such as the hierophant club and jetboots;
    actions_mecha.dmi contains actions related to mechs;
    actions_minor_antag.dmi contains antag-related actions with no other spot, like devils/abductors;
    actions_revenant.dmi contains revenant ability icons;
    actions_silicon.dmi contains minor silicon and console icons, like pAI and xenobiology consoles;
    actions_slime.dmi contains slime actions;
    actions_spells.dmi contains icons for all spells;
    actions_xeno.dmi contains icons for all xeno actions; and
    backgrounds.dmi contains backgrounds for the action buttons.
2017-08-01 14:26:42 +12:00
shizcalev
1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
Cyberboss
662cfd37da Merge pull request #29412 2017-07-30 20:54:44 -04:00
Cyberboss
f5f3758df3 Merge pull request #29288 2017-07-30 20:54:22 -04:00
kingofkosmos
e75d8b9a6f Adds inhand sprites for DRAGnet and Chemical Sprayer, fixes One-point manipulator's in hand. 2017-07-30 18:58:09 +03:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
XDTM
97fc07898c Merge branch 'master' into Hallucinations3.0 2017-07-29 12:43:18 +02:00
Joan Lung
36d70f3114 Removes bows 2017-07-26 18:39:57 -04:00
Xhuis
35c396be90 Fixes some zooming weirdness 2017-07-25 11:27:13 -04:00
ShizCalev
0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
oranges
ab940008b8 Merge pull request #29454 from ShizCalev/nanotrasen
Standardized the corporate name
2017-07-25 09:34:20 +12:00
Joan Lung
522a8d6a95 Projectiles with non-angled sprites will no longer uselessly create and set a matrix (#29430) 2017-07-24 09:49:40 +02:00
shizcalev
f31cbb3ac5 Nanotrasen 2017-07-23 04:08:57 -04:00
Joan Lung
c1512653f5 Colossus's shotgun is now a static-spread blast of 5 bolts 2017-07-20 19:18:36 -04:00
XDTM
6425fbbec0 couple more projectiles, fixes bugs 2017-07-19 21:34:18 +02:00
XDTM
1c716c2f0f Merge branch 'master' into Hallucinations3.0 2017-07-18 22:04:13 +02:00
XDTM
4283a07aa6 stray bullets 2017-07-18 22:00:42 +02:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
oranges
fb113d67c6 Projectile target check hit code now uses a proc for resharing 2017-07-18 06:27:21 +00:00
kevinz000
e71aee23fe Update beam_rifle.dm 2017-07-17 23:24:42 -07: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
kevinz000
b09e519584 Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#28551)
Click catcher now supports mousemove/mousedrag. Basically, mouse location can now be captured even if the user isn't mousing over a visible location
    Added procs to allow for projectiles to be fired with just an angle for pixel projectiles, instead of requiring a target turf and pixel x/y
    Added procs to get angle of user's mouse from their viewpoint (Time to rework gang machine guns again!)
    Beam rifles now have different zoom modes
    Free directional zooms out and tracks the angle of your mouse from the center of the screen. However, you can't target with very good accuracy on this (Shots can't be properly aimed on non dense objects/lying down mobs.)
    Locked directional zooms like free directional but doesn't automatically turn if your aim changes.
    Center view, just increases your view in all directions (2x weaker)
    No zoom mode, in which you just retain your normal view.
    You can select beam rifle zooming rates to be instant or stepped.
    Stepped zooming rates zoom out 5 tiles per second. This will likely help with people not being able to use it without lagging because their computers aren't as beefy!
    Beam rifles no longer require zoom to be fired
    Beam rifle aiming beams now instantly update instead of on process
    Beam rifle aiming beams are now one object instead of 150. This'll help with the lag caused by it during gameplay that I've observed.
    Angular penalty reduced by 0.1 for a nice even number.
    Instances of client.view = have been replaced with client.change_view() as that'll properly update the click catcher
    Hopefully shooting yourself in the face when you hit a blob tile or whatnot is fixed with the new and improved code..
2017-07-17 12:13:03 +12:00
XDTM
3521a3b708 stray bullets 2017-07-16 20:26:42 +02:00
Leo
a3301986b8 Merge pull request #29269 from Xhuis/missile_ricochet_fix
Fixes missiles being able to ricochet
2017-07-16 00:30:02 -03:00