cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,410 Commits 8 Branches 0 Tags
e642b3e7e74c1319b51e53ee5b126085225e07f4
Commit Graph

1075 Commits

Author SHA1 Message Date
SkyMarshal
cdbb00d264 Fixes a problem with aliums and police tape. 2012-01-06 16:55:56 -07:00
Tastyfish
c4f5429857 furthur work on bones 2012-01-06 16:41:47 -05:00
SkyMarshal
74b68e2315 Bugfix. 2012-01-06 14:01:53 -07:00
cib
72fd16a41c Fixed an issue with the cure research machine and a few other virus related glitches. 2012-01-05 17:39:33 -08:00
Albert Iordache
1053acea64 Merge pull request #219 from caelaislinn/master 
new conveyors, diverters, partially fixed ultralight, new helper proc
 2012-01-05 04:37:16 -08:00
CaelAislinn
a6c6c44112 ported z-levels from old bs12. ready for implementation into map/s 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 22:03:43 +10:00
Tastyfish
a2ff049861 merge 2012-01-04 23:01:22 -05:00
cib
66f6d325a4 Increased infection chance significantly in the hopes that this will somehow help vira not spreading. 2012-01-04 22:07:26 -08:00
cib
757bdc08f2 You can now produce infected blood from a virus dish with the cure research machine. 2012-01-04 19:16:35 -08:00
Tastyfish
14e9dbd779 a couple chatbot grammer improvements 2012-01-04 17:25:33 -05:00
Miniature
5a5c620692 Now atmos alarms automatically let atmos techs change them if they go off, as well as people can turn that off or make them permamently controllable by the computer 
also made it possible for them to mess with any alarm that hasn't had the atmos control completely disabled, but not a way to turn that feature on
 2012-01-04 22:52:01 +10:30
SkyMarshal
9a651a5a84 Added psyche jumpsuit for Asanadas 
Expanded scrambled radio stuff.
 2012-01-03 00:06:25 -07:00
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
7abc22bf78 make pailiza tell parser less confusing 2012-01-02 18:52:38 -05:00
Tastyfish
87a14c0674 machine ingredient adding more intuitive 2012-01-02 11:46:19 -05: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
Miniature
205ad71ee6 Made atmos control show name of alarm, coloured active alarms in list, added to map 2012-01-02 03:18:06 +10:30
Miniature
10401563e2 Atmos control computer 
Lets you use atmos alarms from atmospherics, if people press a button on the alarm
Not added to map
 2012-01-02 00:21:24 +10:30
Albert Iordache
47ada174be Merge pull request #182 from Tastyfish/master 
Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, status displays and light switches
 2011-12-31 11:38:31 -08: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
Albert Iordache
977b37abde Fixed a runtime error. 2011-12-31 14:49:35 +02:00
cib
3a20da81aa Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-31 02:14:28 -08:00
cib
efcd5c29a9 Fixed the hunger symptom which was still using BS12's system. 2011-12-31 02:13:02 -08: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
39b6dd57e0 Removed and commented out the last traces of goon auth. code 2011-12-30 23:28:14 +02:00
rockdtben
938fc1e0f0 toxloss is now only referenced via procs. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2875 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-30 17:59:19 +00:00
rockdtben
5b691f8727 brainloss is now only referenced via procs. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2874 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-30 17:47:35 +00:00
mport2004@gmail.com
67efff9bae Apparently organs are being worked on. 
They have been moved back and checked for Rockdtben.
As the attempted list dead people's names as their real_name did not work, dead people's names are back to the old style.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2869 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-30 17:09:02 +00:00
mport2004@gmail.com
ec0cd3b973 Moved a batch of unchecked and a few unused files into the unused folder. 
Remember if your scrolling though the list and something is unchecked it should almost certainly be checked.
Simple animals moved over to the actual mob code area and out of the defines.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2868 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-30 16:43:41 +00: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
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
SkyMarshal
5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm
 2011-12-29 10:08:58 -07:00
SkyMarshal
9ad0bc5c89 Can compile, now. 2011-12-29 10:01:19 -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
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
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
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
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
SkyMarshal
607db09620 Lotsa stuff. Map update. 2011-12-26 17:59:09 -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
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
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