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,686 Commits 8 Branches 0 Tags
5c46b1751bcf99a19e57ecb115b0e4ddfb8bfaa1
Commit Graph

2749 Commits

Author SHA1 Message Date
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
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
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
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
SkyMarshal
e7a7b8017d Fix for fingerprints. (They work right, now!) 
Fixed the runtime related to brainmobs (sanity check)
do_after now works right.
Added the Decapitate objective, that is admin only ATM, which requires you remove their head and take it on the escape shuttle.
Fixes for a lot of surgery related bugs
Added a prompt to AI players when they are greeted, warning them not to stalk the traitor and so on.  Cacophony and Spaceman approved of it.
Sanity check for limb removal and blood stuff.
Added in sprites for a Syndicate statis/sleeper for a secret thing I have planned!
 2012-01-31 21:23:37 -07:00
SkyMarshal
18a7fc25c9 Merge pull request #338 from SkyMarshal/master 
Bugfixes
 2012-01-31 16:58:57 -08:00
SkyMarshal
6e3aef823a Fix for wardrobes and lockers. 
Fix for Fingerprints.
 2012-01-31 17:58:22 -07:00
SkyMarshal
f89009e6ab Merge pull request #337 from SkyMarshal/master 
Bugfixes
 2012-01-31 14:04:29 -08:00
SkyMarshal
80be80a4c1 Bugfixes! 
Fingerprint sanity checks
Mulebot sanity checks
Traitor objectives work, now
Some mapping errors fixed.
Attempted fix for solar tracking.
 2012-01-31 15:00:46 -07:00
Uristqwerty
48706d8778 Distance_ortho runtime/NPE fix 
A quick test with get_dist to null shows it returning 127 (the max value it returns). Since Distance_ortho doesn't use get_dist, it doesn't share the distance cap, so I just picked an arbitrary large number.
Double fix: If the destination is null, don't even bother pathing, you won't get there anyway.

Expected new runtime error: some callers of AStar mignt not be expecting it to return null, even though it already would if it can't find a path, or the source loc is null.
 2012-01-31 16:32:05 -05:00
Albert Iordache
5c8f42a2d6 Fixed an operating computer runtime error 2012-01-31 20:20:41 +02:00
SkyMarshal
39f170b4b3 Final updates: 
Fingerprints done.
A mob's be_syndicate is a direct copy of their preferences.
 2012-01-31 02:30:54 -07:00
SkyMarshal
beffc2299a Final updates on Fingerprints 
fix for traitors getting assassinate and protect targets for the same person
Ported blood rejection
 2012-01-31 02:01:39 -07:00
SkyMarshal
6648061dcb MAJOR UPDATE: Detective/Fingerprints update 
bugfix for wardrobes
blood type is now handled by datum/dna, and blood_DNA for atoms is a list of list, each sub list containing DNA and blood-type. (This allows multiple blood splatters)
added BS12 give command and explosives
Map update to remove blob spawn.
 2012-01-31 02:01:38 -07:00
SkyMarshal
5dba3ccf88 WIP on detective work overhaul 
Give command ported, with more sanity checks (It works, now!)
Added BS12 c4 in addition to TG c4
Fixed server air alarm
Book length increased 3 fold.
Blood and gibs now maintains DNA
Fixed evidence bags
Ported the awesome BS12 handcuff stuff, with flavor text.
 2012-01-31 02:01:37 -07:00
SkyMarshal
d2eff85c17 Porting much of Aryn's stuff 
-Sounds
-Detective Work
-Hallucinations
Tweaked server air alarm
Tweaked gibs
Working on de-derping surgery
Ported some BS12 stuff (stunned radio and adminwho)
Player's mind datum now holds their antagonist preferences.
 2012-01-31 02:01:36 -07:00
Albert Iordache
10b3bdce7e Fixed a compiling error. 2012-01-31 10:30:52 +02:00
Albert Iordache
888730e196 Fixed a runtime error with the filling cabinet 2012-01-31 10:14:15 +02:00
Hawk-v3
d10b9789a2 A change for next patch. 2012-01-30 18:39:57 +00:00
quartz235@gmail.com
2f1b019396 TG Update: Fix for issue 246 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2705 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-30 18:03:57 +00:00
trubblebass@gmail.com
6c382e3a98 TG Update: Fix for Pete's fix. It should work properly now. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2703 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-30 17:25:43 +00:00
CaelAislinn
7c46d4ff63 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-30 22:25:07 +10:00
CaelAislinn
15ab34ca7f minor tweaks / grammar fixes 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-30 22:23:57 +10:00
CaelAislinn
a711259856 added pressure sealed hatches for testing / WIP purposes 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-30 22:23:01 +10:00