Commit Graph

10065 Commits

Author SHA1 Message Date
baloh.matevz@gmail.com abe5e4ba9d Discontinuing the feedback logging of mineral production.
At the time when this was uploaded the 30-day logging information was...

Iron sheets produced: 75125
Steel sheets produced: 20548
Glass panes produced: 16057
Reinforced glass panes produced: 535
Gold ingots produced: 14006
Silver ingots produced: 13142	
Diamonds produced: 5835	
Uranium bars produced: 12604	
Plasma bars produced: 38098	
Bananium produced: 421
Adamantine produced: 0

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3063 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:01:23 +00:00
Tastyfish 2dc3a5cc6e fixed horribly buggy camera assembly 2012-02-08 20:56:04 -05:00
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
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 b26652944c - Reverted erroneously committed file.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3058 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 18:57:28 +00: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
kortgstation@gmail.com 32f4fc9d94 Fixed the cooldown time on Phase Shift (was 2 seconds instead of 20)
Lowered the lifespan of the forcewalls created by the spell Shield

Changed the "Relentless" var to "nopush" by Urist's orders (no mechanical change, but a technical name rather than a fluffy one)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3055 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 17:08:55 +00:00
CaelAislinn b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache 1ae02519fc Merge pull request #380 from Abi79/master
Small code cleanup
2012-02-07 22:00:56 -08: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
Tastyfish 5e6e477e37 allowed lizards to talk normal 2012-02-07 19:54:09 -05: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
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
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 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
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
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 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
baloh.matevz 4c92d1c152 Added a cheap lighter so that zippos will have some company.
The cheap lighter can be purchased at vending machines and comes in 4 colors: green, yellow, cyan and red.

Technical info:

The path
/obj/item/weapon/zippo

was changed to 
/obj/item/weapon/lighter/zippo

The new lighter is
/obj/item/weapon/lighter/random

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3033 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 22:23:42 +00: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
baloh.matevz cd85e48c4a The job selection page has been changed a little:
Screenshot:
http://www.kamletos.si/job%20selection%203.PNG

Added this to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3032 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 21:09:11 +00:00
baloh.matevz 0fa1f3d924 Examining humans is now smarter and displays only the things you can see. Certain outerwear suits and helmets hide other pieces of clothing on you.
A diagram that displays what can hide what:
http://www.kamletos.si/inventory%20visibility%20hierarchy.png

Note that not all suits and helmets hide stuff.

Added this to the changelog.

Technical information:

Renamed gimmick.dm to z_gimmick.dm because whenever I doubleclicked on any piece of clothing in the object tree it always pointed me to some random gimmick item instead of the root definition. Now the file is at the bottom of the folder and so everything else is looked up first.

Created a bitflag variable which is used to determine which piece of clothing hides another. The variable is flags_inv and the flags it contains are:

#define HIDEGLOVES 1		//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDESUITSTORAGE 2	//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDEJUMPSUIT 4		//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDESHOES 8			//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDEMASK 1			//APPLIES ONLY TO HELMETS!!
#define HIDEEARS 2			//APPLIES ONLY TO HELMETS!!
#define HIDEEYES 4			//APPLIES ONLY TO HELMETS!!

The first 4 only apply to exterior suits and the last 3 only to helmets, so they can use the same numbers. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3031 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 20:09:46 +00: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
trubblebass@gmail.com d775d010d6 - Fixes an incorrect object path for the E-Crossbow that was causing RnD stuff to crash.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3029 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 23:25:14 +00: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