Commit Graph

1053 Commits

Author SHA1 Message Date
Tastyfish
32492a51fe fixed edit-appearence to assign hair and facial style correctly. somehow I didn't notice it wasn't changing in testing :p 2012-01-02 06:33:59 -05:00
Tastyfish
1feb16439e can get out of straight jacket after 4 byond minutes now (better than infinity) 2012-01-02 04:54:19 -05:00
Tastyfish
6cf377a25d Merge remote-tracking branch 'cael/master' 2012-01-02 02:30:41 -05:00
CaelAislinn
c6fda41758 tweaked cargo bay conveyors
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 17:04:18 +10:00
Tastyfish
698a9eddbd Merge remote-tracking branch 'upstream/master' into HEAD 2012-01-01 16:45:56 -05:00
Tastyfish
343832e431 made it so nar-sie can't be objective if < 10 players, due to it being impossible
also, made piano moveable
and cleaned up custom vote code slightly more
2012-01-01 16:44:57 -05:00
Albert Iordache
6b16ac377b Merge pull request #189 from CIB/master
Vira updates
2012-01-01 13:05:21 -08:00
cib
40fb4bb628 Mucus and a few fixes to vira.
Added mucus that is added to the map sometimes when sneezing or coughing. Blood now carries the spiller's virus2. Fixed a problem with virus spreading.
2012-01-01 20:50:46 -08:00
Albert Iordache
aa4f30bbef Minor deathgasp fix. 2012-01-01 22:48:53 +02:00
Albert Iordache
17449d0881 Re-enabled the deathgasp, because it activates traitor implants. 2012-01-01 22:46:37 +02:00
Tastyfish
c3f4808cd2 code was calling now-removed emote 2012-01-01 01:13:40 -05:00
Tastyfish
522f745e71 somehow this bug was only an issue once in a real game, fixed 2011-12-31 16:56:55 -05:00
Tastyfish
c02979c148 Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, intercoms, status displays, and light switches 2011-12-31 12:28:26 -05:00
Tastyfish
a561862ef0 and there too 2011-12-31 01:51:06 -05:00
Tastyfish
2f6fc64353 admins cna see who set custom event now. 2011-12-31 00:35:44 -05:00
Albert Iordache
39b6dd57e0 Removed and commented out the last traces of goon auth. code 2011-12-30 23:28:14 +02:00
cib
f7be1250a3 Many improvements to vira.
Implemented an efficient system for infection. Made sneeze and cough increase infection chance. Increased the lifespan of spaceacillin in a host. Removed the drool symptom.
2011-12-30 21:07:52 -08:00
Albert Iordache
ea92743b36 Merge pull request #173 from CIB/master
Fix stupid bug with trauma/cryo
2011-12-29 13:12:49 -08:00
cib
d8ec1ae26b Fixed traumatic shock breaking cryo. 2011-12-29 22:09:36 -08:00
SkyMarshal
e12469aed9 Quick fix, and a fix for whispering.
Signed-off-by: SkyMarshal
2011-12-29 10:23:00 -07:00
Tastyfish
f3145486cc Merge remote-tracking branch 'upstream/master' 2011-12-29 08:38:42 -05:00
Tastyfish
8745b6bd40 pAI chatbot pal for when ghost aren't pAI'ing;
borgs can't move when no charge;
fixed misplaced light in RD office
2011-12-29 08:38:40 -05:00
CIB
b7349e7fa1 Merge pull request #166 from CIB/master
Improved on medical a little, adding traumatic shock
2011-12-29 05:21:52 -08:00
cib
6d79e47d96 Some balance fixes to the traumatic shock stuff. 2011-12-29 00:37:37 -08:00
cib
3ba5b36cb3 Added a "traumatic shock" mechanism. Once you have suffered a certain degree of damage, your vision will start to blurr, followed by immobilization and finally unconsciousness. Right now, the range between this state and crit is too short, but it's rather hard to widen it without rewriting the crit system. 2011-12-28 23:43:27 -08:00
SkyMarshal
43c2285a93 Fixes and stuff. 2011-12-28 14:27:52 -07:00
cib
a902744264 A new breakthrough in quantum technology now allows you to convert energy to mass directly using the chem dispenser. Enabling this feature requires huge amounts of power, however. 2011-12-28 19:45:43 -08:00
Tastyfish
6e95fc4f1d better yet, let both apc module and disposal circuit be creatable in autolathe 2011-12-28 06:12:21 -05:00
Tastyfish
83ce12e7c3 disposal destructable, can develop disposal circuits now 2011-12-28 05:53:49 -05:00
Albert Iordache
83f5e93768 Merge pull request #161 from SkyMarshal/master
Added air pressure define for disposals, minor map edit, removed Deathgasp from emotes.
2011-12-28 00:57:37 -08:00
SkyMarshal
28752b4410 Added disposals to detective's office, fixed more code. 2011-12-27 22:38:14 -07:00
SkyMarshal
a23024e211 Small map edit, reduced amount of air needed for disposals. 2011-12-27 21:13:12 -07:00
Tastyfish
f378644bb0 constructable/destroyable lights! 2011-12-27 22:13:18 -05:00
Tastyfish
0e222e838f replaced "toggle pregame music" with button in pregame screen that saves between games 2011-12-27 19:53:02 -05:00
SkyMarshal
aac7a104eb More amusing message. 2011-12-27 14:32:05 -07:00
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
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