Commit Graph

110 Commits

Author SHA1 Message Date
LatD
143795d230 Fixes imprinter alone not working (#18216) 2016-06-03 14:43:52 -05:00
LatD
a903b4cc79 merge conflicts? 2016-05-28 01:25:33 +03:00
LatD
67190cb762 Fixes things found in testing 2016-05-26 23:30:42 +03:00
LatD
ac11d35ea2 Bug and runtime fixes 2016-05-25 21:43:19 +03:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
LatD
10a483d165 Stat logging for high R&D levels 2016-05-24 21:00:42 +03:00
LatD
fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
phil235
487fb01366 Properly sever the link between rd computer and protolathe/circuit imprinter/destructive analyzer when the rd computer is screwdrived. 2016-05-13 22:23:16 +02:00
LatD
bf3ef135ac Bugfixes and runtime fixes 2016-05-13 22:14:23 +03:00
LatD
c401c8f522 Remove one slow step from DA 2016-05-13 18:50:22 +03:00
LatD
5a8f905b91 Efficiency coeff changes 2016-05-13 01:48:31 +03:00
LatD
e685d82805 Removing reliability 2016-05-12 02:43:18 +03:00
LatD
61fcdfea00 Some initial changes 2016-05-11 20:20:13 +03:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02:00
KorPhaeron
e632d78846 RD Fix 2016-04-02 11:21:49 -05:00
KorPhaeron
26bce514d5 GOOF IN CHARGE OF MATH 2016-03-26 06:12:44 -05:00
c0
9a3276c784 Alien Alloys in RnD 2016-03-12 15:07:32 +03:00
c0
52d91c0cf9 Abductor Tech added to RnD 2016-03-12 15:07:30 +03:00
AnturK
b62988b284 Switches known_designs/tech to associative list. 2016-02-11 20:25:23 +01:00
octareenroon91
38b97120dd Enables design transfer to autolathe by disk.
You can now save a metal-and/or-glass-only design to disk and load it onto an autolathe.
2016-02-10 12:40:41 -06:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Tkdrg
8c694d9fc0 R&D and Misc Fixes/Tweaks
Fixes invisible gasmask exploit.
Fixes mineral duplication exploit in protolathe.
You can no longer break a RD Console while a linked machine is busy.
Adds cancel button to admin Send To.

Fixes #12729
Fixes #12197
Fixes #11741
Fixes #11449
2015-11-14 13:35:05 -03:00
Razharas
84a5511836 Merge pull request #12283 from KorPhaeron/inworld
Removes a bunch of in world
2015-10-12 12:12:35 +03:00
KorPhaeron
31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
GunHog
839d22f842 Proper name extraction
Uses the Protolathe procs to obtain the correct tech and material names!
2015-10-09 19:44:18 -05:00
xxalpha
1626e02302 Fixed protolathe not printing things that required reagents.
Better

Coefficient
2015-09-17 14:09:03 +01:00
xxalpha
28889d2b6a Changed protolathe code to use material container.
Clean proc, typo fix

Standard sheet values
2015-09-11 12:39:32 +01:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel
del() to qdel()
2015-08-19 11:50:24 +02:00
Remie Richards
f77047b640 Merge pull request #11185 from Cheridan/brycepaxsbrain
Logging Syntax Improvement
2015-08-18 20:24:42 +01:00
Firecage
dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
Cheridan
5979ffdec7 Logging Syntax Improvement 2015-08-13 12:14:14 -05:00
c0
df4d5cfe0d RnD update 2015-08-12 15:18:13 +03:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Cheridan
565e4dda5a Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
Overlays for computers
2015-06-14 10:25:27 -05:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Jordie0608
5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
Iamgoofball
f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
Razharas
12e4047cbe Merge pull request #7988 from Menshin/protalathe_matcheck_fix
Fixes protolathe incorrectly checking material amount
2015-02-27 11:11:52 +03:00
Menshin
48edc8b7ae Fixes protolathe incorrectly checking material amount. 2015-02-25 21:12:14 +01:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Menshin
04aea90f86 * Building an item from the protolathe/imprinter now correctly returns to the previous screen (categories or search)
* A typo fixed
2015-02-13 22:33:58 +01:00
Menshin
3ef71865f1 Added a search function to the R&D Console protolathe and imprinter menus 2015-02-07 01:57:46 +01:00
Sawu
87881ffb94 Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-17 09:55:12 +11:00
Cheridan
5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
phil235
f93ee8b99b Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path. 2015-01-14 14:04:21 +01:00
Cheridan
0956a86c22 Firing Pin System - The Lockbox Solution 2015-01-09 18:49:02 -06:00