cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,211 Commits 6 Branches 0 Tags
14e9dbd779c94c5d00eb4f90d77c039e054bdb08
Commit Graph

405 Commits

Author SHA1 Message Date
Tastyfish
14e9dbd779 a couple chatbot grammer improvements 2012-01-04 17:25:33 -05: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
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
Albert Iordache
4a8c5e9478 Fixed a minor spelling mistake. 2011-12-26 17:37:04 +02:00
SkyMarshal
de67b05dce More updates. The evidence bags are kinda borked. 2011-12-26 00:03:05 -07:00
SkyMarshal
8ee8875e80 Fixed some bugginess with evidence bags. 2011-12-25 12:37:20 -07:00
SkyMarshal
dd8deae835 Numerous fixes. 2011-12-25 10:57:23 -07:00
Albert Iordache
10842e2ede Custom items are now placed on the ground, if all else fails. 2011-12-24 20:59:50 +02:00
Miniature
319981a37d Trust me to forget a file. 2011-12-24 03:35:58 +10:30
MlocMcMloc
7f540f6811 Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738 
Yet again, check the description.
 2011-12-19 08:09:25 -08:00
Miniature
6a9ed446be Fixed camera chunks still being shown when an AI dies in freelook mode 2011-12-19 21:03:47 +10:30
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
StrumpetPlaya
4489db546d Added detective stuff - fibers. 
Left out bloody footprints for now.  Not sure we want that with the
current system of corpses dropping blood spatters all around when dragged.
 2011-12-06 07:12:19 -05:00
Miniature
a7b2110194 AI freelook stuff - should work perfectly now 
Urist said that /tg/ people got some runtime errors, I have no idea what they got and I haven't got any errors in testing so yeah.
 2011-12-05 15:08:52 +10:30
Miniature
f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
 2011-12-03 19:28:10 +10:30
Miniature
15fa196907 AI Freelook 2011-11-30 01:31:22 +10:30
Tastyfish
e58dd6030f Auto-flush disposals, auto-hush vendending machines 2011-11-29 02:42:08 -05:00
petethegoat@gmail.com
1d9eda6b65 Removing recycling from WorkInProgress. 
(Please note that due to what seems to be an error with Tortoise SVN, I have to do this in two commits.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2571 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 20:08:14 +00:00
petethegoat@gmail.com
2190408f0f Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209. 
Slightly improved mops, and got rid of the "X attacks the blood with the mop!" message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2557 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 15:58:50 +00:00
rockdtben
84888d5ec3 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2536 316c924e-a436-60f5-8080-3fe189b3f50e 2011-11-20 15:53:23 +00:00