Commit Graph

5039 Commits

Author SHA1 Message Date
petethegoat@gmail.com 24e2aedab8 Added stat tracking for cyborg frames built, cyborgs created, MMIs filled, AIs created, and cyborg modules chosen.
cyborg_frames_built
cyborgs_created
mmis_filled
ais_created

standard_cyborgs
service_cyborgs
miner_cyborgs
medical_cyborgs
security_cyborgs
engineering_cyborgs
janitor_cyborgs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3064 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:27:54 +00:00
SkyMarshal e4d4173b97 Merge pull request #388 from Tastyfish/master
job title choices! lizards speak normal, can pour things down sink
2012-02-08 18:17:30 -08: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 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
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
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
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 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
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
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
elly1989@rocketmail.com 2d77383ad0 Widespread grammar fixes! Still loads I've yet to fix. It'll take forever.
Resolved Issue 333: The plastic flaps on the mining station now actually block air-flow. http://code.google.com/p/tgstation13/issues/detail?id=333
Fix for runtime in issue 332 until getrev is fixed. https://code.google.com/p/tgstation13/issues/detail?id=332
Resolved Issue 331 https://code.google.com/p/tgstation13/issues/detail?id=331
Resolved Issue 304 https://code.google.com/p/tgstation13/issues/detail?id=304
Removed a lever I found randomly placed within the asteroid rock.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3021 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-31 10:03:55 +00: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