Commit Graph
2276 Commits
Author SHA1 Message Date
SkyMarshal 8b62eff01a Cleaned up the fingerprint code
Added sanity checks to the clean blood proc.
2012-02-09 09:42:08 -07:00
quartz235@gmail.com dddd20f11f - Removing the atmospherics vending machine until such time as actual sprites for it (Working, unpowered, broken) are available
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3061 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 01:29:39 +00:00
SkyMarshal 7298e8619b Adding in cut down hacktool for CE. 2012-02-08 13:33:55 -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
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 e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02: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
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 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
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
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
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
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
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
SkyMarshal c11502eb53 More fingerprint fixes 2012-02-04 23:12:53 -07: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
baloh.matevz 9028fc227f A simple wallet storage item has been added that can hold 4 small items. The items it can store are defined in a list
It however includes spacecash, cards (id, data, emag), cigarette, penlight  (+ parapen), seeds, ointment, bruisepack, crayon, coins, dice, implanters, lighter, match, paper, pen, photo, dropper, screwdriver and a stamp.

Sprites by Aru 
http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=4548&start=40#p36594

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3034 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 01:13:13 +00: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
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
Miniature 51043ef9f8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-03 20:29:16 +10:30
Miniature 4aa8f73128 AI freelook! I am no longer aware of any issues with it (other than one minor one involving it not removing the dim overlay sometimes, but that is very easy to ignore)
If someone goes over the map and fixes the camera coverage, I suggest we force AIs to use this (and I'll be making a thread about it)
2012-02-03 20:28:43 +10:30
trubblebass@gmail.com 6b23587fb6 Comitted on behalf of BubbleWrap
- Boxes can now be collapsed down into cardboard sheets.
- Cardboard sheets are stackable (like glass and metal).
- Cardboard sheets can be made back into boxes when needed.
- Cardboard sheets can also be made into a cardboard cyborg costume.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3028 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 01:06:41 +00: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
CaelAislinn 8eb550f794 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-01 18:18:04 +10:00
CompactNinja 70b4a326f7 Merge pull request #339 from SkyMarshal/master
Runtimes fixes, fingerprints fixes, new unimplemented traitor objective, surgery bugfixes, sanity checking.
2012-01-31 21:02:18 -08: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
Uristqwerty 48706d8778 Distance_ortho runtime/NPE fix
A quick test with get_dist to null shows it returning 127 (the max value it returns). Since Distance_ortho doesn't use get_dist, it doesn't share the distance cap, so I just picked an arbitrary large number.
Double fix: If the destination is null, don't even bother pathing, you won't get there anyway.

Expected new runtime error: some callers of AStar mignt not be expecting it to return null, even though it already would if it can't find a path, or the source loc is null.
2012-01-31 16:32:05 -05: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 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
CaelAislinn 7c46d4ff63 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-30 22:25:07 +10:00
baloh.matevzandHawk-v3 a2de8cda21 TG Update: Possessing stuff now sends admin messages.
Possessing and then releasing something restores your original name. Works even if you possess several things one after another as well as if you release an object without having possessed it in the first place.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2699 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 08:48:07 +00:00
CIB c6af564979 Merge pull request #329 from SkyMarshal/master
Removes odd (and buggy) Z-levels 7-12 that are randomly generated on Sandbox and Extended.  I put 10 dollars that this was goon code.
2012-01-29 13:11:40 -08:00
only.lurking@gmail.com fd268e7b18 More SQL injection patches. Added a standardized method of SQL sanitization [sanitizeSQL()].
Corrected a href list vulnerability that let players spawn Arcane Tomes from non-e-magged library computers.
Tweaked and disabled forum_activation.dm. Way too many SQL vulnerabilities to justify keeping it around.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3012 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-29 20:56:05 +00:00
CaelAislinn a2a82c620d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-30 04:26:29 +10:00
CaelAislinn 558f31dd0a added power control module boxes and sprite, made orderable via qm (apc circuits)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 04:24:59 +10:00
CaelAislinn ed7aff55e0 added engine core + a bunch of engineering areas to Antiqua.dmm 2012-01-30 04:20:17 +10:00
CaelAislinn 49fcb53a8f added new engineering areas
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 04:18:08 +10:00
SkyMarshal 4b1359e722 Removes odd (and buggy) Z-levels 7-12 that are randomly generated on Sandbox and Extended. I put 10 dollars that this was goon code. 2012-01-29 03:49:35 -07:00
SkyMarshal f096580734 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-28 21:32:56 -07:00