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

3369 Commits

Author SHA1 Message Date
SkyMarshal
7a4b21382e Fixes for *custom v/h emotes 
Blood type is now a variable of the DNA datum
Fixed runtime from blood
Fixed the AI prompt being missed.
Added breath holding.
 2012-02-04 14:17:17 -07:00
cib
d121b740d1 Added Erthilo's bone gel and bone setter sprites. 2012-02-04 11:59:46 -08:00
CaelAislinn
b1f5183d61 fixed extra whitespace in the examine verb 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-05 01:49:34 +10:00
CaelAislinn
42c41c1ee9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/unused/toilets.dm
	maps/tgstation.2.0.8.dmm
 2012-02-04 22:36:42 +10:00
Albert Iordache
f11876662e Fix for a book related runtime error. 2012-02-04 12:12:22 +02:00
Albert Iordache
97883f63c2 Fix for an atmos runtime error. 2012-02-04 11:38:26 +02:00
Tastyfish
9072a0e760 Merge pull request #352 from Hawk-v3/master 
TG Updates CHECK THIS
 2012-02-03 18:25:27 -08:00
Tastyfish
d46846c1a5 Merge pull request #355 from SkyMarshal/master 
Radio alert on singularity containment failure now goes to the Engineering Channel.
 2012-02-03 17:04:02 -08:00
SkyMarshal
44c235a529 Radio alert now goes to engineering channel. 2012-02-03 18:02:22 -07:00
Tastyfish
7f70a3d2b2 Merge pull request #354 from SkyMarshal/master 
Makes the announcements come AFTER the events, adjusted the Power Offline event.
 2012-02-03 16:50:44 -08:00
SkyMarshal
3254aa10d8 Adjustments to events 
Adds alarm for the singularity containment field.
 2012-02-03 17:48:35 -07:00
Albert Iordache
91b2274aaf Merge pull request #351 from Miniature/master 
AI freelook finishing
 2012-02-03 10:01:41 -08:00
