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
13ca13558f
Merge pull request #391 from SkyMarshal/master
...
Cleaned up fingerprint code.
2012-02-09 09:58:34 -08:00
8b62eff01a
Cleaned up the fingerprint code
...
Added sanity checks to the clean blood proc.
2012-02-09 09:42:08 -07:00
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
710bcbb42b
Final parts for the airlocks.
...
Wrench -> Weld -> Wrench removes the cover
secure/centcom has all wires electrocute
Emag is now tweaked
Implanted uplink now works.
2012-02-08 17:42:34 -07:00
8b4c314fa4
fixed livestock bugs
...
other livestock commit whoops
2012-02-08 19:17:08 -05:00
f8f3f290c5
Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not.
2012-02-08 19:15:10 +01:00
96df31b9cd
Fixed compiling error.
2012-02-08 13:23:57 +02:00
b1f58f56d6
tajaran ears and tails now properly hide / show according to what the mob is wearing, other minor changes
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-08 20:16:55 +10:00
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
be9bcd626d
Merge pull request #376 from Tastyfish/master
...
streamlined copy machine, mainly to not use process()
2012-02-06 19:59:01 -08:00
b0113eaac9
Merge pull request #375 from caelaislinn/master
...
bug / map fixes
2012-02-06 19:30:51 -08:00
14743ca3c0
Derp. That would have been dumb.
2012-02-06 20:27:06 -07:00
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
b6ba1b74fa
streamlined copy machine code
2012-02-06 17:16:16 -05:00
647ed920eb
removed redundant proc, updated old blood in multiz
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-07 03:53:01 +10:00
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
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
1f25c49c06
MOAR BUGFIXES
2012-02-05 21:56:12 -07:00
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
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
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
ec77e9da19
Revert "More fingerprint fixes"
...
This reverts commit c11502eb53
2012-02-05 16:22:48 +02:00
c11502eb53
More fingerprint fixes
2012-02-04 23:12:53 -07:00
1d7b00a0fc
Bugfixes for adminhelp and the Power Offline event.
2012-02-04 16:20:19 -07:00
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
42c41c1ee9
Merge branch 'master' of git://github.com/Baystation12/Baystation12
...
Conflicts:
code/unused/toilets.dm
maps/tgstation.2.0.8.dmm
2012-02-04 22:36:42 +10:00
51043ef9f8
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-02-03 20:29:16 +10:30
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
4290c35af8
Several detective fixes. 3 hour tape recorder.
2012-02-02 21:41:30 -07:00
a2237a10dc
Fixes for singularity beacon glitching
...
further gibber fix.
Ghosts can no longer print autopsy reports
Shrunk evidence bags so they can be put in lockers.
2012-02-02 19:59:15 -07:00
0e15736ba9
Fixes for gibber and detective computer.
...
Fixed some hallucination and fingerprint stuff.
2012-02-02 19:30:12 -07:00
3b9efc849e
Updates to fingerprints/bugfixes.
2012-02-02 12:22:46 -07:00
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
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
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
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
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
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
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
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
888730e196
Fixed a runtime error with the filling cabinet
2012-01-31 10:14:15 +02:00
a711259856
added pressure sealed hatches for testing / WIP purposes
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-30 22:23:01 +10:00
1e03fb9d72
bugfixes
2012-01-28 15:55:00 -07:00
795d07fc6a
Suicide bugfix, uplink bugfix, Made the electrical storm disrupt radio again, buugfix for the new door stuff, retoring UI+UE recovers identity.
2012-01-28 15:47:26 -07:00
3e9146f99a
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
maps/tgstation.2.0.8.dmm
2012-01-28 02:03:42 -07:00
0e51764af4
Final load of bugfixes. Moved ported stuff to a subdirectory in Work in Progress, telecomms bugfix, fix for solar trackers, some human and monkey procs.
2012-01-27 22:55:16 -07:00
12afd61ffc
Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant.
2012-01-27 20:15:06 -07:00
21fe68972f
Lots of stuff, will elaborate later.
2012-01-27 11:18:14 -07:00
351ed2a250
Deeeerp. Bugfix.
2012-01-26 23:21:02 -07:00
CaelAislinn