Commit Graph

463 Commits

Author SHA1 Message Date
Razharas 923f8fc565 Merge pull request #2800 from MrPerson/del_in_progress
Only report emitter/SMES deletion if the round's in progress.
2014-02-16 08:36:25 -08:00
fleure aead3ee208 Merge pull request #2770 from Aranclanos/singularitynomnom
singularity spawn() runtimes
2014-02-16 14:30:47 +00:00
MrPerson c551018db2 Only report emitter/SMES deletion if the round's in progress. Should mean less log/message spam because of the emitter crate. 2014-02-15 00:18:10 -08:00
hornygranny e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Aranclanos 18d7081d33 removes a spawn() from the singularity consume proc that was causing runtimes. I think it also makes the singularity less laggy? Or maybe it's just a placebo effect. 2014-02-13 13:17:18 -03:00
Razharas 9d88f3f0bf Changed paths of the compressors
Its power now
2014-02-11 16:18:02 +04:00
Razharas 009fe9eb77 Actual turbine fix
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
2014-02-10 21:53:24 +04:00
Razharas 398b6f48da Turbine fix
Never change byond, never change
2014-02-10 20:21:03 +04:00
MrPerson c269999796 Way to leave those debug messages in, self 2014-02-08 10:53:55 -08:00
MrPerson 6488b34533 Merge branch 'master' of https://github.com/tgstation/-tg-station into NanoSMES
Thanks Razharas, hehe
Merge new SMES vars and Nanou in with constructable SMES and whatnot
2014-02-08 07:51:28 -08:00
Razharas 2666ba1e8b Fixes incorrect cables conflict issue
They work again
2014-02-07 07:07:31 +04:00
Razharas 2d125f0fc5 And more fixes
The ride never ends
2014-02-06 22:32:28 +04:00
Razharas a589387ccf Fixing merge conflicts
THis is getting harder and harder
2014-02-06 22:26:16 +04:00
MrPerson a5eb0b5bbe On second thought, allow turning input/output on and off on SMES no matter what.
Also added a messages telling you specifically if the SMES is actually charging or outputting.

Also clean up some unnecessary shit.
2014-02-05 23:49:04 -08:00
MrPerson c8144bc5c6 Nano UI for SMES
Screenshot:
http://imgur.com/63D3f8b
Buttons are greyed because there's no input available.
2014-02-05 16:32:07 -08:00
Razharas caea1d5108 Fixes cable coils
So glad can code again, probably addicted to it
2014-02-05 19:45:33 +04:00
MrPerson 931da9e7ef Many changes
Much diff
2014-02-04 22:49:38 -08:00
Cheridan ad235cf18f Merge pull request #2563 from Razharas/NewTables
New PR for crafting tables
2014-02-03 08:46:56 -08:00
Cheridan d7f6afc8d2 Merge pull request #2600 from Aranclanos/PAdel
fixes issue #2238
2014-02-02 22:34:41 -08:00
Cheridan b9f47fd412 Merge pull request #2573 from Giacom/MiniStation
Updated the MiniStation map with some minor tweaks.
2014-02-02 16:13:44 -08:00
Aranclanos 68fd365ae8 fixing the Del() of the control panel of the PA 2014-02-02 05:26:05 -03:00
Aranclanos 976e3457b4 added Del() calls for the PA structures/machines 2014-02-02 05:02:09 -03:00
Giacomand 923f46a3a2 Updated the MiniStation map with some minor tweaks.
Added an overlay for the TEG that will display the status of the pipes.
Updated the generator instructions.
2014-01-31 15:40:07 +00:00
Razharas b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
2014-01-31 05:20:59 +04:00
Malkevin 302376eeeb Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/game/objects/items/toys.dm
2014-01-30 19:14:43 +00:00
fleure 3a0d12838a Merge pull request #2528 from RobRichards1997/28/01/2014-Cyberlimb-Sanity
Adds sanity checks to Robotlimb repairs [BUGFIX]
2014-01-30 10:40:12 -08:00
Razharas b0a5ae747d Added SMESes and some turbine fix
Hope it works
2014-01-30 22:21:43 +04:00
Giacomand 7a76e9456b Ported the MiniStation branch.
MiniStation is now a single folder which isn't included by default. When you tick the code file for the ministation map, like with tgstation and metastation, it will then include the necessary code files itself. These code files modify certain datums, like jobs, supply packs and uplink datums.

The modified files outside the MiniStation folder are modifications made by the MiniStation branch which aren't changes exclusive to MiniStation.

Such as changing the unused circulator, which only MiniStation used, so that it was fixed and would correctly match the direction of the thermal generator.
The TEG was also changed to have a better interface and to include the above fix.
The department security was changed so it wouldn't runtime if it didn't find a checkpoint.
The preferences' SetChoices was changed so that the screen would automatically grow for every column in the job list.

