Commit Graph

957 Commits

Author SHA1 Message Date
Albert Iordache
cc6c63edd7 Merge pull request #423 from caelaislinn/master
added a couple of new clothing items, updated some sprites
2012-02-16 08:29:15 -08:00
SkyMarshal
8769fdd3fc Merge pull request #432 from Tastyfish/master
ported in a bunch of the old food making stuff
2012-02-15 19:11:30 -08:00
SkyMarshal
b5c1d99471 Added some more feedbacks on the blood_DNA stuff
Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
2012-02-14 21:34:52 -07:00
CaelAislinn
95b521dede Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-15 07:04:43 +10:00
CaelAislinn
43ead88027 fixes to new clothing
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-15 07:04:26 +10:00
CaelAislinn
9d798d3f95 updated some sprites, added new clothing
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-15 06:58:50 +10:00
Tastyfish
badb7bd93f Merge remote-tracking branch 'upstream/master' 2012-02-14 12:01:14 -05:00
Tastyfish
12d119c109 porting old food stuff 2012-02-14 11:59:16 -05:00
SkyMarshal
f59fb6af94 More updates, added comfy chairs. 2012-02-13 23:28:12 -07:00
CaelAislinn
9ee093b70e added a couple of new hats, updated some sprites
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-14 06:05:40 +10:00
Tastyfish
0dc9bc325b upgraded medical console to be like sec console 2012-02-12 09:55:02 -05:00
Tastyfish
aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05:00
CaelAislinn
0edd231592 added new custom items
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-11 07:24:50 +10:00
CaelAislinn
03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-10 09:11:08 +10:00
SkyMarshal
463d078cd4 Added chemistry's big beakers to the supply pack.
Security vending machines now have Evidence Bag boxes.
2012-02-09 10:53:09 -07:00
SkyMarshal
8b62eff01a Cleaned up the fingerprint code
Added sanity checks to the clean blood proc.
2012-02-09 09:42:08 -07:00
SkyMarshal
7298e8619b Adding in cut down hacktool for CE. 2012-02-08 13:33:55 -07: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
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
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
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
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
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.matevz
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
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