cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,754 Commits 10 Branches 0 Tags
664c6b7dec02b8c3f06ada8bf97f62f3aabebe9d
Commit Graph

2798 Commits

Author SHA1 Message Date
SkyMarshal
664c6b7dec AI's can now understand pAI speech 
Tidied up some.
 2012-02-06 11:02:49 -07:00
CaelAislinn
87838c7cc5 Merge git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 03:28:09 +10:00
CaelAislinn
32a37c6001 fixed taj speak and taj whisper (not working over radio chat). use :j after the radio/headset commands to speak or whisper in tajaran (only taj mobs can speak / understand it) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 21:27:27 +10:00
SkyMarshal
1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00
CaelAislinn
1593a4923e new characters' jobs are now announced by the arrivals computer 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 05:26:41 +10:00
SkyMarshal
85ee6ae562 Fixed a warning with meteors, HAWK: COMPILE DAMMIT 
Blood now works properly.
 2012-02-05 11:52:42 -07:00
CaelAislinn
9c3e7171f3 fixed mechs being able to interact with things in the players inventory 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 04:27:41 +10:00
SkyMarshal
24d42f0ef8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-05 11:23:58 -07:00
SkyMarshal
429d13e980 Herp, derp made blood work right. 2012-02-05 11:22:05 -07:00
CaelAislinn
14f0f8418c readded scary sound files. got somehow removed from the git tracker 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 03:41:11 +10:00
CaelAislinn
5a4fa7c889 returned pregame time to 180 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 02:56:14 +10:00
CaelAislinn
b1c66d2342 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/MultiZ.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 02:51:49 +10:00
CaelAislinn
9e4539fdce most cameras on the station are now split up into networks. the larger departments all have camera computers to monitor their departments (security and ai can see everywhere). ai can now see multiple networks at once, legacy proc ai_network_change() now acts as a shortcut to let the ai jump to a specific network (picks a random cam in that network). cleaned up / added / removed numerous cameras all over the station to be in line with this update. all camera monitor computers can be built with a single camera circuitboard, simply click the circuitboard when in hand and select a department (must be authorised by a department head). 
scattered minor updates, including removing unnecessary preceeding whitespace in the examine() verb.

added the tajaran as an adminspawnable race, see the forum topic for more information. features: new non-human (feline) playable mob, slightly more vulnerable to heat than humans, can speak in private language understood only by other tajarans (and possibly adept adminhackers), uses mob/living/carbon/human as a base template, so there will be unintended side effects (such as human hair overlays).
known bugs: ears/tail overlays, hud health (and temp?) display not updating, genetics will probably go haywire, speech bug means nothing can be said (high priority).

for the love of god, let this commit go through without trouble.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 02:46:00 +10:00
Albert Iordache
b2120f22e9 Merge pull request #368 from CIB/master 
Erthilo's sprites
 2012-02-05 06:23:39 -08:00
Albert Iordache
ec77e9da19 Revert "More fingerprint fixes" 
This reverts commit c11502eb53 due to a bug where blood appears on objects when the blood_DNA variable is not null.
 2012-02-05 16:22:48 +02:00
Hawk-v3
36e51a9fd4 ARGH METEORS 2012-02-05 13:04:03 +00:00
Hawk-v3
34971bcd99 Should have fixed SUPERHEATED DOOM 2012-02-05 10:47:20 +00:00
Miniature
14a93a1454 Merge pull request #366 from Miniature/master 
Fix for votes being none mode
 2012-02-05 00:23:17 -08:00
Miniature
46d6cbdcd0 Fix for votes being none mode 2012-02-05 18:51:40 +10:30
SkyMarshal
b61120621b Merge pull request #364 from Tastyfish/master 
HOLY SHIT WERE THINGS BROKEN.
 2012-02-04 22:32:53 -08:00
SkyMarshal
c11502eb53 More fingerprint fixes 2012-02-04 23:12:53 -07:00
Tastyfish
35ae4bd5f3 turns out things broke from abi's runtime fix because that proc shouldn't ever be called here 2012-02-05 01:07:57 -05:00
SkyMarshal
6478bf03dc Merge pull request #361 from SkyMarshal/master 
No longer powers down the AI.
 2012-02-04 18:44:43 -08:00
SkyMarshal
dcd0197a1a Poor AI! 2012-02-04 19:43:00 -07:00
Tastyfish
1ba2ea16af Merge pull request #360 from SkyMarshal/master 
Some updates to cigarettes, throwing, and disposals.
 2012-02-04 17:28:25 -08:00
SkyMarshal
2074313f7f Updates to cigarettes and cigars 
Tables can now be thrown past
You can now put something in a disposal unit by throwing at it.
 2012-02-04 18:24:22 -07:00
SkyMarshal
63c712fb3f Merge pull request #359 from SkyMarshal/master 
Bugfixes
 2012-02-04 16:26:38 -08:00
SkyMarshal
1d7b00a0fc Bugfixes for adminhelp and the Power Offline event. 2012-02-04 16:20:19 -07:00
CIB
2ff681d8c4 Merge pull request #358 from SkyMarshal/master 
Fixes for *custom v/h emotes, as well as some other stuff.
 2012-02-04 13:23:10 -08:00
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