Melvin Melonstorm
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
Albert Iordache
96df31b9cd
Fixed compiling error.
2012-02-08 13:23:57 +02:00
CaelAislinn
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
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
Albert Iordache
1ae02519fc
Merge pull request #380 from Abi79/master
...
Small code cleanup
2012-02-07 22:00:56 -08:00
Tastyfish
7261167741
added modes to sink
2012-02-07 22:58:00 -05: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
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
Albert Iordache
a20481062c
Cleaned up parts of the code, no other changes
2012-02-07 20:05:42 +02:00
SkyMarshal
d26767127e
Merge pull request #379 from caelaislinn/master
...
autolathe bug fix
2012-02-07 08:09:41 -08:00
CaelAislinn
a9df0e64bf
fixed autolathe perma-freeze bug, also fixed some icon states.
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-08 02:07:10 +10:00
Miniature
22687953fc
Another runtime fix, I believe this to originally be caused by the automatic arrival announcement thing not having a source mob
2012-02-08 01:28:55 +10:30
Miniature
6de4139066
Sky, that was there for a reason (fixing horrible runtimes everywhere)
2012-02-08 01:25:02 +10:30
SkyMarshal
be9bcd626d
Merge pull request #376 from Tastyfish/master
...
streamlined copy machine, mainly to not use process()
2012-02-06 19:59:01 -08:00
Tastyfish
b0113eaac9
Merge pull request #375 from caelaislinn/master
...
bug / map fixes
2012-02-06 19:30:51 -08:00
SkyMarshal
14743ca3c0
Derp. That would have been dumb.
2012-02-06 20:27:06 -07:00
SkyMarshal
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
CaelAislinn
1366bf7e34
Merge git://github.com/Baystation12/Baystation12
...
Conflicts:
code/defines/procs/gamehelpers.dm
code/game/mecha/mecha.dm
maps/tgstation.2.0.8.dmm
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-07 09:08:55 +10:00
Tastyfish
b6ba1b74fa
streamlined copy machine code
2012-02-06 17:16:16 -05:00
CaelAislinn
06fad98469
fixed mech charge port bug, fixed (?) autolathe bug, miscellaneous map fixes
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-07 08:05:47 +10:00
CaelAislinn
9ca058fd1b
added a couple of missing networks to department camera monitors
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-07 06:59:35 +10:00
Tastyfish
d2404e8a79
Merge remote-tracking branch 'upstream/master'
2012-02-06 13:41:59 -05:00
SkyMarshal
664c6b7dec
AI's can now understand pAI speech
...
Tidied up some.
2012-02-06 11:02:49 -07:00
CaelAislinn
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
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
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
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
SkyMarshal
24d42f0ef8
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-02-05 11:23:58 -07: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
5a4fa7c889
returned pregame time to 180
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-06 02:56:14 +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
b2120f22e9
Merge pull request #368 from CIB/master
...
Erthilo's sprites
2012-02-05 06:23:39 -08:00
Albert Iordache
ec77e9da19
Revert "More fingerprint fixes"
...
This reverts commit c11502eb53
2012-02-05 16:22:48 +02:00
Hawk-v3
36e51a9fd4
ARGH METEORS
2012-02-05 13:04:03 +00:00
Tastyfish
11a884ca35
bugfix for machines so attack_hand's mob typechecks actually work right is usr is not user (most likely if usr isn't set)
2012-02-05 06:34:19 -05:00
Hawk-v3
34971bcd99
Should have fixed SUPERHEATED DOOM
2012-02-05 10:47:20 +00:00
Miniature
14a93a1454
Merge pull request #366 from Miniature/master
...
Fix for votes being none mode
2012-02-05 00:23:17 -08:00
Miniature
46d6cbdcd0
Fix for votes being none mode
2012-02-05 18:51:40 +10:30
SkyMarshal
b61120621b
Merge pull request #364 from Tastyfish/master
...
HOLY SHIT WERE THINGS BROKEN.
2012-02-04 22:32:53 -08:00
SkyMarshal
c11502eb53
More fingerprint fixes
2012-02-04 23:12:53 -07:00
Tastyfish
35ae4bd5f3
turns out things broke from abi's runtime fix because that proc shouldn't ever be called here
2012-02-05 01:07:57 -05:00
SkyMarshal
6478bf03dc
Merge pull request #361 from SkyMarshal/master
...
No longer powers down the AI.
2012-02-04 18:44:43 -08:00
