Commit Graph

113 Commits

Author SHA1 Message Date
Giacomand
36f6ce77b7 Forgot a file. 2013-11-17 15:38:28 +00:00
Giacom
2349992598 Merge pull request #1786 from d3athrow/master
Fixes exploit fix, exact amount of materials will allow building now.
2013-11-15 10:25:49 -08:00
d3athrow
ba3aa59cc4 Fixes exploit fix, exact amount of materials will allow building now. 2013-11-14 14:10:20 -06:00
Giacomand
5043091b72 * Lowered the origin and required tech for the bluespace crystals.
* Commented out the distance value that you receive, making it harder when calculating.
 * Added materials to the origin tech (organic crystal only) and raised material required to make new bluespace crystals.
2013-11-12 18:36:30 +00:00
Giacomand
b8c031026c * Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer.
* The telescience computer starts with 3 artificial crystals.
 * The crystals can be crushed to blink or you can throw it at someone to make them blink a short distance.
 * You cannot teleport the AI or any anchored mob (unless they are buckled to an office chair).
 * You can make the bluespace crystals from slimes or from research.
2013-11-12 14:24:56 +00:00
Cheridan
22e59767cb Merge pull request #1686 from Jordie0608/WakeUpTheKing
Fixed up Scanning Module naming
2013-11-06 19:43:10 -08:00
Jordie
e6b7abed53 Fixed up Scanning Module naming 2013-11-01 17:23:49 +11:00
sirbayer
19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.`
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
2013-10-30 17:56:00 -07:00
d3athrow
a8a81c3326 Was hasty in the fix, much smaller now 2013-10-24 20:13:00 -05:00
d3athrow
ff0cc9561f Fixes protolathe href exploit 2013-10-24 00:03:53 -05:00
Giacom
38725a5098 Capitalized the names of the beaker research datums. 2013-10-16 20:01:06 +01:00
Giacom
0b9b6557fa Merge pull request #1546 from Iamgoofball/shrinkray
Beaker Update
2013-10-16 11:57:57 -07:00
Iamgoofball
f680c9816a Made some adjustments. 2013-10-11 14:06:52 -07:00
Iamgoofball
0e4ae88f5a Made it harder to get the bluespace Beaker, and reduced it's reagent holding capabilities to 300 units. 2013-10-10 19:41:57 -07:00
Iamgoofball
dd4eb0fc76 Changed Split Beakers to Cryostasis beakers, no gameplay changes however. Increased the research reqs on Bluespace beaker to Bluespace 2 Materials 4. 2013-10-10 08:59:01 -07:00
Iamgoofball
560476fd52 Adds Split Beakers, which are no reaction beakers, for storing chemicals you DON'T want to blow up in your face. Holds 50 units. 2013-10-09 21:07:07 -07:00
Iamgoofball
b703c4adad Ups the price for building to 3000 of each because I don't know how to into honking. 2013-10-09 19:29:07 -07:00
Iamgoofball
1a782cb3e8 Recent Bluespace Technology research has resulted in Bluespace Beakers! 2013-10-09 19:22:08 -07:00
Jordie
272038e2e7 Xray guns unique and buildable 2013-10-09 01:31:39 +11:00
KazeEspada
27bc778449 Merge branch 'master' of https://github.com/tgstation/-tg-station into computers 2013-09-23 13:37:00 -07:00
KazeEspada
38d7374bc2 Makes circuits into type paths. Dna modifiers had a bad string that showed up when converted into a type path. Power monitors are now actually computers. Makes smashing computers red. 2013-09-21 14:41:50 -07:00
Aranclanos
ef427aff91 Merge pull request #1318 from ACCount12/master
Shotgun dart overhaul, #1181 fixed, NOREACT flag removed from mobs
2013-09-20 00:33:36 -07:00
KazeEspada
cbb041637b Merge branch 'master' of https://github.com/tgstation/-tg-station into computers 2013-09-17 16:43:19 -07:00
supersayu
4c44e7cd89 Glove update
Integrates gloves into click code.  Gloves now have a proc/Touch(atom, proximity) which is called before humans do an attack_hand().  It can also occur when you click on something at range, so be sure to check the proximity flag.

Adds code to make ninja gloves work properly with this and pulls it out of the various attack_hand() procs.

Other suggested uses: secret society rings, magic/cult gloves, weaponized gloves (chemical, electric, needles, etc), powered exosuit hands (for picking up crates), I dunno, there are options
2013-09-17 18:19:13 -04:00
KazeEspada
630a691c6d Cleans up computer code severely. fixes issue #1004. Aliens and Monkeys can now smash computers. However, this only applies to computers with buildable circuit boards. Computers without boards are now impervious to attack and deconstruction(can't steal atmos computers or slash up the escape shuttle computer).
Hologram computer has been moved to unused. It has some interesting ideas, but it needs sprites and fix up.
2013-09-17 13:22:39 -07:00
ACCount12
c4941e6eca Removed notele module from designs 2013-09-06 15:06:19 -07:00
Aranclanos
0ce01d1583 Adding Linda. 2013-08-10 06:15:14 -03:00
Jordie0608
30bf6b2099 Update designs.dm 2013-07-18 02:56:46 +10:00
Malkevin
01f2af5bed Welding gas mask
Adds a new item to RnD which is a gasmask with integrated welding visor.
Requires low level (2) of Engineering and Materials, 4000 metal, 2000 glass (1000 more of each compared to a standard welding helmet), fits in the mask slot.

The idea behind this is that it will give engineers the functionality of Rig Helmets (head lamp and welding visor, and free eye slot for mesons) when combined with a hard hat.

Included some placeholder sprites:
https://dl.dropboxusercontent.com/u/95696802/Commits/weldinggasmask.png
2013-06-19 18:05:12 +01:00
Ikarrus
1518d285e7 Standardized spelling of all instances of "Centcom"
Centcomm/CentComm -> Centcom
centcomm -> centcom
2013-06-17 20:49:01 -06:00
carnie
b84d12d949 *Small tidy-up of various helper procs*
-Turns out there was already a Gaussian PRNG proc already, used by mechs and turrets. I've replaced it with my one as mine has almost half the cost. (currently broken! still waiting for fixes to be pulled!)
-replaced between(min, val, max) with Clamp(val, min, max)
-get_turf(thing) now uses var/list/locs to locate its turf, rather than iterating up through loc of its loc of its loc...etc
-sign(num) moved to maths.dm
-InRange(val, min, max) replaced with IsInRange(val, min, max) (they were identical)
-Removed ismultitool() iswrench() iscoil() iswire() iswelder() iscrowbar() etc
-removed modulus(num) as abs() performs the same task! *roll-eyes*
-removed get_mob_with_client_list() as it is no longer needed (we have var/list/player_list now)
-removed get_turf_or_move() as it simply called get_turf
-removed get_turf_loc() as it was identical to get_turf()

*Additions:*
-The "Declare Ready" link in the lobby will automatically become "Join Game" if the round starts before you declare ready, so you don't have to click it twice
2013-05-27 12:21:43 +01:00
Cheridan
0c47147ab1 Phase 2 of my master plan:
-Adds a Service headset channel, given to the botanists, barman, and chef. The HoP also gets the service channel on his headset.

Note: The Service Preset Server will have to be added to Telecomms on the map before the channel is usable. I'll put up the map when/if this gets merged.
2013-05-13 12:20:12 -05:00
Aranclanos
e016f9a3c9 Fixes circuit printers not accepting acid. Their afterattack() was being ignored. 2013-04-01 22:32:24 -03:00
Sieve
29067b0139 Final Version of DesignHasReqs
Massive optimization on the DesignHasReqs() proc, cuts it down to the
bare minimum while still retaining its function. Testing using the
profile showed a 92% reduction in SelfCPU at 151000 calls.
2013-03-26 13:20:33 -05:00
Sieve
d19bf16351 Trying to fix Git goddamn 2013-03-25 14:13:22 -05:00
giacomand@gmail.com
46dc7d6084 Committing Faerdan's UI overhaul. Includes a UI browser class to easily manage and standardize user interfaces. This first release does not convert all the user interfaces in the game but only most of them. You can find samples of these user interfaces here: http://imgur.com/a/5dr6E
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5794 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-27 20:02:42 +00:00
rockdtben@gmail.com
793e547be8 A supplement to what Nodrak had done in https://code.google.com/p/tgstation13/source/detail?r=5732#
Now the server will be refreshed in process() only when there is a change.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5738 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-19 00:44:53 +00:00
ericgfwong@hotmail.com
3b2250f2c2 Committing tgstation.2.1.2:
The AI has been moved to Research Division, and Telecoms has been moved into the former AI chamber. Affected areas: Telecoms Satellite, Research Division South & Command Sector.

-Reduced tech levels of subspace equipment
-Removed CE's teleporter access (No longer needed to access tcomms)
-Reduced grey space suit slowdown
-Increased voidsuit slowdown
-Engineering and mining hardsuits hold different equipment now

-Updated Changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5734 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-18 21:09:30 +00:00
johnsonmt88@gmail.com
b38ad70e83 Removed the griefProtection() proc from R&D server/process(). Any proc that deletes/damages files will already call it, and in some cases, call it more than once. This should reduce the number of proc calls to designHasReqs() and TechHasReqs() by a million or two per round.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5732 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-18 17:03:17 +00:00
aranclanos@hotmail.com
569378878d Runtime fix for trying to build invalid objects and circuits on the protolathe and circuit imprinter, respectively.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5576 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 19:17:08 +00:00
giacomand@gmail.com
71ba8dfcd2 - Fixed design IDs not being unique. They should be constructable now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5568 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 14:07:03 +00:00
aranclanos@hotmail.com
75b8a38977 Runtime fix for inputing the number of sheets that you want to add into a protolathe, when the sheet doesn't exist.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5486 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 12:06:31 +00:00
giacomand@gmail.com
78cc7379d4 Made fires be garbage collected and not hard deleted on demand.
Committing for S0ldi3rKr4s0 (I hate your name).

Fixes some typos in blueprints.dm, designs.dm, dna_mutations.dm, gift_wrappaper.dm and research.dm.
Gives minerborg some eyes to signify activity (finally)
Made pAI cards need only programming 2.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5452 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-02 17:30:40 +00:00
giacomand@gmail.com
3e24586d6b -Work done on facehuggers to stop them from being buggy if they're sterile or in a bag. Added icon sprites for inactive facehuggers when they're on a person, meaning they won't turn invisible.
Fixes Issue 1052
Fixes Issue 1065

-Added a world limit for blueprints naming areas.
-Fixed a wrongfully named research design.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5394 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 19:56:20 +00:00
johnsonmt88@gmail.com
cab176618a Runtime fixes:
Fixed a runtime caused by someone holding an input window open with the RD Core Computer.

Fixed a runtime caused by an area being null... I have no idea how this is even possible. Tracking the source of the problem will take ages.

Added a check for range and source in hear(). Again.. I'm not sure how this ever even fails. This may also fix a runtime in say() code where it's trying to compare a list of objects to the character "0".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5282 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-08 01:14:50 +00:00
aranclanos@hotmail.com
0258d5be22 -Changed all minerals path from /obj/item/stack/sheet to /obj/item/stack/sheet/mineral. (This change excludes glass, Rglass, metal and plasteel)
-Reduced the chunks of code about minerals in door_assembly.dm

Preeeetty much this commit is just to update all the files to the new path of the minerals. From here, if I can, I'll start changing one by one to remove the huge chunks of code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5087 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 15:00:09 +00:00
Kortgstation@gmail.com
ab4c92e066 Using summon guns gives a message to the the user to confirm it working.
Added a new borg upgrade module which requires illegal tech and combat tech to make. It allows you to give them their emagged equipment without fucking with their laws.

New LMG by Ausops (both sprites and code). Right now appears only in Summon Guns, but may appear elsewhere in time.

Grilles now have a bullet act, so they no longer magically absorb infinite bullets.

Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 07:43:49 +00:00
baloh.matevz
abad9978b2 - Fixed the revision number not showing properly. Hopefully it's fixed for good this time, as it works off of logic, instead of line numbers.
- Standardized the database library code
- Deleted a few unused database related files (karma and forum activation), so they won't get in my way later. They work off of no longer existent database tables.
- Made it so the server maintains a constant connection with the database, which is established on world/New() and never broken, until the server ends. If 5 consecutive database connection attempts result in no connection getting established, the server will not attempt any more connections. Made all existing database connections use the global continuous connections. Currently we need two, as we have two databases, but the old database is going to get moved into the new one.
- Fixed the spaghetti-like report in the permissions panel, which happened when someone had many permissions enabled.
- Added database connection reports to display to dream daemon on server startup.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5015 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 17:21:13 +00:00
sieve32@gmail.com
3dc80af872 - Based on the 'nerf' to energy relays, they no longer require Illegal Tech to build, and instead a mech clusterbang launcher takes its place for Illegal Tech. Do note however, that this launcher cannot reload, so it would have to be replaced with a new one in order to fire again. Hopefully that would provide some semblance of balance without gimping it.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4983 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-30 04:25:21 +00:00
elly1989@rocketmail.com
4d9876fd65 Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.

Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00