Commit Graph

17074 Commits

Author SHA1 Message Date
Miniature 6de4139066 Sky, that was there for a reason (fixing horrible runtimes everywhere) 2012-02-08 01:25:02 +10:30
SkyMarshal be9bcd626d Merge pull request #376 from Tastyfish/master
streamlined copy machine, mainly to not use process()
2012-02-06 19:59:01 -08:00
Tastyfish b0113eaac9 Merge pull request #375 from caelaislinn/master
bug / map fixes
2012-02-06 19:30:51 -08:00
SkyMarshal 14743ca3c0 Derp. That would have been dumb. 2012-02-06 20:27:06 -07:00
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
quartz235@gmail.com e2f2085164 -The crematorium no longer locks up when loaded with an item and no mob, and also incinerates items placed in it
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3049 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 01:19:07 +00:00
baloh.matevz c933a9da24 It would appear that the whiners of TGS cannot take a joke.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3047 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 01:01:22 +00:00
baloh.matevz 2cfd6a1141 cheap lighter is now not capitalized so the parser works properly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3046 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 00:41:30 +00:00
baloh.matevz 32cd34bba3 Engineers and the CE now have a 10% chance of spawning nearsighted with prescription glasses...... Oh like you've ever seen an engineer that doesn't wear glasses :)
Added this to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3045 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 00:32:50 +00:00
CaelAislinn 1366bf7e34 Merge git://github.com/Baystation12/Baystation12
Conflicts:
	code/defines/procs/gamehelpers.dm
	code/game/mecha/mecha.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-07 09:08:55 +10:00
Tastyfish b6ba1b74fa streamlined copy machine code 2012-02-06 17:16:16 -05:00
CaelAislinn 06fad98469 fixed mech charge port bug, fixed (?) autolathe bug, miscellaneous map fixes
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-07 08:05:47 +10:00
CaelAislinn 9ca058fd1b added a couple of missing networks to department camera monitors
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-07 06:59:35 +10:00
Tastyfish d2404e8a79 Merge remote-tracking branch 'upstream/master' 2012-02-06 13:41:59 -05:00
SkyMarshal 664c6b7dec AI's can now understand pAI speech
Tidied up some.
2012-02-06 11:02:49 -07:00
CaelAislinn 647ed920eb removed redundant proc, updated old blood in multiz
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-07 03:53:01 +10: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
baloh.matevz 74aa8a4ee5 Map changes:
- A small map change at chemistry. There is now a 1 tile indent so that people running up and down the hallway don't push people waiting for the chemist all over the place.
Screenshot: http://www.kamletos.si/chemistry.png
- Some doors were replaced with glass doors (engineering exterior, engineering break room, bridge outside doors, eva left double doors)

Nerfed poly acid.

Description from #coderbus:
- When you splash pacid on someone's face, if they have a mask it melts, if they don't, but have a helmet, there is a 15% chance for it to melt, if they don't have either, they take 15 damage and there is a 15% chance for them to become unknown
- if the method is not TOUCH (whatever that means)... they take 15 damage and there is a 15% chance for them to become unknown
- on_mob_life... they now take 1 tox damage per tick instead of 1 tox + 1 burn
- reaction_obj is the same as before



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3043 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-06 01:42:02 +00:00
kortgstation@gmail.com 8aa398f7c4 Oh god Im fucking retarded hurr fixed a messed up object path from last commit
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3042 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-06 00:34:59 +00:00
baloh.matevz 2d99229856 - When you open an door of any kind you can see through it as soon as it starts to open. You can however only move through once it's fully open.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3041 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-06 00:02:49 +00:00
kortgstation@gmail.com cb57fae3b8 The "X FAILS TO PUSH Y'S FAT ASS OUT OF THE WAY" message now only displays to the person shoving, so those nearby are not subjected to chat spam.
Added a "Relentless" var to mobs that makes them unshoveable if their intent is anything but help.

Alien Queens are relentless.

Constructs are relentless, can now push things, and have automated movement disabled (because it was bugging the hell out of me when testing)

Shades also have automated movement disabled.

The gladiator costume now has a chance to spawn in the theatre (sprites by Ausops)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3040 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 23:56:15 +00:00
baloh.matevz 050accb57b - Brought 2.0.8 and uterus up to date with the new type paths.
- Added an atmostech belt that spawns with the same tools as the engineer full belt, just the wire is replaced by an analyzer.
- Atmos techs now spawn with this belt
- Added a detective-styled personal closet, that contains a satchel, which contains a wallet, which contains one or two spacecash items and a coin.
- Slightly redesigned two of the dorm rooms so they have this new cabinet - closet with the stuff mentioned above.
- Slightly changed the spawn order of items in engineering closets so that hazard vests spawn above toolboxes. Hopefully this will spare a few fiddly clicks for engineers.
- Detective locker now spawns with the locked sprite
- Engineering now has the L2 radioactive suit lockers that contain rad suits instead of that crate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3039 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 22:41:48 +00:00
petethegoat@gmail.com eccfc3ed3f Committing Rolan's MMI suicide/ghosting fix. Fixed issue 143.
Comitting Nodraks's ghost ears toggle preference.

I also removed the underwear option, as it could not be toggled.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3038 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 19:57:08 +00: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
petethegoat@gmail.com 2c3c7c2c6b Added in throwing stuff into disposals, courtesy of SkyMarshal.
(technically this is a hotfix, as I accidentally committed it in r3036.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 17:40:12 +00:00
petethegoat@gmail.com 2c58840a4f Added throwing items over tables, thanks to SkyMarshal.
Improved cigarette code, mostly grammatical fixes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3036 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 17:22:39 +00: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
polyxenitopalidou@gmail.com a1d54e2270 •No.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3035 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 15:29:04 +00: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
Tastyfish 11a884ca35 bugfix for machines so attack_hand's mob typechecks actually work right is usr is not user (most likely if usr isn't set) 2012-02-05 06:34:19 -05: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