Commit Graph

14 Commits

Author SHA1 Message Date
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
mwerezak
2f1a6eaf83 Adjusts w_class of beach ball and scroll 2015-06-21 01:46:10 -04:00
Yoshax
c960fad48e Changes teleportation scroll and spellbook to be only usable by wizards 2015-06-04 20:21:31 +01:00
Kelenius
db30c15e4c Updates to science
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Mloc-Argent
537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
aranclanos@hotmail.com
a8cb1dc4f8 Some improvement to the teleport scroll and spell code. It unbuckles the user now.
Thanks to Nodrak~

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5565 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 06:22:29 +00:00
giacomand@gmail.com
9afc2cbe7f -Chemical implants can now hold 50 units instead of 10.
-Made mutagen a catalyst instead of an ingredient. Fixes Issue 1100.
-Spellbook and Teleport Scroll doesn't show up for other players now.
-Added a syndicate intercom in the wizard's den.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5072 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 08:03:05 +00:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
johnsonmt88@gmail.com
e3b3ff836b The wizard's teleport scroll now only works if the wizard actually has it. Fixes issue 997.
I've also moved the teleport scroll define from defines/obj/weapon.dm into scrolls.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4846 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 23:07:34 +00:00
johnsonmt88@gmail.com
28aabc9810 More file structure stuff!
Cleaned up the files themselves.
Everything in code/game/objects should now be in proper files or places with the exception of the files in the /weapons/ sub-folder.

There's two instances of me not following the exact file structure.
- /obj/item/brain has been moved to a file in mob/living/carbon/brain
- /obj/item/clothing/mask/facehugger has been moved into mob/living/carbon/alien/special
Both of these may not make sense according to the object structure, but they do make sense logically. If it's a problem just move them.

Next up: Finish the files in the weapon folder, then start moving defines down.


My god I hope I havent broken everything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4547 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 03:32:58 +00:00