Commit Graph

941 Commits

Author SHA1 Message Date
ShizCalev
f912b6eae0 Fixes Lord Singuloth hungering for more than he should (#33025) 2017-11-24 05:45:47 -05:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
ACCount
b161b18599 Integrated circuit fixes and code improvements (#32773)
* Fucking conflicts

* Small code changes

* Makes the IC printer start upgraded to offset balance concerns caused by a fixed bug
2017-11-21 10:04:09 +01:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
Jordie
8b19b490d1 JSON feedback (#32188)
* wip

* wip2

* makes code actually compile on 511 + fixes

* versioning

* s

* adds python conversion script, schema change and removes 'force ' from item_used_for_combat

* fix to compile

* forgot to actually commit this
2017-11-17 02:43:12 -05:00
FrozenGuy5
5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00:00
Leo
c1450bbdc1 Merge pull request #31809 from ShizCalev/helper-cleanup
Cleans up some istypes not using helpers
2017-10-17 22:20:42 -02:00
ShizCalev
721df8dacf Cleans up some istypes not using helpers 2017-10-16 15:30:30 -04:00
kevinz000
2a43a4f657 Fixes a bunch of bugs (#31687)
Fixes #13784 by forcing all orbits to update if the lowest stacked one updates
Fixes #21573 by making singularity try to move if it can't expand
Fixes #23306 by making simple bots that are off not able to move
Fixes #28274, fixes #26515 by actually making snipers zoom out
2017-10-16 21:12:32 +13:00
kevinz000
64851d819a Moves projectile processing to a subsystem (#30599)
ITT worst coder tries not to break everything and improve the code.
fixes #29211
🆑
refactor: Legacy projectiles have been removed. Instead, all projectiles are now PIXEL PROJECTILES!
rscadd: Reflectors can now be at any angle you want. Alt click them to set angle!
/🆑

Also lets just
fixes #18133
because the shortest path from point A to B is a straight line, when projectile ranges are "number of times moved/processed" ofcourse it's going to be shorter if you fire diagonally. It will be a problem as long as range is done like that or if range are in "pixels/tiles" moved without outright using get_dist.
2017-10-16 15:50:42 +13:00
Jordan Brown
04c05d8e5c Adds defines for organ slots (#31737) 2017-10-15 20:33:35 -04:00
kevinz000
b83d777119 Removes a bunch of sleeps/spawns and makes a few booleans defines (#31553)
* spawn/sleep removal part 1

* sleep/spawn/src. removal

* fixes type paths in timers

* Fixes some variable passing

* Why do I have to do this 20 times to get it right..?

* Why do I have to do this 21 times to get it right..?

* Update suicide.dm

* Update software.dm

* Update paper.dm

* Update cable.dm

* Update ninjaDrainAct.dm

* Update hypospray.dm

* Update vocal_cords.dm

* Update touch_attacks.dm

* Update revenant_abilities.dm

* woops

* Update revenant_abilities.dm
2017-10-14 19:53:17 -04:00
Tad Hardesty
c1794bb402 Fix many instances of "the the"
All uses of "the [src]" have been fixed, as well as other bad string
interpolation directly adjacent to such uses.

In addition to its message, the circumstances under which the tracking
implant locator fails have been updated to use the correct define,
malfunctioning on CentCom rather than on the station.
2017-10-11 21:55:44 -07:00
Tad Hardesty
13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
Jordan Brown
b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
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
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
kevinz000
94bb5beef5 Preliminary blast cannon cleanup (#31264)
* Update blastcannon.dm

* Update blastcannon.dm

* Update blastcannon.dm
2017-10-05 10:32:13 +13:00
ShizCalev
51c48409a6 Stops putting RCD, bluespace bags, and staves into ORM (#31093)
* Stops putting RCD, bluespace, and staves into ORM

* CB

* Chat message
2017-09-29 19:33:19 -05: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
JJRcop
69669be0ad Possibly fixes runtimes with gun suicide
oops
2017-09-22 02:54:34 -04:00
JJRcop
5669008080 Suiciding with a gun blows your brain out 2017-09-22 01:42:21 -04: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
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
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04: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
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
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