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,787 Commits 8 Branches 0 Tags
96df31b9cde914bb227a70a2c3cf3608032c7cb7
Commit Graph

1281 Commits

Author SHA1 Message Date
Albert Iordache
1ae02519fc Merge pull request #380 from Abi79/master 
Small code cleanup
 2012-02-07 22:00:56 -08:00
CaelAislinn
09490b8cb0 fixed derpy ai movement. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 06:16:12 +10:00
Albert Iordache
7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Albert Iordache
a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
Miniature
6de4139066 Sky, that was there for a reason (fixing horrible runtimes everywhere) 2012-02-08 01:25:02 +10:30
SkyMarshal
e432958ab5 Bugfixes for airlocks 
Added detective work manual, that spawns on top of the detective's computer
Added RadioAlert proc
Added the capability to title the NanoTrasen updates
 2012-02-06 20:24:00 -07:00
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
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
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
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
1d7b00a0fc Bugfixes for adminhelp and the Power Offline event. 2012-02-04 16:20:19 -07: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
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
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
SkyMarshal
c1ea1d0a97 Fix for HERP DERP LAG. 2012-02-03 10:51:52 -07: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
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
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
27b43d532e Merge pull request #345 from SkyMarshal/master 
Hallucinations and final parts of the fingerprint system
 2012-02-02 10:42:45 -08:00
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
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
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
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