Commit Graph

1709 Commits

Author SHA1 Message Date
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
ShizCalev db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
Xhuis 198b39acfc Missile no longer ricochet 2017-07-14 17:34:56 -04:00
oranges 5494f5328a Rename Bump to Collide (#29207)
This reduces confusion arising from the fact byond already has a built
in byond proc also named Bump.

We used an argument called yes to distinguish our Bump from byond's
builtin bump, but then we failed to make sure everyone of our bumps
properly override it, so a bunch of things have been double bumping

This resolves that issue permanently

I've also removed the second argument as it no longer has a purpose

I also cleaned up the recycler bump as it didn't do anything the
parent procs didn't already do
2017-07-14 13:47:22 +02:00
kevinz000 7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03:00
Jordan Brown d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Joan Lung ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
Jordan Brown c1e3ac82ec Merge pull request #29081 from Fox-McCloud/reflect-refactor
Minor Projectile Reflection Refactor
2017-07-07 09:52:45 -04:00
Fox-McCloud 46b16513e2 it's truly false 2017-07-06 16:13:22 -04:00
Joan Lung bea7bf9297 Adds Necropolis curses for cursed items in Necropolis ruins (#28992)
* Adds Necropolis curses for cursed items in Necropolis ruins

* Adds sounds credit @FuryMcFlurry

* stat tweak

* these are painful enough

* a bit stronger

* i kind of wish there was a version of get_ranged_target_turf() that worked off of angle.... but there isn't

* smart coder 2000

* bossed around
2017-07-06 11:14:26 -04:00
Fox-McCloud 380e938dae Minor Projectile Reflection Refactor 2017-07-06 02:45:30 -04:00
Joan Lung 888b2e093e Makes the lavaland pressure check a proc (#28954)
* Makes the lavaland pressure check a proc

* code that probably did nothing tm

* sss

* 50 should be a define instead
2017-07-02 20:14:42 -04:00
Supermichael777 f29a038d71 DNA syringe gun damage down to 'sane' from revolver (#28975)
* Fixes a bug

* This didnt do what I thought it did
2017-07-02 19:02:04 -03:00
Ergovisavi f5d800a06d Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
# Conflicts:
#	icons/effects/96x96.dmi
2017-07-01 16:20:05 -07:00
Ergovisavi 1a118c0651 Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
# Conflicts:
#	icons/effects/96x96.dmi
2017-06-30 21:31:32 -07:00
Xhuis e1b0f6328c Fixes reskinned guns being invisible 2017-06-30 16:05:59 -04:00
Ergovisavi 999282e9d8 Junglestation frog mob take 1 2017-06-29 07:30:18 -07:00
kevinz000 226c0f1636 Fixes piggybacking giving person on top projectile density instead of the person on the bottom. (#28770) 2017-06-26 11:01:17 -03:00
Joan Lung 70e712017e Status effects start processing immediately instead of on the next timer subsystem tick (#28747)
* Status effects start processing immediately instead of on the next timer subsystem tick

* let's fix this while we're at it

* hup

* not technically efficient but better than not updating when needed
2017-06-25 12:47:10 -04:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
nicbn 77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Really-Good-Soda-Flavor 40de86de35 Moves reskinning items to /obj (#28558) 2017-06-21 15:19:17 -03:00
Jordan Brown e5b1e68147 Adds a configurable message to be sent to mobs on polymorph (#28541) 2017-06-21 09:48:13 -03:00
Mike Long 39103452a3 Lordpidey devil fixes (#28101)
* Fixes on #28051

* Changes hellfire around some, it's now more consistant.

* Fixes small exploit with infernal jaunt.

* Moves devil antag datum with the rest of the antag datums.

* Corrects syntax errors within codex gigas tgui template.

* Re updates tgui js after merge.

* removes redundant .loc from call.

* Fixes devils sometimes getting duplicate spells.
2017-06-21 10:47:02 +02:00
Jordan Brown c5e67b5ce1 Merge pull request #28619 from ChangelingRain/taserfix
Tasers and projectiles stun for the proper amount
2017-06-20 21:05:15 -04:00