Commit Graph

8886 Commits

Author SHA1 Message Date
SkyMarshal
03445062c4 Reworked pepperspray's results 2011-12-27 14:26:08 -07:00
SkyMarshal
25400f7af4 Should be the rest for this lot. 2011-12-27 14:13:11 -07:00
trubblebass@gmail.com
e92e4b6748 - Fixed Issue 284
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2834 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 21:05:27 +00:00
SkyMarshal
e32813060f Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-27 13:45:15 -07:00
cib
9d97e99017 Made vira more likely to infect you. Removed vira from the medical HUD. Added the symptoms: Stumble, hoarse throat, and whisper. Added a random virus dishes to virology. 2011-12-27 21:12:01 -08:00
SkyMarshal
08ff9b06e7 Fixed several things. 2011-12-27 13:44:52 -07:00
Albert Iordache
cfbb6eb704 Fixed a few errors. 2011-12-27 18:52:03 +02:00
Albert Iordache
9219a22f14 Merge branch 'master' of https://github.com/SkyMarshal/Baystation12 into Sky
Conflicts:
	maps/tgstation.2.0.8.dmm
2011-12-27 17:08:52 +02:00
Albert Iordache
c99ef988b2 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-27 15:00:12 +02:00
Albert Iordache
08a9f11d39 Merge pull request #154 from CIB/master
New virology
2011-12-27 04:59:59 -08:00
Albert Iordache
4139004c35 Changed the number of changelings to 1 per 10 playas 2011-12-27 14:56:51 +02:00
Albert Iordache
2092e25983 Merge pull request #147 from Tastyfish/master
coats, changeling, piano, also admins can delete books, paper/books more robust against dynamic content, custom votes
2011-12-27 04:26:51 -08:00
heisen51@gmail.com
8295264dc5 Being in a freezer crate or refrigerator now has the same effect on meat as 0C air.
Kitchen cold room tweaked a bit more.
Cold room added to Uterus.

