Commit Graph

449 Commits

Author SHA1 Message Date
Razharas a589387ccf Fixing merge conflicts
THis is getting harder and harder
2014-02-06 22:26:16 +04: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
Razharas 80b592d0b3 Resolving conflicts
God hates git
And so do i
2014-01-03 21:12:14 +04:00
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Razharas 4f8389ec0e Constructable machines will depend on R&D parts
DNA scanner:
Laser quality lessens the irradiation
Manipulator quality drastically improves the precision(9 times with best
part)
Scanner quality allows to scan suiciders/ling husks, best part enables
cloner's autoprocess button, making it scan people in the scanner
automatically
Clone pod:
Manipulator quality improves the speed of cloning
Scanning module quality affects with how much health people will be
ejected, will they get negative mutation/no mutations/clean of all
mutations/random good mutation, at best quality will enable clone
console's autoprocess button and will try to clone all the dead people
in records automatically, together with best DNA scanner parts cloning
console will be able to work in full automatic regime autoscanning
people and autocloning them
Borg recharger:
Capacitors' quality and powercell max charge affect the speed at which
borgs recharge
Manipulator quality allows borg to be slowly repaired while inside the
recharges, best manipulator allows even fire damage to be slowly
repaired
Portable power generators:
Capacitors' quality produce more power
Better lasers consume less fuel and reduce heat production
PACMAN with best parts can keep whole station powered with about sheet
of plamsa per minute(approximately, wasnt potent enough to test)
Protolathe:
Manipulators quality affects the cost of things(they will also have less
m_amt and g_amt to prevent production of infinity metal), best
manipulators reduces the cost 5 times (!)
Imprinter:
Manipulator quality affects the cost, best manipulator reduce cost(acid
insluded) 4 times, i.e. 20 boards per 100 units of acid
Destructive analyzer:
Better parts allow items with less reliability in
Redone how reliability is handled, you now see item reliability in the
deconstruction menu and deconstructing items that has same or one point
less research type level will rise the reliability of all known designs
that has one or more research type requarements as the deconstructed
item
Designs of the same type raise in reliability more
Removed reliability_base and reliability_mod completely because they
served no purpose
Critically broken things rise reliability of the design drastically
Whole reliability system is not used a lot but now at least on the R&D
part it finally matters
Didnt touch telecomms machinery, R&D code is messy but tcomms is just
another level, im not high enough to touch it yet
Most of things except for pacman are tested ingame, no bugs/runtimes
detected
2013-12-23 21:39:27 +04:00
Aranclanos 53a02296df Merge pull request #1989 from Perakp/dnaDecon
DNA scanner and cloning pod deconstruction
2013-12-17 20:44:16 -08:00
KazeEspada 7513625c48 fixes a rare runtime that occurs when the turbine couldn't find a compressor. Brings the code up to current standards. Removes the view function from the computer. Its rather obsolete in the days of telescreens. 2013-12-15 17:38:23 -07:00
EuroNumbers e9e9977249 Standarized the code further, added interact that doesn't shit the compiler 2013-12-15 19:23:54 +01:00
Perakp 5d1f63f924 <span> and cable use()
- Added more span tags
- using cable now uses use()
- fixed use() to correctly return 1 when it succeeds
- checked that there were no checks that would’ve been previously
borked. For testing purposes I renamed use to use_cable (‘use’ is kinda
bad for a proc name, but use_cable is hardly better), but left that out
of the commit because it would’ve inflated the pr.
2013-12-15 12:07:55 +02:00
EuroNumbers 279e84f12b Updates turbine.dm to bypass the 'code\modules\power\turbine.dm:234:error: interact: duplicate definition' 2013-12-14 20:16:25 +01:00
EuroNumbers 29d637240f Update turbine.dm
Replaced outdated code that wounded up there for no reason.
2013-12-09 01:25:10 +01:00
EuroNumbers 64c08c6482 Update turbine.dm
Made compatible with LINDA
2013-12-09 00:17:03 +01:00
EuroNumbers 372992ca36 Lowercased "gas turbine control computer" 2013-12-08 22:47:29 +01:00
EuroNumbers c2a4de92cc Update turbine.dm
Turbine now works as intended in rev4407
Tweaked the power generation too to fit the increased demand
Still needs a better computer code
2013-12-08 21:33:25 +01:00
Perakp ce9f29fb86 Applied logic to portable generator deconstruction. 2013-12-07 09:27:56 +02:00
Perakp b8a7957a22 Adds deconstruction for DNA scanner and cloning pod.
Adding wires to a machine frame uses one unit of wire.
Wires returned from deconstructing return 1 unit of wire.
Fixes issue #1001
2013-12-07 08:55:07 +02:00