cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,103 Commits 8 Branches 0 Tags
d8ec1ae26b3b8d2ff3f8a1e1dc49b87935e395d3
Commit Graph

2321 Commits

Author SHA1 Message Date
cib
d8ec1ae26b Fixed traumatic shock breaking cryo. 2011-12-29 22:09:36 -08:00
cib
d4c3053372 Increased the chance of getting infected significantly, with the current system it's too low. 2011-12-29 16:50:20 -08:00
cib
b5f8c930f1 Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested. 
Revert "Alien removal surgery, new traitor item, other stuff."

This reverts commit cc3bc60963.
 2011-12-29 15:15:51 -08: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
6fbe9cb7bf Merge pull request #167 from SkyMarshal/master 
*sigh* Check the description
 2011-12-29 05:23:24 -08: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
44b32385a6 Removed sleep symptom from lesser diseases, made the cure research machine display the antibodies of the given sample of blood. 2011-12-29 01:59:43 -08:00
cib
6d79e47d96 Some balance fixes to the traumatic shock stuff. 2011-12-29 00:37:37 -08:00
cib
bf29dc3a69 Cloning now leaves you on the verge of death again(though not in critical). 2011-12-28 23:55:36 -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
22d5d2cd3d Small error with the new traitor item. 2011-12-28 23:23:42 -07:00
SkyMarshal
cc3bc60963 Alien removal surgery, new traitor item, other stuff. 2011-12-28 23:15:30 -07: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
Albert Iordache
02f017e216 Merge pull request #163 from Tastyfish/master 
buildable disposals, can make power module, fixed piano
 2011-12-28 05:34:16 -08:00
Tastyfish
46520c3e57 accidentally didn't allow a natural in piano, thought it sounded weird! 2011-12-28 07:02:55 -05: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
Tastyfish
f6006bfd1f disposal buildable via machine frame 2011-12-28 05:03:21 -05:00
Albert Iordache
99ea2b30d8 Fixed a clonepod runtime error with Tasty's help 2011-12-28 11:31:07 +02:00
Albert Iordache
909975cab9 Attempted to fix a runtime error. 2011-12-28 11:11:45 +02: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
Tastyfish
f1fcbf3445 can set the paint scheme of doors! 2011-12-28 03:22:59 -05:00
Tastyfish
99c1df3ff4 only force AI if malf mode 2011-12-28 01:18:16 -05: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
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
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