Commit Graph

9304 Commits

Author SHA1 Message Date
baloh.matevz@gmail.com cd37755ff4 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3062 316c924e-a436-60f5-8080-3fe189b3f50e 2012-02-09 01:37:42 +00:00
SkyMarshal 710bcbb42b Final parts for the airlocks.
Wrench -> Weld -> Wrench removes the cover
secure/centcom has all wires electrocute
Emag is now tweaked
Implanted uplink now works.
2012-02-08 17:42:34 -07:00
Tastyfish 7b0a083a68 merge form upstream/master 2012-02-08 18:45:25 -05:00
Tastyfish 91635c4fbd Merge remote-tracking branch 'upstream/master' 2012-02-08 18:42:00 -05:00
SkyMarshal bd756112a1 There. That /should/ make it work. 2012-02-08 14:18:49 -07:00
SkyMarshal 6f149af6ba *sigh* Lets hope that worked. 2012-02-08 13:48:34 -07:00
SkyMarshal b967f6b577 Should make the engineer hacktool auto raise the bolts, at the cost of alerting the AI. 2012-02-08 13:46:10 -07:00
petethegoat@gmail.com 3978a42d8b Added Sieve's 'connected to port' and 'tank attached' icons for pumps and scrubbers.
And I most certainly did not add a special new shirt, with icons by Ausops. No sir.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3060 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 19:42:03 +00:00
SkyMarshal 1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
2012-02-08 12:13:03 -07:00
SkyMarshal ffb142abae Secure Airlock update!
4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)
2012-02-08 12:07:12 -07:00
panurgomatic c754581c46 - Added Exosuit Jetpack
- Added Exosuit Nuclear Reactor
- Added Ripley construction steps sprites (courtesy of WJohnston)
- Exosuit Sleeper can now inject occupant with reagents taken from Syringe Gun
- Exosuit Cable Layer will now auto-dismantle floors
- Exosuit Heavy Lazer cooldown increased, Scattershot now fires medium calibre ammo (less damage)
- EMP now drains half of current exosuit cell charge, not half of maximum charge.
- Exosuit wreckage can be pulled
- Fixed several possible exosuit equipment runtimes
- Moved all mecha-related icons to icons/mecha
- Mecha equipment messages will show equipment icons in chat window
- Fixed mecha creation reports being sent at wrong construction step
- Played with changelog markup. For some reason javascript is extremely slow in byond browser, I'll look into it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3057 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 18:47:04 +00:00
petethegoat@gmail.com 84e292a271 Added an ex_act and blob_act to photocopiers.
They have a new var, maxcopies, which is intended to be edited on the map for public photocopiers, for example.

Some more fixes to chemistry.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3056 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 18:45:26 +00:00
Melvin Melonstorm f8f3f290c5 Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not. 2012-02-08 19:15:10 +01:00
CaelAislinn b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02:00
Tastyfish 7261167741 added modes to sink 2012-02-07 22:58:00 -05:00
kortgstation@gmail.com b324db9b7e The armoured construct is now known as the Juggernaut. Its health was lowered and it takes massive damage from being hit with a bible. The Juggernaut has a lesser version of force wall.
Added the Wraith construct, a faster, more fragile construct which has a lesser version of Ethereal Jaunt. It too is vulnerable to bibles.

The Chaplain is now immune to blood boil, stun talismans, and cult blind/deafen

Constructs are finally creatable by using a full soulstone on an empty construct shell. The creator will be able to choose which kind of construct is created.

Cultists can get construct shells from their supply talisman

Wizards now get the spell "Artificer" which allows them to create construct shells for free when they select the soulstone belt.

Medical Borgs are now relentless to prevent them losing hold of incapacitated patients.

Added the Artificer (conjure construct shell), Phase Shift (lesser jaunt), and Shield (lesser forcewall) spells

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3054 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 02:58:30 +00:00
CaelAislinn 22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 11:47:07 +10:00
quartz235@gmail.com d3643b021f Fixed issue 352
- Hacking wallsafes/briefcases is now properly interruptible.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3053 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 23:33:52 +00:00
quartz235@gmail.com 64a0a884ee - Fix for ripley wrecks (YOU'RE WELCOME SUPERXP)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3052 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 22:40:02 +00:00
quartz235@gmail.com c540dde158 - Can't burn up the nuke disk in a crematorium lololol
- The message for trying to cremate nothing is now based off the crematorium instead of user
- Minor grammar fix

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3051 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 22:17:23 +00:00
Superxpdude@gmail.com 2334019bc3 Fixes Issue 299.
Applying the cell charger fix from here: http://bit.ly/wl2FEO

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3050 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 21:58:24 +00: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
SkyMarshal d26767127e Merge pull request #379 from caelaislinn/master
autolathe bug fix
2012-02-07 08:09:41 -08:00
CaelAislinn a9df0e64bf fixed autolathe perma-freeze bug, also fixed some icon states.
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 02:07:10 +10:00
Miniature 22687953fc Another runtime fix, I believe this to originally be caused by the automatic arrival announcement thing not having a source mob 2012-02-08 01:28:55 +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 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
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
SkyMarshal 1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07: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
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
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
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 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