SkyMarshal
638c46b896
Merge pull request #393 from caelaislinn/master
...
missing files
2012-02-09 15:35:48 -08:00
CaelAislinn
4021891986
missing files
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-10 09:33:48 +10:00
SkyMarshal
90d47bccf9
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-02-09 16:29:31 -07:00
SkyMarshal
48453a3592
WIP work in making welding fuel not retarded
...
Chem grenades are now awesome again.
2012-02-09 16:29:06 -07:00
CIB
03aea121d8
Merge pull request #384 from caelaislinn/master
...
department lockers, other stuff
2012-02-09 15:23:55 -08: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
90affc2bfc
Merge pull request #392 from CIB/master
...
Fixes to shock-crit and co
2012-02-09 14:45:47 -08:00
nemo
f0e221a1ab
Increased the speed at which you lose damage in shock-crit greatly, and the speed at which you heal in non-crit slightly.
2012-02-09 23:34:19 +01:00
Albert Iordache
13ca13558f
Merge pull request #391 from SkyMarshal/master
...
Cleaned up fingerprint code.
2012-02-09 09:58:34 -08: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
Tastyfish
92dc961c10
disable meteors for now, until atmos fixed
2012-02-09 01:29:21 -05:00
Tastyfish
8eef84095b
Merge pull request #389 from Tastyfish/master
...
oops, left in a debug output
2012-02-08 21:18:50 -08:00
Tastyfish
a7fcef6d45
oops, left in debug code
2012-02-09 00:17:54 -05:00
SkyMarshal
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
Tastyfish
2dc3a5cc6e
fixed horribly buggy camera assembly
2012-02-08 20:56:04 -05:00
Tastyfish
0ebbe456b3
job titles
2012-02-08 20:43:04 -05:00
SkyMarshal
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
Tastyfish
8b4c314fa4
fixed livestock bugs
...
other livestock commit whoops
2012-02-08 19:17:08 -05:00
Tastyfish
7b0a083a68
merge form upstream/master
2012-02-08 18:45:25 -05:00
Tastyfish
91635c4fbd
Merge remote-tracking branch 'upstream/master'
2012-02-08 18:42:00 -05:00
SkyMarshal
bd756112a1
There. That /should/ make it work.
2012-02-08 14:18:49 -07:00
SkyMarshal
6f149af6ba
*sigh* Lets hope that worked.
2012-02-08 13:48:34 -07:00
SkyMarshal
b967f6b577
Should make the engineer hacktool auto raise the bolts, at the cost of alerting the AI.
2012-02-08 13:46:10 -07:00
SkyMarshal
7298e8619b
Adding in cut down hacktool for CE.
2012-02-08 13:33:55 -07:00
SkyMarshal
1e3f332efa
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
code/defines/obj/weapon.dm
Corrected a messed up type path for the security doors.
2012-02-08 12:13:03 -07:00
SkyMarshal
ffb142abae
Secure Airlock update!
...
4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)
2012-02-08 12:07:12 -07:00
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