Changelog updated to indicate new freezer crate/refrigerator functionality.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2832 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 11:46:15 +00:00
petethegoat@gmail.com
b9c3f9ce65 Added Scottzar's emitter projectile sprite. Thanks!
Fixed some issues with paper.
Slightly adjusted the atmospheric door sprites.
Added some SMES assembly sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2829 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 04:19:18 +00:00
SkyMarshal
607db09620 Lotsa stuff. Map update. 2011-12-26 17:59:09 -07:00
CIB
7270012d01 Merge pull request #149 from SkyMarshal/master
Added holster to detective's suit, fixed some spelling mistakes.
2011-12-26 15:48:04 -08:00
CIB
e2d698f376 Merge pull request #150 from MisterFox/master
Retired Admins rank
2011-12-26 15:47:25 -08:00
Albert Iordache
c6ad5e6255 Fixed the TG update not compiling 2011-12-27 00:41:11 +02:00
petethegoat@gmail.com
20abc3f9ba TG update: Added adorable pod signs! Moved the Sec escape pod a little further out of the evidence room. Turned on some more scrubbers and vents which were starting off.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2692 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 00:18:49 +02:00
ryantennessee@yahoo.com
cf6ccb5650 TG update: Fixed some spelling errors in item descriptions.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2688 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 00:16:48 +02:00
CIB123@gmail.com
4bc242711c TG update: Ammend to the last commit, a few files were left out.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2687 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 00:15:01 +02:00
CIB123@gmail.com
42890a7c4a TG update: Added antibody-based, random symptom virology.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2686 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 00:01:02 +02:00
baloh.matevz
1ac1376806 TG update: Fixed the meteors not exploding on impact error.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2685 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:46:05 +02:00
petethegoat@gmail.com
7cc0842cae TG update: minor pipe code issues.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2684 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:45:34 +02:00
uporotiy
ab396f50ac TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:39:45 +02:00
LastBattaWolf@hotmail.com
158630c86e TG update: removed title music from bar
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2682 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:33:20 +02:00
kortgstation@gmail.com
28bc2896b9 TG update: Lowered the trigger rate on the teleport armour and the teleport radius (from 8 to 6).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2681 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:32:44 +02:00
Albert Iordache
ef0a9b3632 TG update: Added Reactive Teleport armour and on/off sprites for the armour. Click in hand to toggle on/off (like a cloaking device). When worn and activated, successfully blocked attacks will cause the wearer to warp randomly up to 8 tiles. EMPs will disable it. Values may need tweaking to balance the armour. One set now spawns in the RD's office to it will get used/tested, depending on how that goes I may move it to being produceable by the protolathe only, or remove it entirely etc
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2680 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:30:34 +02:00
Mister Fox
19b8a17557 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-26 14:07:48 -05:00
Mister Fox
30f4e7dea1 Retired Admins rank for retired admins
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
2011-12-26 13:59:20 -05:00
baloh.matevz
12e851dd3b TG update: Hopefully made meteor mode more deadly.
Fixed meteor spawning so all the meteors that are set to spawn actually hit, but noticed that 50 meteors every 5 seconds proved itself to be way too laggy when all of them actually spawned properly and aren't deleted at soon as they're created due to being on the map's edge. Instead I lowered it to 6 per second.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2679 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:36:57 +02:00
petethegoat@gmail.com
e87ca09537 TG update: Tiny fix for table disassembly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2677 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:34:50 +02:00
Albert Iordache
1fac967212 TG update: Added the (almost finished) displacer. One minor bug with it to work out, does not actually spawn anywhere though so it shouldn't effect anything. Will try to finish it later tonight. 2011-12-26 20:30:45 +02:00
rockdtben
8386e07d6a Fixed a minor detail.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2824 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 18:19:17 +00:00
rockdtben
f38a590009 TG update: Removed a proc that does nothing anymore.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2675 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:19:12 +02:00
rockdtben
382b6681fd TG update: ... -Removed setBruteLoss and setFireLoss since they served no purpose. -Overrided the proc for get[Fire/Brute]Loss and adjust[Fire/Brute]Loss for humans to use the total damage proc. -Removed redundant checks aka setBruteLoss(max(getBruteLoss(), 0) since the adjust brute proc already prevents it from going negative. -Commented out the UpdateDamage() procs contents as it did nothing. If problems arise we might have to investigate. Soon I will remove the proc entierly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2673 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:14:44 +02:00
baloh.matevz
e76711f587 TG update: Ian can now pull items and bodies that are either dead or unconscious. To stop pulling use the "stop pulling" verb.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2670 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:09:55 +02:00
rockdtben
406d2eed23 Removing some references and replacing with the god procs. oxyloss mostly this time.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2823 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 17:56:22 +00:00
kortgstation@gmail.com
864949f783 Soul Stones can now summon Shades.
Soul Stones can now capture Shades (which heals them)

Soul Stones capturing a soul will now be imprinted with that shade, and be unable to capture new souls/other shades

Added ectoplasm object/sprites. As of now it has no uses.

Shades now delete on death and leave ectoplasm behind.

Soulstones can be bought with the wizards spellbook (as a set of six) and from the cultist supply talisman.

The Chaplain has a single soulstone in his office (mostly for testing/so it will get used often and I can get feedback)

Speaking of items on the map for testing, Reactive Teleport Armour no longer spawns in the RD's office (because Urist will murder me if I have to retarded test items out at once)

Removed some no longer needed code regarding soulstones from the suicide verb.

Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2821 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 17:25:46 +00:00
baloh.matevz
fa5a5772c8 Engineering remapped
Screenshot: http://www.kamletos.si/new%20engineering2.png

Added glass doors to the table facing the hallway after that screenshot was made

- Added an emp-proof camera for singularity viewing
- Particle accelerator now starts set up

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2820 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 17:11:12 +00:00
Tastyfish
03b8be52fa capitalize first letter of says and whispers like old bs12 2011-12-26 12:02:57 -05:00
ryantennessee@yahoo.com
645ceae251 Second installment of fullbeakers. Contains all complex chemicals that can be created by mixing base chemcials as well as tox and sleep tox.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2819 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 16:29:36 +00:00
Tastyfish
78ed748eab Merge remote-tracking branch 'upstream/master' 2011-12-26 11:24:39 -05:00
Tastyfish
0e0da0bdbb custom votes 2011-12-26 11:24:28 -05:00
SkyMarshal
b622850145 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-26 09:15:29 -07:00
SkyMarshal
4addb7ddb7 Added holster to the detective's suit, and fixed spelling mistakes on the coat rack. 2011-12-26 09:14:43 -07:00
heisen51@gmail.com
10da4a1304 Unsecured disposal pipes are now density=0, so you can walk over them.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2818 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 15:44:08 +00:00
Albert Iordache
4a8c5e9478 Fixed a minor spelling mistake. 2011-12-26 17:37:04 +02:00
Albert Iordache
87941b7081 Merge pull request #146 from SkyMarshal/master
Check that description.
2011-12-26 07:21:52 -08:00
Tastyfish
661888ac11 made paper exploit blocker more robust. i still don't quite want to block images /yet/ 2011-12-26 06:24:13 -05:00