Commit Graph

1666 Commits

Author SHA1 Message Date
Leo ae03d43caa Merge pull request #33652 from MoreRobustThanYou/teemwork
Renames /datum/objective_team to /datum/team
2017-12-19 15:23:28 -02:00
duncathan salt 6a7dbaabfd removes silly garbage defines (#33621) 2017-12-19 12:02:54 -02:00
More Robust Than You 6b642d220f Renames /datum/objective_team to /datum/team 2017-12-18 07:30:31 -05:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Ashe Higgs d447acdc6e All-In-One grinder results are now defined by type, not by huge lists (#33181)
I had some time free, and noticed how awful the reagent grinder code was - it used huge static lists containing types and their associated reagents from grinding.

This is now split into two new vars on /obj/item - var/list/grind_results and var/list/juice_results, as well as two new helper procs, on_grind() and on_juice() to allow those to change based on conditions like plant potency. Such checks and the like have been moved to that. If any of these procs return -1, the operation is canceled.

I also fixed some of the recipes that didn't work. The reagent IDs for them didn't exist, leading me to believe that they weren't tested. I corrected that! (I've tested every single recipe in this PR, with the exception of a few juicing-related ones.)
2017-12-15 10:48:25 +13:00
vuonojenmustaturska 5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
Tad Hardesty ce116b6d96 Correctly set description of nonstandard cells 2017-12-12 03:50:47 -08:00
AnturK 3d813853b5 Roundend report refactor (#33246)
* Roundend report refactor

* I won't be fixining every moved part but here you go

* Preparation for feedback

* Fixup

* First draft of feedback (wip)

* Simple version of feedback for custom objectives/explanation texts

* Debug verb removal

* Fixes & show again action button

* Admin objective handling

* Fix and first step of css standarization.

* Every time

* More css

* Fix

* Fixes, abductee datum, css tweak

* Feedback and css fix

* CLIENT DETAILS DATUM + CLIENT ACTIONS + spilled css fix

* Integrates clockult badcode

* Fix

* Fix lists in assoc feedback

* Unified antagonists and teams feedbacks, bumped up antagonists version

* Adds chat link to reopen the the report

* Fixes some clockcult stuff, passes antag name to feedback

* review stuff

* fix

* Adds some missing spacing

* Roundend corners, has css gone too far.

* Spacing between same antags

* Changeling and traitor objectives now have same spacing

* Wizar report typo fix

* Wrap brother team.

* Also move it to more relevant file

* Fixes cult summon objective

* Fixes roundend report for full-round observers

* Fixes wizard with apprentices roundend report

* Tutorial scarabs don't show in roundend anymore, adds some check_ticks

* Prettier station goals

* Merges roundend delay things

* Spread the lag around

* Fixes relogin qdeling eminence

* ckey -> key
2017-12-11 11:57:20 -05:00
Jordan Brown 118d9605b0 Merge pull request #33376 from Xhuis/patch-3
Flickering no longer enables emergency lights
2017-12-09 16:16:40 -05:00
Xhuis da9b9659c0 GOTCHA 2017-12-08 13:38:41 -05:00
Ashe Higgs 193ef1c91f Update lighting.dm 2017-12-07 17:13:01 -05:00
Ashe Higgs c39e5ccca0 Flickering no longer enables emergency lights 2017-12-07 17:05:06 -05:00
Jordan Brown 8c8eba8b94 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-07 13:50:09 -05:00
deathride58 3265d09328 Nerfs criticism 2017-12-06 12:46:02 -05:00
AnturK 0072ab76f2 Fixes light breaking 2017-12-06 10:07:09 +01:00
deathride58 1904080823 i fucked up - GLOBAL.DEFAULT_VIEW > GLOB.DEFAULT_VIEW 2017-12-05 21:53:52 -05:00
deathride58 b765f50302 makes the default view scale a config option 2017-12-05 21:44:56 -05:00
oranges bf9f81bf7e Merge pull request #32751 from ninjanomnom/keybindings
In-code key handling system, Take 2
2017-12-05 22:15:13 +13:00
AnturK 9f48426ff0 Fixes powernets (#33288) 2017-12-05 03:11:53 -05:00
oranges bd954fe780 Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 20:42:25 +13:00
Jordan Brown feae1796c0 Fixes lighting update recursion (#33258) 2017-12-04 12:02:42 +01:00
Ashe Higgs fe816daca1 Adds emergency lights, built into light fixtures (#33213)
* Adds emergency lighting

* Checks for the cell during construction

* Adds AI/APC control of emergency lights

* Malfunction ability

* get_area(src)

* Loop checking, processing to come when clarified

* that DOES remind me to do this!
2017-12-03 13:53:58 -05:00
Tad Hardesty c6da68ab62 Measure energy values in joules 2017-12-02 16:05:31 -08:00
ninjanomnom 7b7b67edd8 In-code key handling system 2017-11-30 07:40:27 -05:00
Emmett Gaines 642fa696eb sm soundtweak (#33154) 2017-11-29 21:58:56 -05:00
Matt Smith e21be98e0f Fix turbine showing broken (#33144) 2017-11-29 21:55:45 -05:00
Leo 23663b985b Merge pull request #32985 from YPOQ/airlockfix
Fixes AIs being unable to interact with unscrewed airlocks
2017-11-24 18:10:55 -02:00
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
YPO e628b58a05 Same for APCs 2017-11-21 23:34:45 -07:00
Matt Smith c1c908fd58 Update Turbine computer to use TGUI (#32944)
* Update Turbine Computer to use TGUI

* Removed `src`

* Update text for broken turbine
2017-11-21 20:05:40 -05:00
ShizCalev 8eafaccc88 Cleans up unused code 2017-11-20 00:03:33 -05:00
Jordie baddcf4c8a Merge pull request #32889 from ShizCalev/turn-consistency
Makes some turning procs consistently turn clockwise
2017-11-20 15:24:52 +11:00
ShizCalev 94002ab42e Rotation proc clockwise consistency 2017-11-18 23:54:13 -05:00
kevinz000 caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
ShizCalev eb22fed8a6 Consistency 2017-11-18 14:17:38 -06: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
vuonojenmustaturska 39375d5cc2 Replaces a bunch of mob loops with hopefully better ones (#32786)
* Free codebase churn

* fixes dviewmob

* a commit

* Partial revert "Free codebase churn"

This reverts commit 9dd41b3860c331637bbc85e694dd32dc59768ad5.

* better fix to dviewmob

* renames living_mob_list to alive_mob_list, adds mob_living_list and carbon_list

* make some use out of the shiny carbon list

* make some use out of the shiny new living list

* more things, also make the mobs subsystem (Life) use living list

* bonus

* domo arigato mr. roboto

* compile fixes, also made the drone code less dumb

* better?

* make admin message prettier

* honk

* fixes blobs

* rev fixes

* one small thing
2017-11-16 23:08:40 +01:00
Robustin eeb3e97a1b Tesla no longer NOTHING PERSONNEL's the power beacon (#32714)
* Tesla beacon movement sanity

* Announcement tweak
2017-11-14 14:12:41 -06:00
AutomaticFrenzy 40b918f341 Alt clicking additions (#32607)
Adds alt clicking to lock/unlock for apc and air alarm
2017-11-14 14:48:25 -05:00
ShizCalev c3981ff578 [WIP] Floyd's wild sound adventure (Adds sound_loop datums to a bunch of machinery) (#32336)
* noisy

* Adds sounds to modular computers

* Adds range modifier var to sound loops

* finetunes computer sound range

* maybe fixes stuff

* changes some of the sound lengths

* borgs and some small changes

* sanity

* gravgen makes noise too
 (reverted from commit ea523084c2)
2017-11-13 14:20:34 -05:00
Jordan Brown 2d04e1172d Merge pull request #32641 from praisenarsie/patch-8
blah blah adds some initialize() for squeaky clean code and performance
2017-11-13 12:37:22 -05:00
oranges ac8864b6e3 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 22:18:37 +13:00
Qustinnus ea523084c2 [WIP] Floyd's wild sound adventure (Adds sound_loop datums to a bunch of machinery) (#32336)
* noisy

* Adds sounds to modular computers

* Adds range modifier var to sound loops

* finetunes computer sound range

* maybe fixes stuff

* changes some of the sound lengths

* borgs and some small changes

* sanity

* gravgen makes noise too
2017-11-13 22:10:43 +13:00
Jalleo 2f9537c7a9 Refactor of base machinery a tiny bit more. DONE (#32546)
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
2017-11-12 14:19:04 -05:00
FrozenGuy5 5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00:00
FrozenGuy5 de0d93467e Adds alot of initialize() in lots of files 2017-11-11 20:58:15 +00:00
as334 f71595a3e2 Assmos tweaks/minor additions. (#32400)
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.

* Review response.

* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:30:36 -06:00
AnturK cd1c4f9df9 Pirate Event 2017-11-04 17:33:45 +01:00