The main difference between this version and the forked version is that the Unemployed and the Lieutenant was reverted back to their original names; since it would've been a massive pain to add support for that.
2014-01-29 22:36:10 +00:00
Robson Richards 859d909a2b Adds sanity checks to Robotlimb repairs 2014-01-28 17:03:25 +00:00
Razharas a6ae0c06d4 Added constructable turbines
By Number's request
Also fixed some other minor stuff
2014-01-28 03:51:03 +04:00
Malkevin a1c4c4bbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/modules/mob/mob.dm
2014-01-26 19:22:33 +00:00
Razharas 13d3cb21ce A bunch of fixes of using old type of proc
Now it all deconstructs properly
2014-01-26 11:56:14 +04:00
fleure e8573cc416 Merge pull request #2373 from RobRichards1997/14/01/2014-Bug-Fixes
Robotic Repair Missing fixes [Fixes #2326]
2014-01-24 11:17:54 -08:00
Razharas d0abafed36 Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-22 10:11:00 +04:00
Razharas ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
Robson Richards 1ff14a5fcf Adds item_heal_robotic() - a way for items to trigger robotic limb heal procs without copy-paste 2014-01-21 07:38:46 +00:00
fleure ad49512b4e Merge pull request #2440 from Petethegoat/suicideformat
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-20 11:11:23 -08:00
Alek2ander 9fa38637ad Logs everywhere
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
2014-01-19 21:16:30 +04:00
Pete Goodfellow af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
Robson Richards 86eae3a376 Moves some use()'s so that they always execute the message near them. 2014-01-15 17:19:49 +00:00
Robson Richards 4dabdc67e2 Fixes #2326
- Moves Robotic repair stuff to the two item's respected attack()'s
- Removed them from the human_defense.dm
2014-01-15 16:46:47 +00:00
Razharas 03d1396aff Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-15 03:56:04 +04:00
Aranclanos 8a56589e3e Merge pull request #2292 from sirbayer/srsbsns-determinism
Remove RNG from armor
2014-01-14 05:01:24 -08:00
Razharas 6d4fe3d08d Conflict resolve attempt 2014-01-12 03:33:04 +04:00
Rockdtben d3f2befb54 Merge pull request #2293 from Faerdan/master
NanoUI Update
2014-01-11 13:42:32 -08:00
Malkevin a8c153a290 A bunch of bug fixes
-fixed space ninjas not being able to charge directly from power cells - fixes #2139

-'fixed' Distro/Waste Monitors not displaying pressure read out when sensor was reading zero pressure - fixes #
227

-removed the canmove check on camera consoles - fixes #490

-Fixed stealmin's real ckeys showing in the admin-pm reply dialog's title - partially fixes #2163

-Fixed people buckled to chairs not dropping their items when appropriate (like when dead) - fixes #2172

-Fixed people being able to use uplink functions whilst stunned/dead/etc - fixes #2144
2014-01-11 18:37:31 +00:00
Razharas 551a7ab0a3 Issues fixing
Added biogenerator and freezer/heater
Fixed issues gia pointed out
Added some lost sprites
2014-01-11 00:56:28 +04:00
Giacomand f1e7637bab Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm
Testing has revealed that it reduces the sluggishness of the game, though it will spike from lag when the singularity is loose. Thanks to ChuckTheSheep for suggesting it.

Server owners who want to keep set background enabled can do so by changing the define.
2014-01-10 18:32:28 +00:00
Mark Aherne (Faerdan) 53b2d2e928 NanoUI Update
* Refactored the code used in the ui_interact procs to be neater and easy to understand (also less code duplication). Updated all existing ui_interact procs to match.
* Rebuilt (and simplified) template rendering system, removed data-linking (the use of carets "^" in templates) and the need to send the full data structure every update (just send whatever you want now, it's fully dynamic). Updated all existing templates to match.
* Restructured HTML and JavaScript to increase compatibility with IE (this fixes "blank uis" for many users).
* Increased the number of error messages to help diagnose issues.
* Multiple performance improvements, especially when updating an open ui.
* Added the ability to update a ui for an individual user (nanomanager update_user_uis proc, used for things like realtime messages in Bay's PDA).
* Added a "Loading..." notice to the UI. If this stays then your JavaScript isn't enabled.
* Removed redundant wip apc.tmpl file.
* Added a link to the online docs in TemplatesGuide.txt.
2014-01-09 01:02:13 +00:00
sirbayer ef7e3258ae Rads finally work. War never changes. 2014-01-08 16:32:35 -08:00