Commit Graph

670 Commits

Author SHA1 Message Date
cib
f827d9f56e Small addition so that traumatic shock will increase when a limb is missing or broken. 2012-01-09 04:09:57 -08:00
Tastyfish
ce9042ae20 bones and dismemberment 2012-01-08 20:05:54 -05:00
Tastyfish
ffe6ac7935 Merge remote-tracking branch 'upstream/master' 2012-01-06 16:41:52 -05:00
Tastyfish
c4f5429857 furthur work on bones 2012-01-06 16:41:47 -05:00
Albert Iordache
8279f080dd Merge pull request #232 from Miniature/master
made blindness overlay transparent to mouse
2012-01-06 09:48:36 -08:00
Miniature
090a5c75d1 made blindness overlay transparent to mouse 2012-01-07 02:53:50 +10:30
Tastyfish
a7b85707dd porting in bones and dismemberment 2012-01-05 17:15:29 -05:00
Tastyfish
a2ff049861 merge 2012-01-04 23:01:22 -05:00
cib
e141f962c4 Confusion shouldn't make you totally unable to move in one direction. 2012-01-04 22:32:09 -08:00
Miniature
a898a49c3c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-04 17:00:34 +10:30
Miniature
c9a20d7a12 another runtime 2012-01-04 16:57:40 +10:30
Albert Iordache
33833b9acb Merge pull request #202 from SkyMarshal/master
OHMYGOD I coded a ton.
2012-01-03 11:14:20 -08:00
Miniature
499198b1cf More runtime fixing 2012-01-04 04:36:21 +10:30
SkyMarshal
72c6369368 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-02 21:49:09 -07:00
SkyMarshal
411ccc4075 Shitload of stuff. 2012-01-02 21:48:42 -07:00
Tastyfish
3c15526e3f accidentally called the wrong unequip proc, they're all so similar! 2012-01-02 12:52:09 -05:00
Tastyfish
bf877d0483 Merge pull request #191 from SkyMarshal/master
Nuclear revamp, full details in description.
2012-01-02 08:18:25 -08:00
SkyMarshal
6537219768 Explosive implants should go off more reliably. 2012-01-02 09:09:43 -07: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
SkyMarshal
15d2f06762 pAI's in PDA's can now hear things, hypothetically. 2012-01-02 00:23:43 -07:00
SkyMarshal
b30da1fa98 Some fixes and improvements. 2012-01-01 22:29:04 -07:00
SkyMarshal
d64e8284f6 Fixed implanter problems, added some more silly emotes. 2012-01-01 19:57:57 -07:00
SkyMarshal
755d2d711a Nuke revamp, some tweaking. 2012-01-01 18:58:28 -07: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
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
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
Tastyfish
0e222e838f replaced "toggle pregame music" with button in pregame screen that saves between games 2011-12-27 19:53:02 -05: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
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