Commit Graph

22 Commits

Author SHA1 Message Date
blah
ea4bdc9ad7 Fixes the smartfridge.dm properly 2015-11-06 20:24:40 +00:00
blah
396fc8175a Whoops 2015-11-04 17:52:11 +00:00
blah
ea40dbdb90 Fixes rpgloot.dm by removing + and - 2015-11-04 16:01:32 +00:00
Incoming
3215f0aa2c blast you, data/mode! 2015-01-16 13:47:36 -05:00
Incoming
071e2aee3c fixes conflicts
swaps appretice and wizard icons
2015-01-16 13:45:36 -05:00
Mloc-Argent
6757b1b04c Apparently I suck at git.
Removes some things that got accidentally added.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-04 16:01:47 +00:00
Mloc-Argent
a677ae8377 Adds crlf default to .gitattributes for most text file types we use.
Massive green/red is to the best of my knowledge caused by files being nearly entirely LF.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-04 15:14:39 +00:00
Giacomand
67dad2123a Re-added mode.txt. Added it to the ignore list. 2013-11-16 16:09:27 +00: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
johnsonmt88@gmail.com
e9e434c226 Laser tag guns, practice lasers and staves of change no longer blow up in the clown's face. Fixes Issue 638.
Changed mode.txt from traitor to extended. Extended makes a heck of a lot more sense for testing purposes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4172 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-25 17:04:22 +00:00
johnsonmt88@gmail.com
1306f60b3c Forgot to untick these damn files. I wish tortoiseSVN would properly ignore these...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3743 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-04 23:01:25 +00:00
johnsonmt88@gmail.com
fa65c484cd Welding tool: Mostly code-related, the players won't notice much.
- Welding tool code how has proper comments! Maybe not "proper" but at least I don't lie and say a proc is/does something that it doesn't actually do.
- Welders now start full of fuel instead of some random amount between 10-20
- Someone decided it would be a good idea to set the welding tool's 'on/off' var in a ton of attackby() procs. These objects and turfs shouldnt even touch this variable. This is why people have been noticing their welding being on without the sprite or damagetype and amount reflecting that.
- - I've removed a bunch of these instances but there are so many objects and turfs spread out through the code, there's no way to know if I've got them all (This is the majority of the files)
- - I've created a new proc in welding tools that checks to see if they are turned on or not. "isOn()"
- - Since I'm not sure if I've gotten every instance of this force-var-on, I've set the welding tool to update it's icon every process(). I hate adding checks like this to processes but it's necessary for now.
- Added a setWelding() proc. If you HAVE to turn the welding tool on or off, use this, don't just change the var. In fact, dont even touch the 'welding' var anymore
- Fixes issue 435

While changing the hundreds(literally) of cases of welding tool uses I've
- Changed some :'s (object:varorproc) I've come across into .'s (object.varorproc)
- Added checks to make sure the welding tool is actually on before using it (some attackby()'s didnt have this. Heck, some checked how much fuel you had, but didn't actually USE the fuel)
- Added sanity checks after some do_after()s that were missing them

Added traitor uplink items back to erro's stat tracker
- Added 'random' with the tag "RN"
- Added thermal meson glasses with the tag "TM"
- Reorganized uplinks.dm a little by moving the 'random' item generation to its own proc
- NOTE: I have absolutely no way to test this on my own, but it should work!

I've tested a bunch of construction/deconstructions with the welding tool, but again I've probably missed a few things. If there are any problems, please let me know and I'll fix them asap.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3741 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-04 22:56:11 +00:00
mport2004@gmail.com
e782d47580 Few runtime fixes.
Cleaned up the job selection code.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2289 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-29 05:20:33 +00:00
baloh.matevz
470813997b I know we should have had this forever but we didn't... Banning, unbanning and editing bans (both the regular and job flavored) is now logged into a separate file. (data/ban_unban_log.txt)
Also removed two unused variables from Runtime the cat.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2202 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-14 23:42:46 +00:00
kortgstation@gmail.com
3de9c51123 E-Swords now have a chance to deflect projectiles when active.
Added missing sprites for the ion rifle charges, and ion rifle on back sprites.

I still cannot into changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2188 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-13 01:50:19 +00:00
uporotiy
d062e68f4b Vaults
Added an /obj/vaultspawner which very shitty right now.
 Health Scanner
Added xeno embryo detection.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1542 316c924e-a436-60f5-8080-3fe189b3f50e
2011-05-07 15:38:32 +00:00
uporotiy
26e33a0a3c A couple of small changes before I tackle the buffing-up project.
Luminosity
Admins editing the luminosity var now properly uses sd_SetLuminosity().
 Britcup
A cup spawns for Kingston in hydroponics.
 Taser guns
New sprites, courtesy of Arcalane. Now with an actual 4-shot gauge!
 Interface
16x16 mode re-enabled for shits and giggles.
 Mining
Reverted the uranium ore sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1507 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-29 14:27:49 +00:00
rastaf.zero@gmail.com
ad6a6e42aa Penlight fits in medical belt.
Fixed several runtime errors.
Monkeys and aliens won't stack dozens of blood stains.
Fixed crash in FEA code related to melting floors.
When screwdrived destructive analyzer unlink from RD console protolate instead of itself.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1443 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-14 03:52:09 +00:00
tronaldnwn@hotmail.com
95587aad0d WELDING UPDATE:
- Welders no longer double charge for time AND work.
If anyone wants to fight about it I'll take you all on and beat you up with a tool box.
- Large Tank Industrial Welders now spawn in the weld closet, and can be hacked out of autolathes, they hold 40 units of fuel.
- Two new welders, the HUGE one that'll be in the prolathe construction later, and the experimental one that'll have regenerating fuel.

MONKEY BUG FIX:
- Monkey modules code changed so monkeys's back packs appear properly. Like people do, without me committing a billion duplicate back sprites.
- Monkeys have more masks to wear.
- Monkey gas masks have a north facing sprite now.
- Monkey Module code changed so MASKS will always work proper.

Mining Update:
- Plasma Cutter and sprites. It cuts at a delay of 0. meaning it is the best of the best of the best in the mining of ores. SIR! Thanks to VtecJumper, who happened to have it on his signature! It is robust as fuck looking.
- Belt sprites for all pickaxes and the jack hammer.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1309 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-29 18:02:27 +00:00
n3ophyt3@gmail.com
4e8851a1c7 Yet another wonderful design from R&D!
Dubbed the "Bag of Holding", this latest wonder is a backpack that has had the interior filled with a Bluespace generator. This allows for unmatched item storage potential! The generator has proven perfectly reliable under light use, but heavy loads have been proven to cause strain, eventually leading to total failure and loss of any stored items. Additionally, the generator does NOT play nice with other applications of Bluespace, do not wear or carry the device while attempting to teleport, or attempt to place one into the Bluespace pocket of a second device. The Bluespace interface has been observed to destabilize gravitational singularities.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1176 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-11 22:38:08 +00:00
rastaf.zero@gmail.com
6f2e89d9a3 Emitter's beam direction glitch was fixed.
Working emitter no longer can be unwelded.
Collectors and collector controllers now can be locked using ID.
Singularity now eat underfloor wires.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@874 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-16 15:09:15 +00:00
only.lurking
662c08272a git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e 2010-08-23 14:29:20 +00:00