Commit Graph

749 Commits

Author SHA1 Message Date
Tastyfish
0ebbe456b3 job titles 2012-02-08 20:43:04 -05:00
Tastyfish
91635c4fbd Merge remote-tracking branch 'upstream/master' 2012-02-08 18:42:00 -05:00
Albert Iordache
1ae02519fc Merge pull request #380 from Abi79/master
Small code cleanup
2012-02-07 22:00:56 -08:00
Tastyfish
5e6e477e37 allowed lizards to talk normal 2012-02-07 19:54:09 -05: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
Miniature
6de4139066 Sky, that was there for a reason (fixing horrible runtimes everywhere) 2012-02-08 01:25:02 +10:30
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
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
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
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
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
SkyMarshal
16ac8ba8e0 Bugfixes. 2012-02-02 01:45:35 -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
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
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
76c695c88b Merge pull request #330 from CIB/master
Autopsy fixes
2012-01-29 09:33:42 -08:00
SkyMarshal
96588f1d88 Removed laser guns from Emaged sec borgs. Replaced with Toy Sword. 2012-01-29 03:24:52 -07:00
SkyMarshal
7472d4eb5d Fixes "chest is bleeding from a big gaping wound on her chest."
(Someone was tired when they coded this)
2012-01-29 02:28:04 -07:00
SkyMarshal
4b79c258b6 Map update: Adds wardrobes for all jobs + copiers and filing cabinets.
Modified surgery to work with autopsy
Adminhelp should go to the admin channel without being stupid
suicide tweaked so all antags can use it
You can no longer radio while stunned
More door fixes.
2012-01-29 02:16:18 -07:00
SkyMarshal
820f3c1242 Merge pull request #324 from CIB/master
Stuff
2012-01-28 20:31:25 -08:00
cib
179d5a55ea A lot of fixes to autopsy.
- Projectiles now leave wounds that can be scanned through autopsy.
- The "fake" weapons selected by the scanner are no longer completely random.
- The scanner now displays age and severity of the wound.
2012-01-28 18:04:59 -08:00
cib
e14dfc5ace Added autopsy.
- When a human is attacked, data about the weapon is added to a special wound datum on the organ.
- This data can be extracted and processed by opening up the limb and using an autopsy scanner on it.
- Added the autopsy-scanner to the map.
2012-01-28 02:26:44 -08:00
SkyMarshal
3e9146f99a Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-01-28 02:03:42 -07:00
SkyMarshal
695a673865 Final bugfixes, port of AutoTraitor (tested) and RP-Rev (Untested) 2012-01-28 01:52:14 -07:00
SkyMarshal
12afd61ffc Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant. 2012-01-27 20:15:06 -07:00
SkyMarshal
21fe68972f Lots of stuff, will elaborate later. 2012-01-27 11:18:14 -07:00
cib
c5d7f97c98 Automatic healing and other medical stuff
- A mob with health > 0 will now slowly heal, around 1 damage per minute, unless it's cloneloss. This can be accelerated by sleeping.
- A mob with health < 0 will now slowly be damaged, also around 1 damage per minute. This can be decellerated by sleeping.
- Movement is no longer slowed by damage(unless it's a broken/missing bone), but only by trauma. This means that painkillers will help with movement speed.
- Painkillers now remove the red flashes and pain messages.
2012-01-26 19:16:08 -08:00
SkyMarshal
88c283ea1a Merge branch 'master' of github.com:SkyMarshal/Baystation12 2012-01-25 08:39:58 -07:00
SkyMarshal
2bf51ec238 Fix from TG for monkeys not dying. 2012-01-23 14:06:58 -07:00
Tastyfish
d141673b87 Merge pull request #306 from SkyMarshal/master
More telecomms, improved mob interface, cleaned up the operating table.
2012-01-22 22:53:29 -08:00
SkyMarshal
a9520990f7 More updates for the response team and stuff. The response team telecomm unit now works right, radios now have an autosay proc for automated announcements, the SpecOps shuttle now uses autosay, proper energy guns replace the bugged ones, Automated (non player AI) announcement of new players, another attempt at making the command frequency legible, HUD icon for secHUDs and ERT members. 2012-01-22 22:41:17 -07:00
SkyMarshal
20ac0c2235 Fixed some silliness I messed up on. 2012-01-22 16:28:13 -07:00
SkyMarshal
201046c3bf Improved capabilities to set someone else's internals.
Improved the operating table again.
Grabbed another TG update for telecomms.
2012-01-22 15:31:13 -07:00