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
Albert Iordache
86be3a959b
Merge pull request #418 from Miniature/little_things_thread
...
Made lights repairable, wire->screwdriver
2012-02-14 04:30:34 -08:00
Albert Iordache
aa04eed7e8
Merge pull request #417 from SkyMarshal/master
...
Should reduce lag, mobs no longer update icons ever tick.
2012-02-14 04:20:00 -08:00
SkyMarshal
2a0bb6e822
Merge pull request #407 from Abi79/master
...
Small optimizations to metroid AIprocess()
2012-02-14 02:57:05 -08:00
Miniature
a86e2ed94e
Made lights repairable, wire->screwdriver
...
Also glass to make broken ones into burnt ones, independent of rewiring
2012-02-14 18:08:28 +10:30
SkyMarshal
f59fb6af94
More updates, added comfy chairs.
2012-02-13 23:28:12 -07:00
SkyMarshal
0fe42327a5
This should hopefully reduce processing requirements, by not rebuilding icons every tick.
...
(Ported oldcode, all props to Strumpetplaya)
2012-02-13 21:54:22 -07:00
SkyMarshal
3fbcbfe448
Merge pull request #416 from SkyMarshal/master
...
Bugfixes for Borg&Doors
2012-02-13 15:58:17 -08:00
SkyMarshal
42be0feff6
Bugfix for borgs&doors as well as chem grenades.
2012-02-13 16:56:34 -07:00
Miniature
006e91f4c1
Made dexalin and cloneoxadone use a slight amount of plasma, in addition to requiring it as a catalyst.
...
No, it doesn't make sense for oxygen being in the presence of plasma to transmute into dexalin.
2012-02-13 23:15:23 +10:30
SkyMarshal
6cb78379c3
Fixes for DOOMFIRES.
2012-02-12 15:00:43 -07:00
Albert Iordache
d848f7195a
Small optimizations to metroid AIprocess()
2012-02-12 22:06:43 +02:00
SkyMarshal
c2e4a64201
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-02-12 12:48:16 -07:00
SkyMarshal
3d284270f7
Fix for command reports and hacktools.
2012-02-12 12:47:36 -07:00
Tastyfish
aeafc2ffa5
can eat all foods with fork like a sane person now
2012-02-12 07:07:16 -05:00
Tastyfish
b0815b8e1d
Merge pull request #402 from CIB/master
...
Space carp fixes
2012-02-12 02:54:35 -08:00
cib
36801aecec
mend
2012-02-12 11:51:00 +01:00
cib
d21de6271c
Space carp and other critter balancing.
...
They're less likely to attack and move slower now.
2012-02-12 11:48:15 +01:00
Tastyfish
9ccc91f3ae
Merge pull request #396 from Abi79/master
...
Skipping computer ID checks for bans
2012-02-10 15:15:58 -08:00
SkyMarshal
80eae068fd
Merge pull request #400 from Tastyfish/master
...
rejuvinate resets body temp, stabilize atmos restabilizes a chosen area
2012-02-10 15:15:21 -08:00
Albert Iordache
a6f89fefee
Merge pull request #398 from caelaislinn/master
...
new custom items
2012-02-10 14:32:38 -08:00
Tastyfish
bc2817a0a4
rejuvinate resets body temp, stabilize atmos restabilizes a chosen area's atmos
2012-02-10 17:15:50 -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
Albert Iordache
a28ade459a
Small fix.
2012-02-10 21:09:34 +02:00
Albert Iordache
1f1ea35a75
Added a way to skip the computer ID check for bans, and cleaned up the code a bit
2012-02-10 21:01:20 +02:00
Tastyfish
bd6fbb5fe8
fix to sky's reagent effects changes
2012-02-10 00:07:29 -05:00
SkyMarshal
1d29574bc3
Part 2 of the WIP chemistry stuff
...
Map update with secure doors!
2012-02-09 21:50:50 -07: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
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
Tastyfish
91635c4fbd
Merge remote-tracking branch 'upstream/master'
2012-02-08 18:42:00 -05: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
CaelAislinn
b38922f163
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-02-08 18:16:09 +10:00
Albert Iordache
1ae02519fc
Merge pull request #380 from Abi79/master
...
Small code cleanup
2012-02-07 22:00:56 -08: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
Miniature
6de4139066
Sky, that was there for a reason (fixing horrible runtimes everywhere)
2012-02-08 01:25:02 +10:30
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
SkyMarshal
664c6b7dec
AI's can now understand pAI speech
...
Tidied up some.
2012-02-06 11:02:49 -07:00
