Commit Graph

2116 Commits

Author SHA1 Message Date
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
08a9f11d39 Merge pull request #154 from CIB/master
New virology
2011-12-27 04:59:59 -08: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
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
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
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
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
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
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
Tastyfish
03b8be52fa capitalize first letter of says and whispers like old bs12 2011-12-26 12:02:57 -05: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
Albert Iordache
87941b7081 Merge pull request #146 from SkyMarshal/master
Check that description.
2011-12-26 07:21:52 -08:00
Tastyfish
5e2408149d Merge remote-tracking branch 'upstream/master' 2011-12-26 06:03:47 -05:00
Tastyfish
5f83d846cc added admin verb to delete books 2011-12-26 06:03:31 -05:00
cib
0a00281198 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2011-12-26 01:27:16 -08:00
cib
21876403bb Added new virology to the map. Radium now has a chance of awakening your immune system, but at the same time it has a chance of killing you. Added a dilluted milk recipe, and milk to the chem dispenser. 2011-12-26 01:26:35 -08:00
Albert Iordache
646665bf27 Fixed engineering SMES wiring, made player panel wider. 2011-12-26 10:52:38 +02:00
SkyMarshal
de67b05dce More updates. The evidence bags are kinda borked. 2011-12-26 00:03:05 -07:00
Albert Iordache
77d28802fe Fixed another bug related to the player panel 2011-12-26 01:07:30 +02:00
Albert Iordache
0297084fc2 Fixed runtime error preventing the player panel from opening 2011-12-25 21:30:35 +02:00
SkyMarshal
dd8deae835 Numerous fixes. 2011-12-25 10:57:23 -07:00
n3ophyt3
e449a886b7 TG update: AIs now actually use power from APCs, rather than simply require that equipment power is active.
Malf overhaul, take two!
Waaaay back in the old days, I made it so malf AIs had to hack APCs to win, instead of just sit AFK for 45 minutes. Now I'm taking some more drastic action, to see what happens.

THE MALF AI NO LONGER SPAWNS ON THE AI SAT.
Instead of sitting in the AI sat hoping nobody notices your blatantly obvious hacking, at which point the 3 people lucky enough to have looted EVA get to have all the fun, you can now shunt your core processes into an APC you have hacked, and hacked APCs are only moderately obvious.

While shunted into an APC, the AI draws power from that APC instead of the one in their main core. If the APC loses power, the AI loses power as normal. If the APC they are in is damaged or destroyed, they are forced back into their main core. If the main core is inoperative at that time, they die. The AI is also capable of willingly going back to their main core. As long as the AI's main core is intact, the AI speaks out of its core, regardless of its current location.

I have tested as much of this as I could to make sure it is functional, but thanks to the game mode overhaul, I have been unable to run actual malf rounds on my test server, so I have had to cheat and set things to work in any mode for testing. As for actual round balance, there's no real way to predict how that shit'll change.

This is just the base overhaul, more changes will be forthcoming as malf rounds provide data on how the change performs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2668 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-25 19:05:13 +02:00
SkyMarshal
9becacf956 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-25 08:48:06 -07:00
baloh.matevz
0abf7417a5 TG update: Fixed the player panel not opening, bug caused by r2658
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2667 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-25 15:48:04 +02:00
VivianFoxfoot@gmail.com
d631e11e78 TG update: Fire now does four times as much damage, to make it so that running through a blaze is now likely a fatal enterprise. Firesuit still offers protection.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2664 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-25 15:35:33 +02:00
uporotiy
df54c71559 TG update: Fixed a few derps in Poly's commit (namely, the revert back to public vars instead of procs).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2662 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-25 15:27:35 +02:00
VivianFoxfoot@gmail.com
f340f3fbd7 TG update: Adds a cooldown to changeling lesser form. (30 seconds)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2659 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-25 15:25:11 +02:00
VivianFoxfoot@gmail.com
b3b19a2e89 TG update: Shows the job a player was assigned and the job currently on their ID (if they have one) on the admin player panel. (Done for Hawk_v3)
Also, first commit!  Yayyyyyy!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2658 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-25 15:24:16 +02:00
Albert Iordache
462a32f57a Merge pull request #139 from Tastyfish/master
Library category fixes, moved edit appearance->fun where it should be
2011-12-25 04:44:26 -08:00
Albert Iordache
cf43b6726d living/say(text) is now logged before applying any filters to the text. 2011-12-25 14:41:39 +02:00
SkyMarshal
c6499583b4 Updated. 2011-12-25 00:07:42 -07:00
Tastyfish
359ffe93e1 Merge remote-tracking branch 'upstream/master' 2011-12-25 00:55:20 -05:00
Tastyfish
67af6ac4d2 future-proof food code for other critters snacking 2011-12-25 00:55:18 -05:00
Tastyfish
31a2f6d5ef library category fixes, moved edit appearence->fun where it should be 2011-12-25 00:52:36 -05:00
Albert Iordache
88bcb26710 Fixed a compiling error. 2011-12-25 01:05:43 +02:00