Hawk-v3
3f45c881e2 Removing something for sky. 2012-02-03 17:59:49 +00:00
SkyMarshal
c1ea1d0a97 Fix for HERP DERP LAG. 2012-02-03 10:51:52 -07:00
Hawk-v3
e4905ae1af Patching for a item file. Please, check this. Deny if it isn't needed. I tried to make it work. 2012-02-03 10:54:25 +00:00
quartz235@gmail.com
5c46b1751b TG Updates: Fixed being unable to finish AI creation 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2710 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-03 10:42:25 +00:00
Miniature
51043ef9f8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-03 20:29:16 +10:30
Miniature
4aa8f73128 AI freelook! I am no longer aware of any issues with it (other than one minor one involving it not removing the dim overlay sometimes, but that is very easy to ignore) 
If someone goes over the map and fixes the camera coverage, I suggest we force AIs to use this (and I'll be making a thread about it)
 2012-02-03 20:28:43 +10:30
baloh.matevz
bb64b63687 TG Updates: Coded in a round-start hierarchy displayed to you when you are assigned a job. 
So the text you now see at the start is...

The current game mode is - Traitor!
There is a syndicate traitor on the station. Do not let the traitor succeed!
You are the Chemist.
As the Chemist you answer directly to the chief medical officer and the research director. Special circumstances may change this.

Added this to the changelog.

If other servers wish to change this they can just do so by editing the supervisors variables in the files in

code/game/jobs/job/

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2709 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-03 09:33:56 +00:00
quartz235@gmail.com
5f9fa90a90 TG Updates: Fixes: Issue 241 Issue 237 and Issue 240 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2708 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-03 08:55:24 +00:00
vageyenaman@gmail.com
d908f7f468 TG Updates: Bugfixes: Fix for Issue 161. Fix for Issue 239. Circuit imprinter runtime involving Atmosphereic Alert circuits. 
▫ Capitalized some letters in the security level messages. Because that really annoyed me!

▫ Merged Donkieyo's patches with the master branch. (Forum post: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=7051)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2706 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-03 08:09:32 +00:00
SkyMarshal
37ac7e31ee Hallucinations. 2012-02-02 21:53:08 -07:00
SkyMarshal
4290c35af8 Several detective fixes. 3 hour tape recorder. 2012-02-02 21:41:30 -07:00
CaelAislinn
a8b1c6e66d fixed a camera bug, fixed a couple of camera placements around the map 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-03 13:48:55 +10:00
SkyMarshal
a2237a10dc Fixes for singularity beacon glitching 
further gibber fix.
Ghosts can no longer print autopsy reports
Shrunk evidence bags so they can be put in lockers.
 2012-02-02 19:59:15 -07:00
SkyMarshal
0e15736ba9 Fixes for gibber and detective computer. 
Fixed some hallucination and fingerprint stuff.
 2012-02-02 19:30:12 -07:00
SkyMarshal
20d5879c78 Derp. 2012-02-02 13:57:33 -07:00
SkyMarshal
30c338077f Fixes for the AI beginning of round prompt, autolathe is now public access. 2012-02-02 13:47:51 -07:00
Hawk-v3
303b760874 Merge pull request #348 from SkyMarshal/master 
Bugfixes and updates to fingerprints
 2012-02-02 11:29:32 -08:00
SkyMarshal
3b9efc849e Updates to fingerprints/bugfixes. 2012-02-02 12:22:46 -07:00
Hawk-v3
27b43d532e Merge pull request #345 from SkyMarshal/master 
Hallucinations and final parts of the fingerprint system
 2012-02-02 10:42:45 -08:00
CaelAislinn
28aa5d0a9f Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-03 03:51:45 +10:00
CaelAislinn
5dda37f25f tweak to mech bays, shouldn't affect the current map 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-03 03:50:36 +10:00
Miniature
1b08b0412a Merge pull request #347 from Miniature/master 
People can now cut wires in doors again
 2012-02-02 09:43:30 -08:00
Miniature
00ef9657a2 People can now cut wires in doors again 
Whoever coded using glass shards or wirecutters is an idiot who doesnt test shit
 2012-02-03 04:04:59 +10:30
Albert Iordache
9c8b58c6ca Merge pull request #344 from Tastyfish/master 
photos & pages in books, book binder much better, books show author ckey
 2012-02-02 07:12:55 -08:00
Tastyfish
4fcda439a7 doing a custom vote, aborting it, and starting a new one appended the choices to the choices of the old one. 2012-02-02 04:38:55 -05:00
SkyMarshal
16ac8ba8e0 Bugfixes. 2012-02-02 01:45:35 -07:00
SkyMarshal
3087c5d2e6 Hallucinations are 50x creepier now, thanks Mr. Fox. 2012-02-02 01:13:49 -07:00
SkyMarshal
e0c86aa6d3 Missed some sanity checks. 2012-02-02 00:36:50 -07:00
SkyMarshal
2ed57e0cc6 Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same. 
Added hallucinations properly.
Added LSD (with hallucinations.)
Remapped slightly.
 2012-02-02 00:35:48 -07:00
SkyMarshal
1b02334ddc Syndicate Sleeper updates. 2012-02-02 00:35:47 -07:00
Albert Iordache
43d1d5aaab Merge branch 'master' of https://github.com/Hawk-v3/Baystation12 into Hawk-v3-master 
Conflicts:
	code/modules/power/apc.dm
 2012-02-02 08:50:33 +02:00
Tastyfish
98bebf0460 Merge remote-tracking branch 'upstream/master' 2012-02-01 19:15:23 -05:00
Tastyfish
5f3a6455f9 photos, pages in books, binder much better, books show author ckey 2012-02-01 19:14:30 -05:00
CaelAislinn
1455b55eb8 added new circuitboard 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-01 21:01:42 +10:00
CaelAislinn
8eb550f794 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-01 18:18:04 +10:00
CaelAislinn
9366781cef security camera circuits and outpost camera circuits are no longer researchable. new research item: camera monitor circuits. can be set to produce monitoring computer for any hardcoded camera network, with appropriate approval levels (sec for station, mining for outpost etc). 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-01 18:00:55 +10:00
CompactNinja
70b4a326f7 Merge pull request #339 from SkyMarshal/master 
Runtimes fixes, fingerprints fixes, new unimplemented traitor objective, surgery bugfixes, sanity checking.
 2012-01-31 21:02:18 -08:00
SkyMarshal
41749df402 Missed some stuff. 2012-01-31 21:36:22 -07:00