Commit Graph

5784 Commits

Author SHA1 Message Date
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
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
quartz235@gmail.com
5f9fa90a90 TG Updates: Fixes: Issue 241 Issue 237 and Issue 240
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2708 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 08:55:24 +00: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
37ac7e31ee Hallucinations. 2012-02-02 21:53:08 -07:00
SkyMarshal
0e15736ba9 Fixes for gibber and detective computer.
Fixed some hallucination and fingerprint stuff.
2012-02-02 19:30:12 -07:00
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
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
Hawk-v3
27b43d532e Merge pull request #345 from SkyMarshal/master
Hallucinations and final parts of the fingerprint system
2012-02-02 10:42:45 -08:00
Albert Iordache
9c8b58c6ca Merge pull request #344 from Tastyfish/master
photos & pages in books, book binder much better, books show author ckey
2012-02-02 07:12:55 -08:00
Tastyfish
4fcda439a7 doing a custom vote, aborting it, and starting a new one appended the choices to the choices of the old one. 2012-02-02 04:38:55 -05:00
SkyMarshal
16ac8ba8e0 Bugfixes. 2012-02-02 01:45:35 -07:00
SkyMarshal
3087c5d2e6 Hallucinations are 50x creepier now, thanks Mr. Fox. 2012-02-02 01:13:49 -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
Albert Iordache
43d1d5aaab Merge branch 'master' of https://github.com/Hawk-v3/Baystation12 into Hawk-v3-master
Conflicts:
	code/modules/power/apc.dm
2012-02-02 08:50:33 +02: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
CaelAislinn
9366781cef security camera circuits and outpost camera circuits are no longer researchable. new research item: camera monitor circuits. can be set to produce monitoring computer for any hardcoded camera network, with appropriate approval levels (sec for station, mining for outpost etc).
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-01 18:00:55 +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
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
trubblebass@gmail.com
cb7123d122 Fixes courtesy of BubbbleWrap
- The first makes it so floor tiles are actually used up when placed on lattice.
- The second fixes the pepperspray so it isn't blocked by cigarettes/cigars/etc...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3022 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-31 22:54:04 +00:00
SkyMarshal
f89009e6ab Merge pull request #337 from SkyMarshal/master
Bugfixes
2012-01-31 14:04:29 -08:00
SkyMarshal
80be80a4c1 Bugfixes!
Fingerprint sanity checks
Mulebot sanity checks
Traitor objectives work, now
Some mapping errors fixed.
Attempted fix for solar tracking.
2012-01-31 15:00:46 -07:00
Albert Iordache
5c8f42a2d6 Fixed an operating computer runtime error 2012-01-31 20:20:41 +02: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